diff --git a/.chloggen/add-hec-health-check.yaml b/.chloggen/add-hec-health-check.yaml deleted file mode 100644 index da52ca0e3cfdd..0000000000000 --- a/.chloggen/add-hec-health-check.yaml +++ /dev/null @@ -1,16 +0,0 @@ -# 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: splunkhecexporter - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: Add HEC health check before sending the data to Splunk - -# One or more tracking issues related to the change -issues: [16479] - -# (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/add-jmx-metrics-gatherer-1.20.1-alpha.yaml b/.chloggen/add-jmx-metrics-gatherer-1.20.1-alpha.yaml deleted file mode 100644 index 1824dbcd9296b..0000000000000 --- a/.chloggen/add-jmx-metrics-gatherer-1.20.1-alpha.yaml +++ /dev/null @@ -1,4 +0,0 @@ -change_type: enhancement -component: jmxreceiver -note: Add the JMX metrics gatherer version 1.20.1-alpha to the supported jars hash list -issues: [ 16437 ] diff --git a/.chloggen/add-process-cpu-utilization-metric.yaml b/.chloggen/add-process-cpu-utilization-metric.yaml deleted file mode 100755 index b5d14c9f2543e..0000000000000 --- a/.chloggen/add-process-cpu-utilization-metric.yaml +++ /dev/null @@ -1,16 +0,0 @@ -# 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: hostmetricsreceiver - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: Add a new optional metric `process.cpu.utilization` to the `process` scraper of the `hostmetrics` receiver. - -# One or more tracking issues related to the change -issues: [14084] - -# (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/add-promtail-receiver.yaml b/.chloggen/add-promtail-receiver.yaml deleted file mode 100644 index 44eb5d9c22d0c..0000000000000 --- a/.chloggen/add-promtail-receiver.yaml +++ /dev/null @@ -1,16 +0,0 @@ -# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' -change_type: new_component - -# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver) -component: receiver/promtailreceiver - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: Add a new receiver that scrapes logs using Promtail client - -# One or more tracking issues related to the change -issues: [14632] - -# (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/add-purefa-receiver.yaml b/.chloggen/add-purefa-receiver.yaml deleted file mode 100644 index 2eac0ec119c1e..0000000000000 --- a/.chloggen/add-purefa-receiver.yaml +++ /dev/null @@ -1,16 +0,0 @@ -# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' -change_type: new_component - -# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver) -component: receiver/purefareceiver - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: Add a new receiver that scrapes metrics using Purestorage FlashArray API - -# One or more tracking issues related to the change -issues: [14886] - -# (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/apache-server-port-feature-gates-beta.yaml b/.chloggen/apache-server-port-feature-gates-beta.yaml deleted file mode 100644 index 0fdeb7cc4ab14..0000000000000 --- a/.chloggen/apache-server-port-feature-gates-beta.yaml +++ /dev/null @@ -1,16 +0,0 @@ -# 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: apachereceiver - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: turn on by default feature gates for server name and port resource attributes - -# One or more tracking issues related to the change -issues: [14791] - -# (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/azehrec-parse.yaml b/.chloggen/azehrec-parse.yaml deleted file mode 100755 index 7237a9a071649..0000000000000 --- a/.chloggen/azehrec-parse.yaml +++ /dev/null @@ -1,16 +0,0 @@ -# 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: azureeventhubreceiver - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: adds alternate log formatter that maps Azure log fields into OpenTelemetry attributes - -# One or more tracking issues related to the change -issues: [16283] - -# (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/change-tsprecision-adx-receiver.yaml b/.chloggen/change-tsprecision-adx-receiver.yaml deleted file mode 100644 index b162a4b9f7940..0000000000000 --- a/.chloggen/change-tsprecision-adx-receiver.yaml +++ /dev/null @@ -1,16 +0,0 @@ -# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' -change_type: bug_fix - -# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver) -component: exporter/azuredataexplorerexporter - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: Makes timestamp precision to nanos, updated azure-kusto-go to 0.9.2 - -# One or more tracking issues related to the change -issues: [16546] - -# (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/ctd-clear-min-max.yaml b/.chloggen/ctd-clear-min-max.yaml deleted file mode 100755 index fc98d9f146d5f..0000000000000 --- a/.chloggen/ctd-clear-min-max.yaml +++ /dev/null @@ -1,16 +0,0 @@ -# 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: cumulativetodeltaprocessor - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: Updates histogram conversion logic to correctly remove Min and Max when a histogram is converted. - -# One or more tracking issues related to the change -issues: [16520] - -# (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/ctd-remove-featuregate.yaml b/.chloggen/ctd-remove-featuregate.yaml deleted file mode 100755 index 00863fe9c6a23..0000000000000 --- a/.chloggen/ctd-remove-featuregate.yaml +++ /dev/null @@ -1,16 +0,0 @@ -# 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: cumulativetodeltaprocessor - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: Remove histogram feature gate. - -# One or more tracking issues related to the change -issues: [16720] - -# (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/dd-exporter-duplicate-tags.yaml b/.chloggen/dd-exporter-duplicate-tags.yaml deleted file mode 100644 index 2cf5d5a76f25f..0000000000000 --- a/.chloggen/dd-exporter-duplicate-tags.yaml +++ /dev/null @@ -1,16 +0,0 @@ -# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' -change_type: bug_fix - -# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver) -component: datadogexporter - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: "Doesn't append duplicate ddtags on each log submission leading to 414 API errors." - -# One or more tracking issues related to the change -issues: [16380] - -# (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/drosiek-fix-stmt-commands-metric.yaml b/.chloggen/drosiek-fix-stmt-commands-metric.yaml deleted file mode 100755 index 4dd2ce4c162fd..0000000000000 --- a/.chloggen/drosiek-fix-stmt-commands-metric.yaml +++ /dev/null @@ -1,18 +0,0 @@ -# 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: mysqlreceiver - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: rename mysql.commands metric to mysql.prepared_statements - -# One or more tracking issues related to the change -issues: [14138] - -# (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: | - According to the documentation, the `Com_stmt_xxx` is related to prepared statements - ref: https://dev.mysql.com/doc/refman/8.0/en/server-status-variables.html diff --git a/.chloggen/drosiek-mysql-connection-count.yaml b/.chloggen/drosiek-mysql-connection-count.yaml deleted file mode 100755 index e7364f0deb79f..0000000000000 --- a/.chloggen/drosiek-mysql-connection-count.yaml +++ /dev/null @@ -1,16 +0,0 @@ -# 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: mysqlreceiver - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: add mysql.connection.count metric - -# One or more tracking issues related to the change -issues: [14138] - -# (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/drosiek-mysql-feature-gate.yaml b/.chloggen/drosiek-mysql-feature-gate.yaml deleted file mode 100755 index ace1f7fc4d9b5..0000000000000 --- a/.chloggen/drosiek-mysql-feature-gate.yaml +++ /dev/null @@ -1,16 +0,0 @@ -# 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: mysqlreceiver - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: rename mysql.commands metric to mysql.prepared_statements - -# One or more tracking issues related to the change -issues: [14138] - -# (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: Disable the `receiver.mysqlreceiver.renameCommands` feature gate to temporarily revert this change. diff --git a/.chloggen/dynatrace-no-sort.yaml b/.chloggen/dynatrace-no-sort.yaml deleted file mode 100755 index 968646eda95e1..0000000000000 --- a/.chloggen/dynatrace-no-sort.yaml +++ /dev/null @@ -1,11 +0,0 @@ -# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' -change_type: bug_fix - -# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver) -component: exporter/dynatrace - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: Make sure the original metrics are not mutated - -# One or more tracking issues related to the change -issues: [16506] diff --git a/.chloggen/elastic-cluster-level-metrics.yaml b/.chloggen/elastic-cluster-level-metrics.yaml deleted file mode 100644 index b430b2ced30b1..0000000000000 --- a/.chloggen/elastic-cluster-level-metrics.yaml +++ /dev/null @@ -1,16 +0,0 @@ -# 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: elasticsearchreceiver - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: add scraping metrics on cluster level - -# One or more tracking issues related to the change -issues: [14635] - -# (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 receiver now emits jvm and cache eviction metrics on cluster level scraped from new endpoint /_cluster/stats. diff --git a/.chloggen/elastic-fix-fetched-index-ops.yaml b/.chloggen/elastic-fix-fetched-index-ops.yaml deleted file mode 100644 index cce3a4dcf85e5..0000000000000 --- a/.chloggen/elastic-fix-fetched-index-ops.yaml +++ /dev/null @@ -1,16 +0,0 @@ -# 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: elasticsearchreceiver - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: fix the set of operations for which the data is fetched on index-level - -# One or more tracking issues related to the change -issues: [14635] - -# (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/feat_influxdb-1x.yaml b/.chloggen/feat_influxdb-1x.yaml deleted file mode 100755 index 4fb515f995dff..0000000000000 --- a/.chloggen/feat_influxdb-1x.yaml +++ /dev/null @@ -1,16 +0,0 @@ -# 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: influxdbexporter - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: Add support for exporting to InfluxDB v1.X API - -# One or more tracking issues related to the change -issues: [16042] - -# (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/feat_vCenterMemoryMetrics.yaml b/.chloggen/feat_vCenterMemoryMetrics.yaml deleted file mode 100755 index d18d9f40854db..0000000000000 --- a/.chloggen/feat_vCenterMemoryMetrics.yaml +++ /dev/null @@ -1,16 +0,0 @@ -# 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: vcenterreceiver - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: Added `vcenter.vm.memory.ssdswapped` and `vcenter.vm.memory.swapped` metrics. - -# One or more tracking issues related to the change -issues: [16727] - -# (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/filelog-beta.yaml b/.chloggen/filelog-beta.yaml deleted file mode 100755 index 294002fe103c7..0000000000000 --- a/.chloggen/filelog-beta.yaml +++ /dev/null @@ -1,16 +0,0 @@ -# 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: filelogreceiver - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: Promote component to Beta status - -# One or more tracking issues related to the change -issues: [15355] - -# (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/filterexpr-parallel-fix.yaml b/.chloggen/filterexpr-parallel-fix.yaml deleted file mode 100755 index 41575dce366d1..0000000000000 --- a/.chloggen/filterexpr-parallel-fix.yaml +++ /dev/null @@ -1,16 +0,0 @@ -# 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: filterexpr - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: Fixed filterexpr Matcher.MatchMetric to be thread-safe - -# One or more tracking issues related to the change -issues: [13573] - -# (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-fileexporter-nil-pointer.yaml b/.chloggen/fix-fileexporter-nil-pointer.yaml deleted file mode 100755 index 9073d958b99f1..0000000000000 --- a/.chloggen/fix-fileexporter-nil-pointer.yaml +++ /dev/null @@ -1,16 +0,0 @@ -# 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: fileexporter - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: Fix nil pointer in `fileexporter` when reusing configuration for multiple telemetry signals or pipelines. - -# One or more tracking issues related to the change -issues: [16733] - -# (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_metricType.yaml b/.chloggen/fix_metricType.yaml deleted file mode 100755 index 8aad1403e811c..0000000000000 --- a/.chloggen/fix_metricType.yaml +++ /dev/null @@ -1,16 +0,0 @@ -# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' -change_type: 'bug_fix' - -# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver) -component: vcenterreceiver - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: vcenter.vm.memory.ballooned is taken from vm.Summary.QuickStats.BalloonedMemory that is expressed MiBy, not By. - -# One or more tracking issues related to the change -issues: [16728] - -# (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/fixes_the_number_of_bucket_counts.yaml b/.chloggen/fixes_the_number_of_bucket_counts.yaml deleted file mode 100644 index 6d3a777e0cade..0000000000000 --- a/.chloggen/fixes_the_number_of_bucket_counts.yaml +++ /dev/null @@ -1,11 +0,0 @@ -# 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: servicegraphprocessor - -# A brief description of the change -note: Fixes the number of bucket counts. - -# One or more tracking issues related to the change -issues: [16000] diff --git a/.chloggen/fixprommuta.yaml b/.chloggen/fixprommuta.yaml deleted file mode 100755 index 67d5aed425033..0000000000000 --- a/.chloggen/fixprommuta.yaml +++ /dev/null @@ -1,12 +0,0 @@ -# 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: prometheusexporter - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: Make sure the exporter doesn't mutate metrics - -# One or more tracking issues related to the change -issues: [16499, 16572] - diff --git a/.chloggen/gbbr_dump_logs.yaml b/.chloggen/gbbr_dump_logs.yaml deleted file mode 100755 index b8811de549554..0000000000000 --- a/.chloggen/gbbr_dump_logs.yaml +++ /dev/null @@ -1,16 +0,0 @@ -# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' -change_type: bug_fix - -# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver) -component: datadogexporter - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: "Suppress logs exporter payload dump to avoid filelogreceiver escape loop" - -# One or more tracking issues related to the change -issues: [16380] - -# (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/header-setter-transport-security.yaml b/.chloggen/header-setter-transport-security.yaml deleted file mode 100644 index 21d6902b7b6f3..0000000000000 --- a/.chloggen/header-setter-transport-security.yaml +++ /dev/null @@ -1,16 +0,0 @@ -# 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: headerssetter - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: Do not require the secure transport for the headers setter extension. - -# One or more tracking issues related to the change -issues: [16508] - -# (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/instana-exporter-https-option.yaml b/.chloggen/instana-exporter-https-option.yaml deleted file mode 100755 index cf9661e7aa30e..0000000000000 --- a/.chloggen/instana-exporter-https-option.yaml +++ /dev/null @@ -1,11 +0,0 @@ -# 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: exporterconfig - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: The exporter config options should be HTTPS endpoint URL only - -# One or more tracking issues related to the change -issues: [14323] diff --git a/.chloggen/jmoe_dockerstats-featuregate-beta.yaml b/.chloggen/jmoe_dockerstats-featuregate-beta.yaml deleted file mode 100755 index 906230557d5b6..0000000000000 --- a/.chloggen/jmoe_dockerstats-featuregate-beta.yaml +++ /dev/null @@ -1,7 +0,0 @@ -change_type: breaking -component: dockerstatsreceiver -note: "Enable the `receiver.dockerstats.useScraperV2` feature gate by default." -issues: [16381, 9794] -subtext: | - See the README for information on how to migrate. - The featuregate can be disabled, but it will be removed in a future release. diff --git a/.chloggen/log-sampling.yaml b/.chloggen/log-sampling.yaml deleted file mode 100644 index 19998adf6364f..0000000000000 --- a/.chloggen/log-sampling.yaml +++ /dev/null @@ -1,16 +0,0 @@ -# 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: probabilisticsamplerprocessor - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: Add support for probabilistic sampling of logs - -# One or more tracking issues related to the change -issues: [9117] - -# (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/logicmonitorexporter-overall-skeleton.yaml b/.chloggen/logicmonitorexporter-overall-skeleton.yaml deleted file mode 100755 index 45f32730a69ed..0000000000000 --- a/.chloggen/logicmonitorexporter-overall-skeleton.yaml +++ /dev/null @@ -1,16 +0,0 @@ -# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' -change_type: new_component - -# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver) -component: logicmonitorexporter - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: New exporter for exporting traces and logs to Logicmonitor Platform - -# One or more tracking issues related to the change -issues: [13727] - -# (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/loki-resource-labels.yaml b/.chloggen/loki-resource-labels.yaml deleted file mode 100644 index 1ea589814c7d9..0000000000000 --- a/.chloggen/loki-resource-labels.yaml +++ /dev/null @@ -1,16 +0,0 @@ -# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' -change_type: 'bug_fix' - -# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver) -component: pkg/translator/loki - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: "fix loki.resource.labels not working as expected" - -# One or more tracking issues related to the change -issues: [15386] - -# (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/mdatagen-enum-resource-attrs.yaml b/.chloggen/mdatagen-enum-resource-attrs.yaml deleted file mode 100755 index 9d5c226e122ac..0000000000000 --- a/.chloggen/mdatagen-enum-resource-attrs.yaml +++ /dev/null @@ -1,17 +0,0 @@ -# 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: cmd/mdatagen - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: Add support for `resource_attributes::enum` field - -# One or more tracking issues related to the change -issues: [16464] - -# (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: | - `resource_attributes::enum` values in metadata.yaml are now properly supported in metrics builder developer interface. diff --git a/.chloggen/mdatagen-improve-documentation.yaml b/.chloggen/mdatagen-improve-documentation.yaml deleted file mode 100755 index 61eeb00b5fcde..0000000000000 --- a/.chloggen/mdatagen-improve-documentation.yaml +++ /dev/null @@ -1,11 +0,0 @@ -# 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: cmd/mdatagen - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: Improve generated documentation - -# One or more tracking issues related to the change -issues: [16556, 16563] diff --git a/.chloggen/mdatagen-rename-attribute-value-field.yaml b/.chloggen/mdatagen-rename-attribute-value-field.yaml deleted file mode 100755 index 051472157c8c7..0000000000000 --- a/.chloggen/mdatagen-rename-attribute-value-field.yaml +++ /dev/null @@ -1,11 +0,0 @@ -# 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/mdatagen - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: Rename metadata.yaml attribute field from `value` to `name_override` - -# One or more tracking issues related to the change -issues: [16561] diff --git a/.chloggen/mdatagen-warn-if-enabled.yaml b/.chloggen/mdatagen-warn-if-enabled.yaml deleted file mode 100755 index 6c4a4a35b4bc7..0000000000000 --- a/.chloggen/mdatagen-warn-if-enabled.yaml +++ /dev/null @@ -1,11 +0,0 @@ -# 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: cmd/mdatagen - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: Add a metadata.yaml option to specify a warning that will be shown in case if metric is enabled. - -# One or more tracking issues related to the change -issues: [16536] diff --git a/.chloggen/metric-type-grouping-key.yaml b/.chloggen/metric-type-grouping-key.yaml deleted file mode 100644 index 3470a115f396f..0000000000000 --- a/.chloggen/metric-type-grouping-key.yaml +++ /dev/null @@ -1,11 +0,0 @@ -# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' -change_type: bug_fix - -# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver) -component: exporter/awsemfexporter - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: Consider metric data type while grouping metrics - -# One or more tracking issues related to the change -issues: [16512] diff --git a/.chloggen/metricdescriptor-export-fields.yaml b/.chloggen/metricdescriptor-export-fields.yaml deleted file mode 100644 index 464e2db0da63c..0000000000000 --- a/.chloggen/metricdescriptor-export-fields.yaml +++ /dev/null @@ -1,11 +0,0 @@ -# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' -change_type: bug_fix - -# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver) -component: exporter/awsemfexporter - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: Export fields of MetricDescriptor to enable decoding - -# One or more tracking issues related to the change -issues: [16566] diff --git a/.chloggen/msg_allow-custom-marshalers.yaml b/.chloggen/msg_allow-custom-marshalers.yaml deleted file mode 100755 index fd08986695357..0000000000000 --- a/.chloggen/msg_allow-custom-marshalers.yaml +++ /dev/null @@ -1,16 +0,0 @@ -# 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: kafkaexporter - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: Allows for custom marshalers to be added in future releases - -# One or more tracking issues related to the change -issues: [14514] - -# (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/msg_chore-include-region.yaml b/.chloggen/msg_chore-include-region.yaml deleted file mode 100755 index e3b363f45c1c7..0000000000000 --- a/.chloggen/msg_chore-include-region.yaml +++ /dev/null @@ -1,17 +0,0 @@ -# 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: awskinesis - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: Fixed configuration issues not being correctly used. - -# One or more tracking issues related to the change -issues: [16259] - -# (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: -| - - Fixed applying region to the kinesis exporter diff --git a/.chloggen/oracledbreceiver-impl.yaml b/.chloggen/oracledbreceiver-impl.yaml deleted file mode 100644 index 731fda889ce22..0000000000000 --- a/.chloggen/oracledbreceiver-impl.yaml +++ /dev/null @@ -1,16 +0,0 @@ -# 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: oracledbreceiver - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: Add oracledbreceiver implementation (config, scraper, db client) - -# One or more tracking issues related to the change -issues: [16043] - -# (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/ottelfilternext.yaml b/.chloggen/ottelfilternext.yaml deleted file mode 100755 index 434f396431765..0000000000000 --- a/.chloggen/ottelfilternext.yaml +++ /dev/null @@ -1,11 +0,0 @@ -# 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: filterprocessor - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: Adapt ottl configuration to same BoolExpr, remove duplicate code - -# One or more tracking issues related to the change -issues: [16446] diff --git a/.chloggen/ottl-improve-ismatch.yaml b/.chloggen/ottl-improve-ismatch.yaml deleted file mode 100755 index 800ff5bc89eef..0000000000000 --- a/.chloggen/ottl-improve-ismatch.yaml +++ /dev/null @@ -1,16 +0,0 @@ -# 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: Updates the IsMatch function to convert bools, ints, and floats to strings before matching. - -# One or more tracking issues related to the change -issues: [16503] - -# (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/ottl-list-getter.yaml b/.chloggen/ottl-list-getter.yaml deleted file mode 100755 index eed5ea5f71f5d..0000000000000 --- a/.chloggen/ottl-list-getter.yaml +++ /dev/null @@ -1,16 +0,0 @@ -# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' -change_type: bug_fix - -# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver) -component: pkg/ottl - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: Add support for lists to be used as Getter values - -# One or more tracking issues related to the change -issues: [16320] - -# (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/ottl-merge-maps.yaml b/.chloggen/ottl-merge-maps.yaml deleted file mode 100755 index 386cd897b52fb..0000000000000 --- a/.chloggen/ottl-merge-maps.yaml +++ /dev/null @@ -1,16 +0,0 @@ -# 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 `merge` function to OTTL, which allows merging maps. - -# One or more tracking issues related to the change -issues: [16461] - -# (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/ottl-not.yaml b/.chloggen/ottl-not.yaml deleted file mode 100755 index a0e4d931baf01..0000000000000 --- a/.chloggen/ottl-not.yaml +++ /dev/null @@ -1,16 +0,0 @@ -# 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 ability to negate conditions with the `not` keyword - -# One or more tracking issues related to the change -issues: [16553] - -# (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/ottl-parse-to-map.yaml b/.chloggen/ottl-parse-to-map.yaml deleted file mode 100755 index 0a178514a07fd..0000000000000 --- a/.chloggen/ottl-parse-to-map.yaml +++ /dev/null @@ -1,16 +0,0 @@ -# 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 `ParseJSON` function that can convert a json string into `pcommon.Map`. - -# One or more tracking issues related to the change -issues: [16444] - -# (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/ottlfilter.yaml b/.chloggen/ottlfilter.yaml deleted file mode 100755 index 6d17a4c5e0c4f..0000000000000 --- a/.chloggen/ottlfilter.yaml +++ /dev/null @@ -1,11 +0,0 @@ -# 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: internal/filter - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: Change filter interface to be compatible with ottl - -# One or more tracking issues related to the change -issues: [16443] diff --git a/.chloggen/polish-awscontainerinsightreceiver-readme.yaml b/.chloggen/polish-awscontainerinsightreceiver-readme.yaml deleted file mode 100755 index fdf78cd119312..0000000000000 --- a/.chloggen/polish-awscontainerinsightreceiver-readme.yaml +++ /dev/null @@ -1,16 +0,0 @@ -# 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/awscontainerinsightreceiver - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: "Polish up awscontainerinsightreceiver README" - -# One or more tracking issues related to the change -issues: [16378] - -# (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/prometheusreceiver-shutdown.yaml b/.chloggen/prometheusreceiver-shutdown.yaml deleted file mode 100755 index 7573177e4b7b6..0000000000000 --- a/.chloggen/prometheusreceiver-shutdown.yaml +++ /dev/null @@ -1,16 +0,0 @@ -# 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: prometheusreceiver - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: "Fix prometheus receiver panic on shutdown" - -# One or more tracking issues related to the change -issues: [16469] - -# (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/remove-coralogix-jaeger.yaml b/.chloggen/remove-coralogix-jaeger.yaml deleted file mode 100755 index 78ec9375175d4..0000000000000 --- a/.chloggen/remove-coralogix-jaeger.yaml +++ /dev/null @@ -1,16 +0,0 @@ -# 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: coralogixexporter - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: "remove old jaeger based tracing client" - -# One or more tracking issues related to the change -issues: [7931] - -# (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/remove-instana-mutations.yaml b/.chloggen/remove-instana-mutations.yaml deleted file mode 100755 index 768ba0b435cd7..0000000000000 --- a/.chloggen/remove-instana-mutations.yaml +++ /dev/null @@ -1,12 +0,0 @@ -# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' -change_type: bug_fix - -# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver) -component: exporter/instana - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: Make sure the original traces are not mutated - -# One or more tracking issues related to the change -issues: [16505] - diff --git a/.chloggen/remove-name-mapping-in-hec.yaml b/.chloggen/remove-name-mapping-in-hec.yaml deleted file mode 100644 index 84ef8bb1e414d..0000000000000 --- a/.chloggen/remove-name-mapping-in-hec.yaml +++ /dev/null @@ -1,16 +0,0 @@ -# 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: splunkhecexporter - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: Remove all use of the name attribute from logs as it is deprecated. - -# One or more tracking issues related to the change -issues: [16611] - -# (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/rmloki.yaml b/.chloggen/rmloki.yaml deleted file mode 100755 index 71a5e5a63b39f..0000000000000 --- a/.chloggen/rmloki.yaml +++ /dev/null @@ -1,19 +0,0 @@ -# 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/translator/loki - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: Remove loki dependency, copy files from logproto - -# One or more tracking issues related to the change -issues: [16822] - -# (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: | - Files copied from github.com/grafana/loki/pkg/logproto to remove unnecessary dependencies. - In logproto.pb.go I had to remove few types Query[Request|Response] and SampleQuery[Request|Response] - and the gRPC service that uses them, because they depend on another loki package stats. diff --git a/.chloggen/routing-processor-ottl-config.yaml b/.chloggen/routing-processor-ottl-config.yaml deleted file mode 100644 index 2a67010a99483..0000000000000 --- a/.chloggen/routing-processor-ottl-config.yaml +++ /dev/null @@ -1,16 +0,0 @@ -# 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: routingprocessor - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: Fix bug in routing processor that prevented collector from starting if `from_attribute` is not provided with `OTTL` routing statements. - -# One or more tracking issues related to the change -issues: [16555] - -# (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/servicegraphprocessor-distinguish-attribute.yaml b/.chloggen/servicegraphprocessor-distinguish-attribute.yaml deleted file mode 100644 index 9ec1671a8a4f9..0000000000000 --- a/.chloggen/servicegraphprocessor-distinguish-attribute.yaml +++ /dev/null @@ -1,19 +0,0 @@ -# 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: servicegraphprocessor - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: use prefix to distinguish dimensions from different span kind - -# One or more tracking issues related to the change -issues: [16002] - -# (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 metrics label converts from dimensions specifying in the config will have a prefix to mark where are from. - The `client_` prefix relates to the dimensions coming from spans with `SPAN_KIND_CLIENT`, and the `server_` prefix relates to the - dimensions coming from spans with `SPAN_KIND_SERVER`. The old dimensions will be removed in the next release. diff --git a/.chloggen/snmp-alpha.yaml b/.chloggen/snmp-alpha.yaml deleted file mode 100755 index fa11acd3b0cf9..0000000000000 --- a/.chloggen/snmp-alpha.yaml +++ /dev/null @@ -1,16 +0,0 @@ -# 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: Set component status to alpha - -# One or more tracking issues related to the change -issues: [16454] - -# (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/solace-baggage.yaml b/.chloggen/solace-baggage.yaml deleted file mode 100644 index cbcde122d2d07..0000000000000 --- a/.chloggen/solace-baggage.yaml +++ /dev/null @@ -1,16 +0,0 @@ -# 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: solacereceiver - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: Added baggage unmarshalling support (introduced in Solace PubSub+ Event Broker 10.2.1) - -# One or more tracking issues related to the change -issues: [16570] - -# (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/solace-flowctrl.yaml b/.chloggen/solace-flowctrl.yaml deleted file mode 100644 index 6f6e62ae41aac..0000000000000 --- a/.chloggen/solace-flowctrl.yaml +++ /dev/null @@ -1,16 +0,0 @@ -# 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: solacereceiver - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: Added configurable retry interval for flow control scenarios - -# One or more tracking issues related to the change -issues: [16570] - -# (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/splitcmd.yaml b/.chloggen/splitcmd.yaml deleted file mode 100755 index 612074ac8781f..0000000000000 --- a/.chloggen/splitcmd.yaml +++ /dev/null @@ -1,11 +0,0 @@ -# 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: cmd/otelcontribcol - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: Split cmd/otelcontribcol into a separate module, extract testbed in a separate module - -# One or more tracking issues related to the change -issues: [16715] diff --git a/.chloggen/tailsampling-honor-final-decision.yaml b/.chloggen/tailsampling-honor-final-decision.yaml deleted file mode 100644 index cde5a836d5c7f..0000000000000 --- a/.chloggen/tailsampling-honor-final-decision.yaml +++ /dev/null @@ -1,16 +0,0 @@ -# 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: tailsamplingprocessor - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: When dealing with traces that have already been evaluated, use the final decision instead of trying using the individual decisions by the policies. - -# One or more tracking issues related to the change -issues: [14760] - -# (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/tp-add-new-funcs.yaml b/.chloggen/tp-add-new-funcs.yaml deleted file mode 100755 index d0d219b19e517..0000000000000 --- a/.chloggen/tp-add-new-funcs.yaml +++ /dev/null @@ -1,16 +0,0 @@ -# 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: transformprocessor - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: Add the `merge_maps` and `ParseJSON` functions. - -# One or more tracking issues related to the change -issues: [16551] - -# (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/tp-fix-spanevent-bug.yaml b/.chloggen/tp-fix-spanevent-bug.yaml deleted file mode 100755 index dfd84f7ff2fb5..0000000000000 --- a/.chloggen/tp-fix-spanevent-bug.yaml +++ /dev/null @@ -1,16 +0,0 @@ -# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' -change_type: bug_fix - -# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver) -component: processor/transform - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: Fix issue where collector would panic under certain conditions if the transformprocessor was configured to transform span events. - -# One or more tracking issues related to the change -issues: [16622] - -# (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/upgrade-doublestar-pkg-stanza.yaml b/.chloggen/upgrade-doublestar-pkg-stanza.yaml deleted file mode 100755 index a4adf5741e139..0000000000000 --- a/.chloggen/upgrade-doublestar-pkg-stanza.yaml +++ /dev/null @@ -1,16 +0,0 @@ -# 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/stanza' - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: 'Upgrade version of doublestar from v3 to v4' - -# One or more tracking issues related to the change -issues: [16528] - -# (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/yamlgen.yaml b/.chloggen/yamlgen.yaml deleted file mode 100755 index 3b3cbeb30338f..0000000000000 --- a/.chloggen/yamlgen.yaml +++ /dev/null @@ -1,16 +0,0 @@ -# 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: configschema - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: add yaml generation command - -# One or more tracking issues related to the change -issues: [15231] - -# (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/zipkin-shutdown.yaml b/.chloggen/zipkin-shutdown.yaml deleted file mode 100755 index d780af5f8b77c..0000000000000 --- a/.chloggen/zipkin-shutdown.yaml +++ /dev/null @@ -1,16 +0,0 @@ -# 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: zipkinreceiver - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: "Fix zipkinreceiver panic on shutdown" - -# One or more tracking issues related to the change -issues: [16471] - -# (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/.github/workflows/scripts/check-collector-module-version.sh b/.github/workflows/scripts/check-collector-module-version.sh index ceb8fdf2084cb..60f47ec4d54ce 100755 --- a/.github/workflows/scripts/check-collector-module-version.sh +++ b/.github/workflows/scripts/check-collector-module-version.sh @@ -26,7 +26,7 @@ get_collector_version() { main_mod_file="$2" if grep -q "$collector_module" "$main_mod_file"; then - grep "$collector_module" "$main_mod_file" | (read mod version; + grep "$collector_module" "$main_mod_file" | (read mod version rest; echo $version) else echo "Error: failed to retrieve the \"$collector_module\" version from \"$main_mod_file\"." @@ -72,14 +72,16 @@ check_collector_versions_correct() { # Note space at end of string. This is so it filters for the exact string # only and does not return string which contains this string as a substring. COLLECTOR_MODULE="go.opentelemetry.io/collector " +PDATA_MODULE="go.opentelemetry.io/collector/pdata " MAIN_MOD_FILE="./go.mod" COLLECTOR_MOD_VERSION=$(get_collector_version "$COLLECTOR_MODULE" "$MAIN_MOD_FILE") +PDATA_MOD_VERSION=$(get_collector_version "$PDATA_MODULE" "$MAIN_MOD_FILE") # Check the collector module version in each of the module files check_collector_versions_correct "$COLLECTOR_MODULE" "$COLLECTOR_MOD_VERSION" check_collector_versions_correct "go.opentelemetry.io/collector/component" "$COLLECTOR_MOD_VERSION" check_collector_versions_correct "go.opentelemetry.io/collector/consumer" "$COLLECTOR_MOD_VERSION" check_collector_versions_correct "go.opentelemetry.io/collector/featuregate" "$COLLECTOR_MOD_VERSION" -check_collector_versions_correct "go.opentelemetry.io/collector/pdata" "$COLLECTOR_MOD_VERSION" +check_collector_versions_correct "go.opentelemetry.io/collector/pdata" "$PDATA_MOD_VERSION" check_collector_versions_correct "go.opentelemetry.io/collector/semconv" "$COLLECTOR_MOD_VERSION" diff --git a/CHANGELOG.md b/CHANGELOG.md index 30828ea03c8a7..f4c8225283b1e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,108 @@ +## v0.67.0 + +### 🛑 Breaking changes 🛑 + +- `apachereceiver`: turn on by default feature gates for server name and port resource attributes (#14791) +- `cumulativetodeltaprocessor`: Remove histogram feature gate. (#16720) +- `mysqlreceiver`: rename mysql.commands metric to mysql.prepared_statements (#14138) + According to the documentation, the `Com_stmt_xxx` is related to prepared statements + ref: https://dev.mysql.com/doc/refman/8.0/en/server-status-variables.html + +- `mysqlreceiver`: rename mysql.commands metric to mysql.prepared_statements (#14138) + Disable the `receiver.mysqlreceiver.renameCommands` feature gate to temporarily revert this change. +- `dockerstatsreceiver`: Enable the `receiver.dockerstats.useScraperV2` feature gate by default. (#16381, #9794) + See the README for information on how to migrate. + The featuregate can be disabled, but it will be removed in a future release. + +- `coralogixexporter`: remove old jaeger based tracing client (#7931) +- `splunkhecexporter`: Remove all use of the name attribute from logs as it is deprecated. (#16611) + +### 🚩 Deprecations 🚩 + +- `servicegraphprocessor`: use prefix to distinguish dimensions from different span kind (#16002) + The metrics label converts from dimensions specifying in the config will have a prefix to mark where are from. + The `client_` prefix relates to the dimensions coming from spans with `SPAN_KIND_CLIENT`, and the `server_` prefix relates to the + dimensions coming from spans with `SPAN_KIND_SERVER`. The old dimensions will be removed in the next release. + + +### 🚀 New components 🚀 + +- `receiver/promtailreceiver`: Add a new receiver that scrapes logs using Promtail client (#14632) +- `receiver/purefareceiver`: Add a new receiver that scrapes metrics using Purestorage FlashArray API (#14886) +- `logicmonitorexporter`: New exporter for exporting traces and logs to Logicmonitor Platform (#13727) + +### 💡 Enhancements 💡 + +- `splunkhecexporter`: Add HEC health check before sending the data to Splunk (#16479) +- `jmxreceiver`: Add the JMX metrics gatherer version 1.20.1-alpha to the supported jars hash list (#16437) +- `hostmetricsreceiver`: Add a new optional metric `process.cpu.utilization` to the `process` scraper of the `hostmetrics` receiver. (#14084) +- `azureeventhubreceiver`: adds alternate log formatter that maps Azure log fields into OpenTelemetry attributes (#16283) +- `mysqlreceiver`: add mysql.connection.count metric (#14138) +- `elasticsearchreceiver`: add scraping metrics on cluster level (#14635) + The receiver now emits jvm and cache eviction metrics on cluster level scraped from new endpoint /_cluster/stats. +- `influxdbexporter`: Add support for exporting to InfluxDB v1.X API (#16042) +- `vcenterreceiver`: Added `vcenter.vm.memory.ssdswapped` and `vcenter.vm.memory.swapped` metrics. (#16727) +- `filelogreceiver`: Promote component to Beta status (#15355) +- `probabilisticsamplerprocessor`: Add support for probabilistic sampling of logs (#9117) +- `cmd/mdatagen`: Add support for `resource_attributes::enum` field (#16464) + `resource_attributes::enum` values in metadata.yaml are now properly supported in metrics builder developer interface. + +- `cmd/mdatagen`: Improve generated documentation (#16556, #16563) +- `cmd/mdatagen`: Add a metadata.yaml option to specify a warning that will be shown in case if metric is enabled. (#16536) +- `kafkaexporter`: Allows for custom marshalers to be added in future releases (#14514) +- `oracledbreceiver`: Add oracledbreceiver implementation (config, scraper, db client) (#16043) +- `filterprocessor`: Adapt ottl configuration to same BoolExpr, remove duplicate code (#16446) +- `pkg/ottl`: Updates the IsMatch function to convert bools, ints, and floats to strings before matching. (#16503) +- `pkg/ottl`: Add new `merge` function to OTTL, which allows merging maps. (#16461) +- `pkg/ottl`: Add ability to negate conditions with the `not` keyword (#16553) +- `pkg/ottl`: Add new `ParseJSON` function that can convert a json string into `pcommon.Map`. (#16444) +- `internal/filter`: Change filter interface to be compatible with ottl (#16443) +- `receiver/awscontainerinsightreceiver`: Polish up awscontainerinsightreceiver README (#16378) +- `pkg/translator/loki`: Remove loki dependency, copy files from logproto (#16822) + Files copied from github.com/grafana/loki/pkg/logproto to remove unnecessary dependencies. + In logproto.pb.go I had to remove few types Query[Request|Response] and SampleQuery[Request|Response] + and the gRPC service that uses them, because they depend on another loki package stats. + +- `snmpreceiver`: Set component status to alpha (#16454) +- `solacereceiver`: Added baggage unmarshalling support (introduced in Solace PubSub+ Event Broker 10.2.1) (#16570) +- `solacereceiver`: Added configurable retry interval for flow control scenarios (#16570) +- `cmd/otelcontribcol`: Split cmd/otelcontribcol into a separate module, extract testbed in a separate module (#16715) +- `transformprocessor`: Add the `merge_maps` and `ParseJSON` functions. (#16551) +- `pkg/stanza`: Upgrade version of doublestar from v3 to v4 (#16528) +- `configschema`: add yaml generation command (#15231) + +### 🧰 Bug fixes 🧰 + +- `exporter/azuredataexplorerexporter`: Makes timestamp precision to nanos, updated azure-kusto-go to 0.9.2 (#16546) +- `cumulativetodeltaprocessor`: Updates histogram conversion logic to correctly remove Min and Max when a histogram is converted. (#16520) +- `datadogexporter`: Doesn't append duplicate ddtags on each log submission leading to 414 API errors. (#16380) +- `exporter/dynatrace`: Make sure the original metrics are not mutated (#16506) +- `elasticsearchreceiver`: fix the set of operations for which the data is fetched on index-level (#14635) +- `filterexpr`: Fixed filterexpr Matcher.MatchMetric to be thread-safe (#13573) +- `fileexporter`: Fix nil pointer in `fileexporter` when reusing configuration for multiple telemetry signals or pipelines. (#16733) +- `vcenterreceiver`: vcenter.vm.memory.ballooned is taken from vm.Summary.QuickStats.BalloonedMemory that is expressed MiBy, not By. (#16728) +- `servicegraphprocessor`: Fixes the number of bucket counts. (#16000) +- `prometheusexporter`: Make sure the exporter doesn't mutate metrics (#16499, #16572) +- `datadogexporter`: Suppress logs exporter payload dump to avoid filelogreceiver escape loop (#16380) +- `headerssetter`: Do not require the secure transport for the headers setter extension. (#16508) +- `exporterconfig`: The exporter config options should be HTTPS endpoint URL only (#14323) +- `pkg/translator/loki`: fix loki.resource.labels not working as expected (#15386) +- `cmd/mdatagen`: Rename metadata.yaml attribute field from `value` to `name_override` (#16561) +- `exporter/awsemfexporter`: Consider metric data type while grouping metrics (#16512) +- `exporter/awsemfexporter`: Export fields of MetricDescriptor to enable decoding (#16566) +- `awskinesis`: Fixed configuration issues not being correctly used. (#16259) + -| - Fixed applying region to the kinesis exporter +- `pkg/ottl`: Add support for lists to be used as Getter values (#16320) +- `prometheusreceiver`: Fix prometheus receiver panic on shutdown (#16469) +- `exporter/instana`: Make sure the original traces are not mutated (#16505) +- `routingprocessor`: Fix bug in routing processor that prevented collector from starting if `from_attribute` is not provided with `OTTL` routing statements. (#16555) +- `tailsamplingprocessor`: When dealing with traces that have already been evaluated, use the final decision instead of trying using the individual decisions by the policies. (#14760) +- `processor/transform`: Fix issue where collector would panic under certain conditions if the transformprocessor was configured to transform span events. (#16622) +- `zipkinreceiver`: Fix zipkinreceiver panic on shutdown (#16471) + ## v0.66.0 ### 💡 Enhancements 💡 diff --git a/Makefile b/Makefile index ec70abd06dc7c..8b21a75782f9c 100644 --- a/Makefile +++ b/Makefile @@ -358,6 +358,11 @@ multimod-prerelease: install-tools multimod prerelease -s=true -b=false -v ./versions.yaml -m contrib-base $(MAKE) gotidy +.PHONY: multimod-sync +multimod-sync: install-tools + multimod sync -a=true -s=true -o ../opentelemetry-collector + $(MAKE) gotidy + .PHONY: crosslink crosslink: install-tools @echo "Executing crosslink" diff --git a/cmd/configschema/go.mod b/cmd/configschema/go.mod index 3e12e570d8153..d10dabb9819c5 100644 --- a/cmd/configschema/go.mod +++ b/cmd/configschema/go.mod @@ -5,12 +5,12 @@ go 1.18 require ( github.com/fatih/structtag v1.2.0 github.com/google/uuid v1.3.0 - github.com/open-telemetry/opentelemetry-collector-contrib v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/redisreceiver v0.66.0 + github.com/open-telemetry/opentelemetry-collector-contrib v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/redisreceiver v0.67.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/receiver/otlpreceiver v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector v0.67.0 + go.opentelemetry.io/collector/component v0.67.0 + go.opentelemetry.io/collector/receiver/otlpreceiver v0.67.0 golang.org/x/mod v0.7.0 golang.org/x/text v0.5.0 gopkg.in/yaml.v2 v2.4.0 @@ -79,9 +79,6 @@ require ( github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector/googlemanagedprometheus v0.34.3-0.20221202192616-0186b89ba914 // indirect github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.10.2 // indirect github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.34.3-0.20221202192616-0186b89ba914 // indirect - github.com/Masterminds/goutils v1.1.1 // indirect - github.com/Masterminds/semver/v3 v3.1.1 // indirect - github.com/Masterminds/sprig/v3 v3.2.2 // indirect github.com/Microsoft/go-winio v0.5.2 // indirect github.com/ReneKroon/ttlcache/v2 v2.11.0 // indirect github.com/SAP/go-hdb v0.111.5 // indirect @@ -100,7 +97,6 @@ require ( github.com/apache/thrift v0.17.0 // indirect github.com/ardielle/ardielle-go v1.5.2 // indirect github.com/armon/go-metrics v0.4.0 // indirect - github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d // indirect github.com/aws/aws-sdk-go v1.44.155 // indirect github.com/aws/aws-sdk-go-v2 v1.17.2 // indirect github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.4.10 // indirect @@ -124,21 +120,15 @@ require ( github.com/aws/smithy-go v1.13.5 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/blang/semver v3.5.1+incompatible // indirect - github.com/bmatcuk/doublestar v1.2.2 // indirect github.com/bmatcuk/doublestar/v4 v4.4.0 // indirect - github.com/bradfitz/gomemcache v0.0.0-20190913173617-a41fca850d0b // indirect - github.com/buger/jsonparser v1.1.1 // indirect - github.com/c2h5oh/datasize v0.0.0-20200112174442-28bbd4740fee // indirect github.com/caio/go-tdigest v3.1.0+incompatible // indirect github.com/cenkalti/backoff v2.2.1+incompatible // indirect github.com/cenkalti/backoff/v4 v4.2.0 // indirect github.com/census-instrumentation/opencensus-proto v0.4.1 // indirect - github.com/cespare/xxhash v1.1.0 // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect github.com/checkpoint-restore/go-criu/v5 v5.3.0 // indirect github.com/cihub/seelog v0.0.0-20170130134532-f561c5e57575 // indirect github.com/cilium/ebpf v0.8.1 // indirect - github.com/cloudflare/cloudflare-go v0.27.0 // indirect github.com/cloudfoundry-incubator/uaago v0.0.0-20190307164349-8136b7bbe76e // indirect github.com/cncf/udpa/go v0.0.0-20210930031921-04548b0d99d4 // indirect github.com/cncf/xds/go v0.0.0-20220314180256-7f1daf1720fc // indirect @@ -146,8 +136,6 @@ require ( github.com/containerd/console v1.0.3 // indirect github.com/containerd/ttrpc v1.1.0 // indirect github.com/coreos/go-oidc v2.2.1+incompatible // indirect - github.com/coreos/go-semver v0.3.0 // indirect - github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf // indirect github.com/coreos/go-systemd/v22 v22.4.0 // indirect github.com/cyphar/filepath-securejoin v0.2.3 // indirect github.com/danieljoos/wincred v1.1.2 // indirect @@ -156,7 +144,6 @@ require ( github.com/dennwc/varint v1.0.0 // indirect github.com/devigned/tab v0.1.1 // indirect github.com/dgraph-io/ristretto v0.1.1 // indirect - github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect github.com/digitalocean/godo v1.88.0 // indirect github.com/dimchansky/utfbom v1.1.1 // indirect github.com/docker/distribution v2.8.1+incompatible // indirect @@ -169,7 +156,6 @@ require ( github.com/eapache/go-resiliency v1.3.0 // indirect github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21 // indirect github.com/eapache/queue v1.1.0 // indirect - github.com/edsrzf/mmap-go v1.1.0 // indirect github.com/elastic/elastic-transport-go/v8 v8.1.0 // indirect github.com/elastic/go-elasticsearch/v8 v8.5.0 // indirect github.com/elastic/go-structform v0.0.10 // indirect @@ -178,7 +164,6 @@ require ( github.com/envoyproxy/protoc-gen-validate v0.6.13 // indirect github.com/euank/go-kmsg-parser v2.0.0+incompatible // indirect github.com/facebook/time v0.0.0-20220713225404-f7a0d7702d50 // indirect - github.com/facette/natsort v0.0.0-20181210072756-2cd4dd1e2dcb // indirect github.com/fatih/color v1.13.0 // indirect github.com/felixge/httpsnoop v1.0.3 // indirect github.com/form3tech-oss/jwt-go v3.2.5+incompatible // indirect @@ -193,17 +178,10 @@ require ( github.com/go-logr/logr v1.2.3 // indirect github.com/go-logr/stdr v1.2.2 // indirect github.com/go-ole/go-ole v1.2.6 // indirect - github.com/go-openapi/analysis v0.21.2 // indirect - github.com/go-openapi/errors v0.20.2 // indirect github.com/go-openapi/jsonpointer v0.19.5 // indirect github.com/go-openapi/jsonreference v0.20.0 // indirect - github.com/go-openapi/loads v0.21.1 // indirect - github.com/go-openapi/spec v0.20.6 // indirect - github.com/go-openapi/strfmt v0.21.3 // indirect github.com/go-openapi/swag v0.22.1 // indirect - github.com/go-openapi/validate v0.22.0 // indirect github.com/go-redis/redis/v7 v7.4.1 // indirect - github.com/go-redis/redis/v8 v8.11.5 // indirect github.com/go-resty/resty/v2 v2.1.1-0.20191201195748-d7b97669fe48 // indirect github.com/go-sql-driver/mysql v1.7.0 // indirect github.com/go-stack/stack v1.8.1 // indirect @@ -214,7 +192,6 @@ require ( github.com/gofrs/uuid v4.2.0+incompatible // indirect github.com/gogo/googleapis v1.4.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect - github.com/gogo/status v1.1.1 // indirect github.com/golang-jwt/jwt v3.2.2+incompatible // indirect github.com/golang-jwt/jwt/v4 v4.4.2 // indirect github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe // indirect @@ -223,26 +200,20 @@ require ( github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect github.com/golang/protobuf v1.5.2 // indirect github.com/golang/snappy v0.0.4 // indirect - github.com/google/btree v1.0.1 // indirect github.com/google/cadvisor v0.46.0 // indirect github.com/google/flatbuffers v2.0.8+incompatible // indirect github.com/google/gnostic v0.5.7-v3refs // 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/renameio/v2 v2.0.0 // indirect github.com/googleapis/enterprise-certificate-proxy v0.2.0 // indirect github.com/googleapis/gax-go/v2 v2.7.0 // indirect github.com/gophercloud/gophercloud v1.0.0 // indirect github.com/gorilla/mux v1.8.0 // indirect github.com/gorilla/websocket v1.5.0 // indirect github.com/gosnmp/gosnmp v1.35.0 // indirect - github.com/grafana/dskit v0.0.0-20220928083349-b1b307db4f30 // indirect - github.com/grafana/go-gelf/v2 v2.0.1 // indirect - github.com/grafana/loki v1.6.2-0.20221206154352-fee23745328c // indirect github.com/grafana/regexp v0.0.0-20221005093135-b4c2bcb0a4b6 // indirect github.com/grobie/gomemcache v0.0.0-20180201122607-1f779c573665 // indirect - github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 // indirect github.com/grpc-ecosystem/grpc-gateway/v2 v2.14.0 // indirect github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c // indirect github.com/hashicorp/consul/api v1.18.0 // indirect @@ -251,21 +222,15 @@ require ( github.com/hashicorp/go-cleanhttp v0.5.2 // indirect github.com/hashicorp/go-hclog v1.3.1 // indirect github.com/hashicorp/go-immutable-radix v1.3.1 // indirect - github.com/hashicorp/go-msgpack v0.5.5 // indirect github.com/hashicorp/go-multierror v1.1.1 // indirect github.com/hashicorp/go-retryablehttp v0.7.1 // indirect github.com/hashicorp/go-rootcerts v1.0.2 // indirect - github.com/hashicorp/go-sockaddr v1.0.2 // indirect github.com/hashicorp/go-uuid v1.0.3 // indirect github.com/hashicorp/go-version v1.6.0 // indirect github.com/hashicorp/golang-lru v0.5.4 // indirect - github.com/hashicorp/memberlist v0.5.0 // indirect github.com/hashicorp/nomad/api v0.0.0-20221102143410-8a95f1239005 // indirect github.com/hashicorp/serf v0.10.1 // indirect - github.com/heroku/x v0.0.50 // indirect github.com/hetznercloud/hcloud-go v1.35.3 // indirect - github.com/hpcloud/tail v1.0.0 // indirect - github.com/huandu/xstrings v1.3.1 // indirect github.com/iancoleman/strcase v0.2.0 // indirect github.com/imdario/mergo v0.3.12 // indirect github.com/influxdata/go-syslog/v3 v3.0.1-0.20210608084020-ac565dc76ba6 // indirect @@ -273,7 +238,6 @@ require ( github.com/influxdata/influxdb-observability/influx2otel v0.2.32 // indirect github.com/influxdata/influxdb-observability/otel2influx v0.2.32 // indirect github.com/influxdata/line-protocol/v2 v2.2.1 // indirect - github.com/influxdata/telegraf v1.16.3 // indirect github.com/ionos-cloud/sdk-go/v6 v6.1.3 // indirect github.com/jackc/chunkreader/v2 v2.0.1 // indirect github.com/jackc/pgconn v1.13.0 // indirect @@ -293,7 +257,6 @@ require ( github.com/josharian/intern v1.0.0 // indirect github.com/jpillora/backoff v1.0.0 // indirect github.com/json-iterator/go v1.1.12 // indirect - github.com/julienschmidt/httprouter v1.3.0 // indirect github.com/karrick/godirwalk v1.17.0 // indirect github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect github.com/klauspost/compress v1.15.12 // indirect @@ -335,191 +298,189 @@ require ( github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f // indirect github.com/nginxinc/nginx-prometheus-exporter v0.8.1-0.20201110005315-f5a5f8086c19 // indirect github.com/observiq/ctimefmt v1.0.0 // indirect - github.com/oklog/ulid v1.3.1 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/alibabacloudlogserviceexporter v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awscloudwatchlogsexporter v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsemfexporter v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awskinesisexporter v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsxrayexporter v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/azuredataexplorerexporter v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/azuremonitorexporter v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/carbonexporter v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/clickhouseexporter v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/coralogixexporter v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/datadogexporter v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/dynatraceexporter v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/elasticsearchexporter v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/f5cloudexporter v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/fileexporter v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/googlecloudexporter v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/googlecloudpubsubexporter v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/googlemanagedprometheusexporter v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/humioexporter v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/influxdbexporter v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/instanaexporter v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/jaegerexporter v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/jaegerthrifthttpexporter v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/kafkaexporter v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/loadbalancingexporter v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/logzioexporter v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/lokiexporter v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/mezmoexporter v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/opencensusexporter v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/parquetexporter v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusexporter v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusremotewriteexporter v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/pulsarexporter v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/sapmexporter v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/sentryexporter v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/signalfxexporter v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/skywalkingexporter v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/splunkhecexporter v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/sumologicexporter v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/tanzuobservabilityexporter v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/tencentcloudlogserviceexporter v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/zipkinexporter v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/extension/asapauthextension v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/extension/awsproxy v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/extension/basicauthextension v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/extension/bearertokenauthextension v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/extension/fluentbitextension v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/extension/headerssetterextension v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/extension/httpforwarder v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/extension/oauth2clientauthextension v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/ecstaskobserver v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/hostobserver v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/k8sobserver v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/extension/oidcauthextension v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/extension/pprofextension v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/extension/sigv4authextension v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/containerinsight v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/cwlogs v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/ecsutil v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/k8s v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/metrics v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/proxy v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/internal/docker v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/internal/filter v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/internal/kubelet v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/internal/metadataproviders v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/internal/splunk v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchperresourceattr v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchpersignal v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/experimentalmetricmetadata v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/loki v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheus v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheusremotewrite v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/signalfx v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/zipkin v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/winperfcounters v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/processor/cumulativetodeltaprocessor v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/processor/deltatorateprocessor v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/processor/filterprocessor v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/processor/groupbyattrsprocessor v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/processor/groupbytraceprocessor v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/processor/k8sattributesprocessor v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/processor/metricsgenerationprocessor v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/processor/metricstransformprocessor v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/processor/probabilisticsamplerprocessor v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourceprocessor v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/processor/routingprocessor v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/processor/servicegraphprocessor v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/processor/spanmetricsprocessor v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/processor/spanprocessor v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/processor/tailsamplingprocessor v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/processor/transformprocessor v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/activedirectorydsreceiver v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/aerospikereceiver v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/apachereceiver v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awscloudwatchreceiver v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsecscontainermetricsreceiver v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsfirehosereceiver v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsxrayreceiver v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/azureeventhubreceiver v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/bigipreceiver v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/carbonreceiver v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/chronyreceiver v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/cloudfoundryreceiver v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/collectdreceiver v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/couchdbreceiver v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/dockerstatsreceiver v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/dotnetdiagnosticsreceiver v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/elasticsearchreceiver v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/expvarreceiver v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/filelogreceiver v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/flinkmetricsreceiver v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/fluentforwardreceiver v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/googlecloudpubsubreceiver v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/googlecloudspannerreceiver v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/httpcheckreceiver v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/iisreceiver v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/influxdbreceiver v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jmxreceiver v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/journaldreceiver v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8sclusterreceiver v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8seventsreceiver v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8sobjectsreceiver v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkametricsreceiver v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkareceiver v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kubeletstatsreceiver v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/memcachedreceiver v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/mongodbatlasreceiver v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/mongodbreceiver v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/mysqlreceiver v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/nginxreceiver v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/nsxtreceiver v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/opencensusreceiver v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/oracledbreceiver v0.66.0 //indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/otlpjsonfilereceiver v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/podmanreceiver v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/postgresqlreceiver v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusexecreceiver v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/promtailreceiver v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/pulsarreceiver v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/purefareceiver v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/rabbitmqreceiver v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/receivercreator v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/riakreceiver v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/saphanareceiver v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/sapmreceiver v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/signalfxreceiver v0.0.0-00010101000000-000000000000 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/simpleprometheusreceiver v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/skywalkingreceiver v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/snmpreceiver v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/solacereceiver v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/splunkhecreceiver v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/sqlqueryreceiver v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/sqlserverreceiver v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/statsdreceiver v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/syslogreceiver v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/tcplogreceiver v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/udplogreceiver v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/vcenterreceiver v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/wavefrontreceiver v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/windowseventlogreceiver v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/windowsperfcountersreceiver v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zookeeperreceiver v0.66.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/alibabacloudlogserviceexporter v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awscloudwatchlogsexporter v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsemfexporter v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awskinesisexporter v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsxrayexporter v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/azuredataexplorerexporter v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/azuremonitorexporter v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/carbonexporter v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/clickhouseexporter v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/coralogixexporter v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/datadogexporter v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/dynatraceexporter v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/elasticsearchexporter v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/f5cloudexporter v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/fileexporter v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/googlecloudexporter v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/googlecloudpubsubexporter v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/googlemanagedprometheusexporter v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/humioexporter v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/influxdbexporter v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/instanaexporter v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/jaegerexporter v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/jaegerthrifthttpexporter v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/kafkaexporter v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/loadbalancingexporter v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/logzioexporter v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/lokiexporter v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/mezmoexporter v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/opencensusexporter v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/parquetexporter v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusexporter v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusremotewriteexporter v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/pulsarexporter v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/sapmexporter v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/sentryexporter v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/signalfxexporter v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/skywalkingexporter v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/splunkhecexporter v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/sumologicexporter v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/tanzuobservabilityexporter v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/tencentcloudlogserviceexporter v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/zipkinexporter v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/extension/asapauthextension v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/extension/awsproxy v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/extension/basicauthextension v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/extension/bearertokenauthextension v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/extension/fluentbitextension v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/extension/headerssetterextension v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/extension/httpforwarder v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/extension/oauth2clientauthextension v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/ecstaskobserver v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/hostobserver v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/k8sobserver v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/extension/oidcauthextension v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/extension/pprofextension v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/extension/sigv4authextension v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/containerinsight v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/cwlogs v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/ecsutil v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/k8s v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/metrics v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/proxy v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/internal/docker v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/internal/filter v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/internal/kubelet v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/internal/metadataproviders v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/internal/splunk v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchperresourceattr v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchpersignal v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/experimentalmetricmetadata v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/loki v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheus v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheusremotewrite v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/signalfx v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/zipkin v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/winperfcounters v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/processor/cumulativetodeltaprocessor v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/processor/deltatorateprocessor v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/processor/filterprocessor v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/processor/groupbyattrsprocessor v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/processor/groupbytraceprocessor v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/processor/k8sattributesprocessor v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/processor/metricsgenerationprocessor v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/processor/metricstransformprocessor v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/processor/probabilisticsamplerprocessor v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourceprocessor v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/processor/routingprocessor v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/processor/servicegraphprocessor v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/processor/spanmetricsprocessor v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/processor/spanprocessor v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/processor/tailsamplingprocessor v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/processor/transformprocessor v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/activedirectorydsreceiver v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/aerospikereceiver v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/apachereceiver v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awscloudwatchreceiver v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsecscontainermetricsreceiver v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsfirehosereceiver v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsxrayreceiver v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/azureeventhubreceiver v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/bigipreceiver v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/carbonreceiver v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/chronyreceiver v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/cloudfoundryreceiver v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/collectdreceiver v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/couchdbreceiver v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/dockerstatsreceiver v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/dotnetdiagnosticsreceiver v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/elasticsearchreceiver v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/expvarreceiver v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/filelogreceiver v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/flinkmetricsreceiver v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/fluentforwardreceiver v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/googlecloudpubsubreceiver v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/googlecloudspannerreceiver v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/httpcheckreceiver v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/iisreceiver v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/influxdbreceiver v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jmxreceiver v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/journaldreceiver v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8sclusterreceiver v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8seventsreceiver v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8sobjectsreceiver v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkametricsreceiver v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkareceiver v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kubeletstatsreceiver v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/memcachedreceiver v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/mongodbatlasreceiver v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/mongodbreceiver v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/mysqlreceiver v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/nginxreceiver v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/nsxtreceiver v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/opencensusreceiver v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/oracledbreceiver v0.67.0 //indirect + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/otlpjsonfilereceiver v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/podmanreceiver v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/postgresqlreceiver v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusexecreceiver v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/pulsarreceiver v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/purefareceiver v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/rabbitmqreceiver v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/receivercreator v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/riakreceiver v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/saphanareceiver v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/sapmreceiver v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/signalfxreceiver v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/simpleprometheusreceiver v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/skywalkingreceiver v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/snmpreceiver v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/solacereceiver v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/splunkhecreceiver v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/sqlqueryreceiver v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/sqlserverreceiver v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/statsdreceiver v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/syslogreceiver v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/tcplogreceiver v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/udplogreceiver v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/vcenterreceiver v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/wavefrontreceiver v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/windowseventlogreceiver v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/windowsperfcountersreceiver v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zookeeperreceiver v0.67.0 // indirect github.com/opencontainers/go-digest v1.0.0 // indirect github.com/opencontainers/image-spec v1.0.3-0.20211202183452-c5a74bcca799 // indirect github.com/opencontainers/runc v1.1.4 // indirect @@ -528,8 +489,6 @@ require ( github.com/openlyinc/pointy v1.2.0 // indirect github.com/openshift/api v0.0.0-20210521075222-e273a339932a // indirect github.com/openshift/client-go v0.0.0-20210521082421-73d9475a9142 // indirect - github.com/opentracing-contrib/go-grpc v0.0.0-20210225150812-73cb765af46e // indirect - github.com/opentracing-contrib/go-stdlib v1.0.0 // indirect github.com/opentracing/opentracing-go v1.2.0 // indirect github.com/openzipkin/zipkin-go v0.4.1 // indirect github.com/ovh/go-ovh v1.3.0 // indirect @@ -543,23 +502,19 @@ require ( github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect github.com/power-devops/perfstat v0.0.0-20220216144756-c35f1ee13d7c // indirect github.com/pquerna/cachecontrol v0.1.0 // indirect - github.com/prometheus/alertmanager v0.24.0 // indirect github.com/prometheus/client_golang v1.14.0 // indirect github.com/prometheus/client_model v0.3.0 // indirect github.com/prometheus/common v0.37.0 // indirect github.com/prometheus/common/sigv4 v0.1.0 // indirect - github.com/prometheus/exporter-toolkit v0.8.2 // indirect github.com/prometheus/procfs v0.8.0 // indirect github.com/prometheus/prometheus v0.40.5 // indirect github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect github.com/relvacode/iso8601 v1.1.0 // indirect github.com/rs/cors v1.8.2 // indirect github.com/scaleway/scaleway-sdk-go v1.0.0-beta.9 // indirect - github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529 // indirect github.com/seccomp/libseccomp-golang v0.9.2-0.20220502022130-f33da4d89646 // indirect github.com/secure-systems-lab/go-securesystemslib v0.4.0 // indirect github.com/segmentio/asm v1.2.0 // indirect - github.com/sercand/kuberesolver v2.4.0+incompatible // indirect github.com/shirou/gopsutil/v3 v3.22.10 // indirect github.com/shopspring/decimal v1.3.1 // indirect github.com/signalfx/com_signalfx_metrics_protobuf v0.0.3 // indirect @@ -571,16 +526,13 @@ require ( github.com/sirupsen/logrus v1.9.0 // indirect github.com/snowflakedb/gosnowflake v1.6.15 // indirect github.com/soheilhy/cmux v0.1.5 // indirect - github.com/sony/gobreaker v0.5.0 // indirect github.com/spaolacci/murmur3 v1.1.0 // indirect - github.com/spf13/afero v1.9.2 // indirect github.com/spf13/cast v1.5.0 // indirect github.com/spf13/pflag v1.0.5 // indirect github.com/stretchr/objx v0.5.0 // indirect github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635 // indirect github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.553 // indirect github.com/tg123/go-htpasswd v1.2.0 // indirect - github.com/thanos-io/thanos v0.28.0 // indirect github.com/theupdateframework/go-tuf v0.3.0 // indirect github.com/tidwall/gjson v1.14.3 // indirect github.com/tidwall/match v1.1.1 // indirect @@ -600,8 +552,6 @@ require ( github.com/vmware/govmomi v0.29.0 // indirect github.com/vultr/govultr/v2 v2.17.2 // indirect github.com/wavefronthq/wavefront-sdk-go v0.11.0 // indirect - github.com/weaveworks/common v0.0.0-20221201103051-7c2720a9024d // indirect - github.com/weaveworks/promrus v1.2.0 // indirect github.com/xdg-go/pbkdf2 v1.0.0 // indirect github.com/xdg-go/scram v1.1.1 // indirect github.com/xdg-go/stringprep v1.0.3 // indirect @@ -609,24 +559,21 @@ require ( github.com/yuin/gopher-lua v0.0.0-20220504180219-658193537a64 // indirect github.com/yusufpapurcu/wmi v1.2.2 // indirect go.etcd.io/bbolt v1.3.6 // indirect - go.etcd.io/etcd/api/v3 v3.5.5 // indirect - go.etcd.io/etcd/client/pkg/v3 v3.5.5 // indirect - go.etcd.io/etcd/client/v3 v3.5.5 // indirect go.mongodb.org/atlas v0.19.0 // indirect go.mongodb.org/mongo-driver v1.10.3 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a // indirect - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 // indirect - go.opentelemetry.io/collector/exporter/loggingexporter v0.66.1-0.20221202005155-1c54042beb70 // indirect - go.opentelemetry.io/collector/exporter/otlpexporter v0.66.1-0.20221202005155-1c54042beb70 // indirect - go.opentelemetry.io/collector/exporter/otlphttpexporter v0.66.1-0.20221202005155-1c54042beb70 // indirect - go.opentelemetry.io/collector/extension/ballastextension v0.66.1-0.20221202005155-1c54042beb70 // indirect - go.opentelemetry.io/collector/extension/zpagesextension v0.66.1-0.20221202005155-1c54042beb70 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 // indirect - go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221202005155-1c54042beb70 // indirect - go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.66.1-0.20221202005155-1c54042beb70 // indirect - go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/confmap v0.67.0 // indirect + go.opentelemetry.io/collector/consumer v0.67.0 // indirect + go.opentelemetry.io/collector/exporter/loggingexporter v0.67.0 // indirect + go.opentelemetry.io/collector/exporter/otlpexporter v0.67.0 // indirect + go.opentelemetry.io/collector/exporter/otlphttpexporter v0.67.0 // indirect + go.opentelemetry.io/collector/extension/ballastextension v0.67.0 // indirect + go.opentelemetry.io/collector/extension/zpagesextension v0.67.0 // indirect + go.opentelemetry.io/collector/featuregate v0.67.0 // indirect + go.opentelemetry.io/collector/pdata v1.0.0-rc1 // indirect + go.opentelemetry.io/collector/processor/batchprocessor v0.67.0 // indirect + go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.67.0 // indirect + go.opentelemetry.io/collector/semconv v0.67.0 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 // indirect go.opentelemetry.io/contrib/zpages v0.36.4 // indirect @@ -639,8 +586,6 @@ require ( go.uber.org/goleak v1.2.0 // indirect go.uber.org/multierr v1.8.0 // indirect go.uber.org/zap v1.24.0 // indirect - go4.org/intern v0.0.0-20211027215823-ae77deb06f29 // indirect - go4.org/unsafe/assume-no-moving-gc v0.0.0-20220617031537-928513b29760 // indirect golang.org/x/crypto v0.3.0 // indirect golang.org/x/exp v0.0.0-20221205204356-47842c84f3db // indirect golang.org/x/net v0.3.0 // indirect @@ -657,16 +602,12 @@ require ( google.golang.org/genproto v0.0.0-20221206210731-b1a01be3a5f6 // indirect google.golang.org/grpc v1.51.0 // indirect google.golang.org/protobuf v1.28.1 // indirect - gopkg.in/fsnotify.v1 v1.4.7 // indirect - gopkg.in/fsnotify/fsnotify.v1 v1.4.7 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect gopkg.in/square/go-jose.v2 v2.5.1 // indirect - gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect gopkg.in/zorkian/go-datadog-api.v2 v2.30.0 // indirect - inet.af/netaddr v0.0.0-20211027220019-c74959edd3b6 // indirect k8s.io/api v0.25.4 // indirect k8s.io/apimachinery v0.25.4 // indirect k8s.io/client-go v0.25.4 // indirect @@ -1004,8 +945,6 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prome replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver => ../../receiver/prometheusreceiver -replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/promtailreceiver => ../../receiver/promtailreceiver - replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/pulsarreceiver => ../../receiver/pulsarreceiver replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/purefareceiver => ../../receiver/purefareceiver diff --git a/cmd/configschema/go.sum b/cmd/configschema/go.sum index 05fcbf9512092..be11894c3c3d6 100644 --- a/cmd/configschema/go.sum +++ b/cmd/configschema/go.sum @@ -3,7 +3,6 @@ bitbucket.org/atlassian/go-asap/v2 v2.6.0 h1:KiLw3IgbzFLqNxCrVZoKUDJKMxUGoOd+NEO bitbucket.org/atlassian/go-asap/v2 v2.6.0/go.mod h1:cuRgWb7eeGtsocKmqY2kPlMMlwpkeNh+QOIkjAMlUBc= cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= -cloud.google.com/go v0.37.4/go.mod h1:NHPJ89PdicEuT9hdPXMROBD91xc5uRDxsMtSB16k7hw= 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= @@ -168,7 +167,6 @@ cloud.google.com/go/iap v1.4.0/go.mod h1:RGFwRJdihTINIe4wZ2iCP0zF/qu18ZwyKxrhMhy cloud.google.com/go/ids v1.1.0/go.mod h1:WIuwCaYVOzHIj2OhN9HAwvW+DBdmUAdcWlFxRl+KubM= cloud.google.com/go/iot v1.3.0/go.mod h1:r7RGh2B61+B8oz0AGE+J72AhA0G7tdXItODWsaA2oLs= cloud.google.com/go/kms v1.5.0/go.mod h1:QJS2YY0eJGBg3mnDfuaCyLauWwBJiHRboYxJ++1xJNg= -cloud.google.com/go/kms v1.6.0 h1:OWRZzrPmOZUzurjI2FBGtgY2mB1WaJkqhw6oIwSj0Yg= cloud.google.com/go/language v1.4.0/go.mod h1:F9dRpNFQmJbkaop6g0JhSBXCNlO90e1KWx5iDdxbWic= cloud.google.com/go/language v1.6.0/go.mod h1:6dJ8t3B+lUYfStgls25GusK04NLh3eDLQnWM3mdEbhI= cloud.google.com/go/language v1.7.0/go.mod h1:DJ6dYN/W+SQOjF8e1hLQXMF21AkH2w9wiPzPCJa2MIE= @@ -308,8 +306,6 @@ code.cloudfoundry.org/go-loggregator v7.4.0+incompatible h1:KqZYloMQWM5Zg/BQKunO code.cloudfoundry.org/go-loggregator v7.4.0+incompatible/go.mod h1:KPBTRqj+y738Nhf1+g4JHFaBU8j7dedirR5ETNHvMXU= code.cloudfoundry.org/rfc5424 v0.0.0-20201103192249-000122071b78 h1:mrZQaZmuDIPhSp6b96b+CRKC2uH44ifa5cjDV2epKis= code.cloudfoundry.org/rfc5424 v0.0.0-20201103192249-000122071b78/go.mod h1:tkZo8GtzBjySJ7USvxm4E36lNQw1D3xM6oKHGqdaAJ4= -collectd.org v0.3.0/go.mod h1:A/8DzQBkF6abtvrT2j/AU/4tiBgJWYyh0y/oB/4MlWE= -contrib.go.opencensus.io/exporter/ocagent v0.6.0/go.mod h1:zmKjrJcdo0aYcVS7bmEeSEBLPA9YJp5bjrofdU3pIXs= contrib.go.opencensus.io/exporter/prometheus v0.4.1/go.mod h1:t9wvfitlUjGXG2IXAZsuFq26mDGid/JwCEXp+gTG/9U= contrib.go.opencensus.io/exporter/prometheus v0.4.2 h1:sqfsYl5GIY/L570iT+l93ehxaWJs2/OwXtiWwew3oAg= contrib.go.opencensus.io/exporter/prometheus v0.4.2/go.mod h1:dvEHbiKmgvbr5pjaF9fpw1KeYcjrnC1J8B+JKjsZyRQ= @@ -325,19 +321,15 @@ github.com/99designs/keyring v1.2.1/go.mod h1:fc+wB5KTk9wQ9sDx0kFXB3A0MaeGHM9AwR github.com/AndreasBriese/bbloom v0.0.0-20190825152654-46b345b51c96/go.mod h1:bOvUY6CB00SOBii9/FifXqc0awNKxLFCL/+pkDPuyl8= github.com/AthenZ/athenz v1.10.39 h1:mtwHTF/v62ewY2Z5KWhuZgVXftBej1/Tn80zx4DcawY= github.com/AthenZ/athenz v1.10.39/go.mod h1:3Tg8HLsiQZp81BJY58JBeU2BR6B/H4/0MQGfCwhHNEA= -github.com/Azure/azure-amqp-common-go/v3 v3.0.0/go.mod h1:SY08giD/XbhTz07tJdpw1SoxQXHPN30+DI3Z04SYqyg= github.com/Azure/azure-amqp-common-go/v3 v3.2.3 h1:uDF62mbd9bypXWi19V1bN5NZEO84JqgmI5G73ibAmrk= github.com/Azure/azure-amqp-common-go/v3 v3.2.3/go.mod h1:7rPmbSfszeovxGfc5fSAXE4ehlXQZHpMja2OtxC2Tas= -github.com/Azure/azure-event-hubs-go/v3 v3.2.0/go.mod h1:BPIIJNH/l/fVHYq3Rm6eg4clbrULrQ3q7+icmqHyyLc= github.com/Azure/azure-event-hubs-go/v3 v3.3.20 h1:LRAy00JlV5aDqd0LFXwfwFReYzl03CtH/kD91OHrT94= github.com/Azure/azure-event-hubs-go/v3 v3.3.20/go.mod h1:5GkwDWncbqGCPjf76khiylOAD2NjkrUrLFb/S99BiA8= github.com/Azure/azure-kusto-go v0.9.2 h1:AP0bNhGyvc51XHi6nBMABDjCqgJb/KGrCrcm7KvYFyk= github.com/Azure/azure-kusto-go v0.9.2/go.mod h1:i7WCtgt4XeHge3+Oi5sq84HYhneNi7VY7hr35wsUdrg= github.com/Azure/azure-pipeline-go v0.1.8/go.mod h1:XA1kFWRVhSK+KNFiOhfv83Fv8L9achrP7OxIzeTn1Yg= -github.com/Azure/azure-pipeline-go v0.1.9/go.mod h1:XA1kFWRVhSK+KNFiOhfv83Fv8L9achrP7OxIzeTn1Yg= github.com/Azure/azure-pipeline-go v0.2.3 h1:7U9HBg1JFK3jHl5qmo4CTZKFTVgMwdFHMVtCdfBE21U= github.com/Azure/azure-pipeline-go v0.2.3/go.mod h1:x841ezTBIMG6O3lAcl8ATHnsOPVl2bqk7S3ta6S6u4k= -github.com/Azure/azure-sdk-for-go v37.1.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= github.com/Azure/azure-sdk-for-go v61.2.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= github.com/Azure/azure-sdk-for-go v65.0.0+incompatible h1:HzKLt3kIwMm4KeJYTdx9EbjRYTySD/t8i1Ee/W5EGXw= github.com/Azure/azure-sdk-for-go v65.0.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= @@ -350,17 +342,13 @@ github.com/Azure/azure-sdk-for-go/sdk/internal v0.8.3 h1:E+m3SkZCN0Bf5q7YdTs5lSm github.com/Azure/azure-sdk-for-go/sdk/internal v0.8.3/go.mod h1:KLF4gFr6DcKFZwSuH8w8yEK6DpFl3LP5rhdvAb7Yz5I= github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v0.3.0 h1:Px2UA+2RvSSvv+RvJNuUB6n7rs5Wsel4dXLe90Um2n4= github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v0.3.0/go.mod h1:tPaiy8S5bQ+S5sOiDlINkp7+Ef339+Nz5L5XO+cnOHo= -github.com/Azure/azure-storage-blob-go v0.6.0/go.mod h1:oGfmITT1V6x//CswqY2gtAHND+xIP64/qL7a5QJix0Y= github.com/Azure/azure-storage-blob-go v0.15.0 h1:rXtgp8tN1p29GvpGgfJetavIG0V7OgcSXPpwp3tx6qk= github.com/Azure/azure-storage-blob-go v0.15.0/go.mod h1:vbjsVbX0dlxnRc4FFMPsS9BsJWPcne7GB7onqlPvz58= -github.com/Azure/azure-storage-queue-go v0.0.0-20181215014128-6ed74e755687/go.mod h1:K6am8mT+5iFXgingS9LUc7TmbsW6XBw3nxaRyaMyWc8= github.com/Azure/azure-storage-queue-go v0.0.0-20191125232315-636801874cdd h1:b3wyxBl3vvr15tUAziPBPK354y+LSdfPCpex5oBttHo= github.com/Azure/azure-storage-queue-go v0.0.0-20191125232315-636801874cdd/go.mod h1:K6am8mT+5iFXgingS9LUc7TmbsW6XBw3nxaRyaMyWc8= -github.com/Azure/go-amqp v0.12.6/go.mod h1:qApuH6OFTSKZFmCOxccvAv5rLizBQf4v8pRmG138DPo= github.com/Azure/go-amqp v0.17.0/go.mod h1:9YJ3RhxRT1gquYnzpZO1vcYMMpAdJT+QEg6fwmw9Zlg= github.com/Azure/go-amqp v0.17.5 h1:7Lsi9H9ijCAfqOaMiNmQ4c+GL9bdrpCjebNKhV/eQ+c= github.com/Azure/go-amqp v0.17.5/go.mod h1:9YJ3RhxRT1gquYnzpZO1vcYMMpAdJT+QEg6fwmw9Zlg= -github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8= github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 h1:UQHMgLO+TxOElx5B5HZ4hJQsoJ/PvUvKRhJHDQXO8P8= github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E= github.com/Azure/go-autorest v14.2.0+incompatible h1:V5VMDjClD3GiElqLWO7mz2MxNAK/vTfRHdAubSIPRgs= @@ -396,10 +384,8 @@ github.com/Azure/go-autorest/autorest/mocks v0.3.0/go.mod h1:a8FDP3DYzQ4RYfVAxAN github.com/Azure/go-autorest/autorest/mocks v0.4.1/go.mod h1:LTp+uSrOhSkaKrUy935gNZuuIPPVsHlr9DSOxSayd+k= github.com/Azure/go-autorest/autorest/mocks v0.4.2 h1:PGN4EDXnuQbojHbU0UWoNvmu9AGVwYHG9/fkDYhtAfw= github.com/Azure/go-autorest/autorest/mocks v0.4.2/go.mod h1:Vy7OitM9Kei0i1Oj+LvyAWMXJHeKH1MVlzFugfVrmyU= -github.com/Azure/go-autorest/autorest/to v0.3.0/go.mod h1:MgwOyqaIuKdG4TL/2ywSsIWKAfJfgHDo8ObuUk3t5sA= github.com/Azure/go-autorest/autorest/to v0.4.0 h1:oXVqrxakqqV1UZdSazDOPOLvOIz+XA683u8EctwboHk= github.com/Azure/go-autorest/autorest/to v0.4.0/go.mod h1:fE8iZBn7LQR7zH/9XU2NcPR4o9jEImooCeWJcYV/zLE= -github.com/Azure/go-autorest/autorest/validation v0.2.0/go.mod h1:3EEqHnBxQGHXRYq3HT1WyXAvT7LLY3tl70hw6tQIbjI= github.com/Azure/go-autorest/autorest/validation v0.3.1 h1:AgyqjAd94fwNAoTjl/WQXg4VvFeRFpO+UhNyRXqF1ac= github.com/Azure/go-autorest/autorest/validation v0.3.1/go.mod h1:yhLgjC0Wda5DYXl6JAsWyUe4KVNffhoDhG0zVzUMo3E= github.com/Azure/go-autorest/logger v0.1.0/go.mod h1:oExouG+K6PryycPJfVSxi/koC6LSNgds39diKLz7Vrc= @@ -468,16 +454,10 @@ github.com/HdrHistogram/hdrhistogram-go v1.1.0/go.mod h1:yDgFjdqOqDEKOvasDdhWNXY github.com/HdrHistogram/hdrhistogram-go v1.1.2 h1:5IcZpTvzydCQeHzK4Ef/D5rrSqwxob0t8PQPMybUNFM= github.com/HdrHistogram/hdrhistogram-go v1.1.2/go.mod h1:yDgFjdqOqDEKOvasDdhWNXYg9BVp4O+o5f6V/ehm6Oo= github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0= -github.com/Masterminds/goutils v1.1.1 h1:5nUrii3FMTL5diU80unEVvNevw1nH4+ZV4DSLVJLSYI= -github.com/Masterminds/goutils v1.1.1/go.mod h1:8cTjp+g8YejhMuvIA5y2vz3BpJxksy863GQaJW2MFNU= +github.com/Masterminds/semver v1.5.0 h1:H65muMkzWKEuNDnfl9d70GUjFniHKHRbFPGBuZ3QEww= github.com/Masterminds/semver v1.5.0/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y= github.com/Masterminds/semver/v3 v3.1.1 h1:hLg3sBzpNErnxhQtUy/mmLR2I9foDujNK030IGemrRc= github.com/Masterminds/semver/v3 v3.1.1/go.mod h1:VPu/7SZ7ePZ3QOrcuXROw5FAcLl4a0cBrbBpGY/8hQs= -github.com/Masterminds/sprig/v3 v3.2.2 h1:17jRggJu518dr3QaafizSXOjKYp94wKfABxUmyxvxX8= -github.com/Masterminds/sprig/v3 v3.2.2/go.mod h1:UoaO7Yp8KlPnJIYWTFkMaqPUYKTfGFPhxNuwnnxkKlk= -github.com/Mellanox/rdmamap v0.0.0-20191106181932-7c3c4763a6ee/go.mod h1:jDA6v0TUYrFEIAE5uGJ29LQOeONIgMdP4Rkqb8HUnPM= -github.com/Microsoft/ApplicationInsights-Go v0.4.2/go.mod h1:CukZ/G66zxXtI+h/VcVn3eVVDGDHfXM2zVILF7bMmsg= -github.com/Microsoft/go-winio v0.4.9/go.mod h1:VhR8bwka0BXejwEJY73c50VrPtXAaKcyvVC4A4RozmA= github.com/Microsoft/go-winio v0.4.14/go.mod h1:qXqCSQ3Xa7+6tgxaGTIe4Kpcdsi+P8jBhyzoq1bpyYA= github.com/Microsoft/go-winio v0.4.15/go.mod h1:tTuCMEN+UleMWgg9dVx4Hu52b1bJo+59jBh3ajtinzw= github.com/Microsoft/go-winio v0.5.0/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpzfwIujj1a84= @@ -488,12 +468,9 @@ github.com/Microsoft/hcsshim v0.9.4 h1:mnUj0ivWy6UzbB1uLFqKR6F+ZyiDc7j4iGgHTpO+5 github.com/Mottl/ctimefmt v0.0.0-20190803144728-fd2ac23a585a/go.mod h1:eyj2WSIdoPMPs2eNTLpSmM6Nzqo4V80/d6jHpnJ1SAI= github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= -github.com/OneOfOne/xxhash v1.2.6 h1:U68crOE3y3MPttCMQGywZOLrTeF5HHJ3/vDBCJn9/bA= github.com/OpenPeeDeeP/depguard v1.0.1/go.mod h1:xsIw86fROiiwelg+jB2uM9PiKihMMmUx/1V+TNhjQvM= -github.com/PuerkitoBio/purell v1.0.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0= github.com/PuerkitoBio/purell v1.1.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0= github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0= -github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE= github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE= github.com/ReneKroon/ttlcache/v2 v2.11.0 h1:OvlcYFYi941SBN3v9dsDcC2N8vRxyHcCmJb3Vl4QMoM= github.com/ReneKroon/ttlcache/v2 v2.11.0/go.mod h1:mBxvsNY+BT8qLLd6CuAJubbKo6r0jh3nb5et22bbfGY= @@ -503,7 +480,6 @@ github.com/SermoDigital/jose v0.9.2-0.20161205224733-f6df55f235c2 h1:koK7z0nSsRi github.com/SermoDigital/jose v0.9.2-0.20161205224733-f6df55f235c2/go.mod h1:ARgCUhI1MHQH+ONky/PAtmVHQrP5JlGY0F3poXOp/fA= github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo= github.com/Shopify/sarama v1.22.2-0.20190604114437-cd910a683f9f/go.mod h1:XLH1GYJnLVE0XCr6KdJGVJRTwY30moWNJ4sERjXX6fs= -github.com/Shopify/sarama v1.27.1/go.mod h1:g5s5osgELxgM+Md9Qni9rzo7Rbt+vvFQI4bt/Mc93II= github.com/Shopify/sarama v1.32.0/go.mod h1:+EmJJKZWVT/faR9RcOxJerP+LId4iWdQPBGLy1Y1Njs= github.com/Shopify/sarama v1.33.0/go.mod h1:lYO7LwEBkE0iAeTl94UfPSrDaavFzSFlmn+5isARATQ= github.com/Shopify/sarama v1.37.2 h1:LoBbU0yJPte0cE5TZCGdlzZRmMgMtZU/XgnUKZg9Cv4= @@ -514,12 +490,9 @@ github.com/Shopify/toxiproxy/v2 v2.3.0/go.mod h1:KvQTtB6RjCJY4zqNJn7C7JDFgsG5uoH github.com/Shopify/toxiproxy/v2 v2.5.0 h1:i4LPT+qrSlKNtQf5QliVjdP08GyAH8+BUIc9gT0eahc= github.com/Showmax/go-fqdn v1.0.0 h1:0rG5IbmVliNT5O19Mfuvna9LL7zlHyRfsSvBPZmF9tM= github.com/Showmax/go-fqdn v1.0.0/go.mod h1:SfrFBzmDCtCGrnHhoDjuvFnKsWjEQX/Q9ARZvOrJAko= -github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6/go.mod h1:3eOhrUMpNV+6aFIbp5/iudMxNCF27Vw2OZgy4xEx0Fg= github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d/go.mod h1:3eOhrUMpNV+6aFIbp5/iudMxNCF27Vw2OZgy4xEx0Fg= -github.com/StackExchange/wmi v1.2.1/go.mod h1:rcmrprowKIVzvc+NUiLncP2uuArMWLCbu9SBzvHz7e8= github.com/VividCortex/gohistogram v1.0.0 h1:6+hBz+qvs0JOrrNhhmR7lFxo5sINxBCGXrdtl/UvroE= github.com/VividCortex/gohistogram v1.0.0/go.mod h1:Pf5mBqqDxYaXu3hDrrU+w6nw50o/4+TcAqDqk/vUH7g= -github.com/aerospike/aerospike-client-go v1.27.0/go.mod h1:zj8LBEnWBDOVEIJt8LvaRvDG5ARAoa5dBeHaB472NRc= github.com/aerospike/aerospike-client-go/v6 v6.7.0 h1:La2669CfR3VgwGtgqeIB1U6EUxQOWyFoyQPM/WTM8ws= github.com/aerospike/aerospike-client-go/v6 v6.7.0/go.mod h1:Do5/flmgSo2X32YLGAYd6o5e/U2gOSpgEhrIGyOS3UI= github.com/afex/hystrix-go v0.0.0-20180502004556-fa1af6a1f4f5/go.mod h1:SkGFH1ia65gfNATL8TAiHDNxPzPdmEL5uirI2Uyuz6c= @@ -537,11 +510,8 @@ github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk5 github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 h1:s6gZFSlWYmbqAuRjVTiNNhvNRfY2Wxp9nhfyel4rklc= github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137/go.mod h1:OMCwj8VM1Kc9e19TLln2VL61YJF0x1XFtfdL4JdbSyE= github.com/alexkohler/prealloc v1.0.0/go.mod h1:VetnK3dIgFBBKmg0YnD9F9x6Icjd+9cvfHR56wJVlKE= -github.com/alicebob/gopher-json v0.0.0-20200520072559-a9ecdc9d1d3a h1:HbKu58rmZpUGpz5+4FfNmIU+FmZg2P3Xaj2v2bfNWmk= -github.com/alicebob/miniredis/v2 v2.22.0 h1:lIHHiSkEyS1MkKHCHzN+0mWrA4YdbGdimE5iZ2sHSzo= github.com/aliyun/aliyun-log-go-sdk v0.1.41 h1:aitUXlMIzMb8KZvwAqrJ77Nad9FOpAFi1Ju7rjFOYCM= github.com/aliyun/aliyun-log-go-sdk v0.1.41/go.mod h1:1QQ59pEJiVVXqKgbHcU6FWIgxT5RKBt+CT8AiQ2bEts= -github.com/amir/raidman v0.0.0-20170415203553-1ccc43bfb9c9/go.mod h1:eliMa/PW+RDr2QLWRmLH1R1ZA4RInpmvOzDDXtaIZkc= 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 h1:V7DdXeJtZscaqfNuAdSRuRFzuiKlHSC/Zh3zl9qY3JY= @@ -564,39 +534,29 @@ github.com/apache/thrift v0.17.0/go.mod h1:OLxhMRJxomX+1I/KUw03qoV3mMz16BwaKI+d4 github.com/ardielle/ardielle-go v1.5.2 h1:TilHTpHIQJ27R1Tl/iITBzMwiUGSlVfiVhwDNGM3Zj4= github.com/ardielle/ardielle-go v1.5.2/go.mod h1:I4hy1n795cUhaVt/ojz83SNVCYIGsAFAONtv2Dr7HUI= github.com/ardielle/ardielle-tools v1.5.4/go.mod h1:oZN+JRMnqGiIhrzkRN9l26Cej9dEx4jeNG6A+AdkShk= -github.com/aristanetworks/glog v0.0.0-20191112221043-67e8567f59f3/go.mod h1:KASm+qXFKs/xjSoWn30NrWBBvdTTQq+UjkhjEJHfSFA= -github.com/aristanetworks/goarista v0.0.0-20190325233358-a123909ec740/go.mod h1:D/tb0zPVXnP7fmsLZjtdUhSsumbK/ij54UXjjVgMGxQ= github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY= -github.com/armon/go-metrics v0.3.0/go.mod h1:zXjbSimjXTd7vOpY8B0/2LpvNvDoXBuplAD+gJD3GYs= github.com/armon/go-metrics v0.3.9/go.mod h1:4O98XIr/9W0sxpJ8UaYkvjk10Iff7SnFrb4QAOwNTFc= github.com/armon/go-metrics v0.3.10/go.mod h1:4O98XIr/9W0sxpJ8UaYkvjk10Iff7SnFrb4QAOwNTFc= github.com/armon/go-metrics v0.4.0 h1:yCQqn7dwca4ITXb+CbubHmedzaQYHhNhrEXLYUeEe8Q= github.com/armon/go-metrics v0.4.0/go.mod h1:E6amYzXo6aW1tqzoZGT755KkbgrJsSdpwZ+3JqfkOG4= -github.com/armon/go-proxyproto v0.0.0-20190211145416-68259f75880e/go.mod h1:QmP9hvJ91BbJmGVGSbutW19IC0Q9phDCLGaomwTJbgU= 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/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs= github.com/aryann/difflib v0.0.0-20170710044230-e206f873d14a/go.mod h1:DAHtR1m6lCRdSC2Tm3DSWRPvIPr6xNKyeHdqDQSQT+A= github.com/asaskevich/govalidator v0.0.0-20180720115003-f9ffefc3facf/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY= github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY= github.com/asaskevich/govalidator v0.0.0-20200108200545-475eaeb16496/go.mod h1:oGkLhpf+kjZl6xBf758TQhh5XrAeiJv/7FRz/2spLIg= github.com/asaskevich/govalidator v0.0.0-20200907205600-7a23bdc65eef/go.mod h1:WaHUgvxTVq04UNunO+XhnAqY/wQc+bxr74GqbsZ/Jqw= -github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d h1:Byv0BzEl3/e6D5CLfI0j/7hiIEtvGVFPCZ7Ei2oq8iQ= github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d/go.mod h1:WaHUgvxTVq04UNunO+XhnAqY/wQc+bxr74GqbsZ/Jqw= github.com/ashanbrown/forbidigo v1.1.0/go.mod h1:vVW7PEdqEFqapJe95xHkTfB1+XvZXBFg8t0sG2FIxmI= github.com/ashanbrown/makezero v0.0.0-20201205152432-7b7cdbb3025a/go.mod h1:oG9Dnez7/ESBqc4EdrdNlryeo7d0KcW1ftXHm7nU/UU= github.com/aws/aws-lambda-go v1.13.3/go.mod h1:4UKl9IzQMoD+QF79YdCuzCwp8VbmG4VAQwij/eHl5CU= -github.com/aws/aws-lambda-go v1.27.0/go.mod h1:jJmlefzPfGnckuHdXX7/80O3BvUUi12XOkbv4w9SGLU= -github.com/aws/aws-sdk-go v1.13.10/go.mod h1:ZRmQr0FajVIyZ4ZzBYKG5P3ZqPz9IHG41ZoMu1ADI3k= github.com/aws/aws-sdk-go v1.27.0/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= github.com/aws/aws-sdk-go v1.32.6/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0= -github.com/aws/aws-sdk-go v1.34.34/go.mod h1:H7NKnBqNVzoTJpGfLrQkkD+ytBA93eiDYi/+8rV9s48= github.com/aws/aws-sdk-go v1.35.24/go.mod h1:tlPOdRjfxPBpNIwqDj61rmsnA85v9jc0Ps9+muhnW+k= 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.11/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo= github.com/aws/aws-sdk-go v1.44.155 h1:PMHMuUS0atPD4LhiXuYrLasrlIm4u3lpNQBl9h+Lr2s= github.com/aws/aws-sdk-go v1.44.155/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= github.com/aws/aws-sdk-go-v2 v0.18.0/go.mod h1:JWVYvqSMppoMJC0x5wdwiImzgXTI9FuZwxzkQq9wy+g= @@ -665,10 +625,8 @@ github.com/aws/smithy-go v1.8.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAm github.com/aws/smithy-go v1.13.3/go.mod h1:Tg+OJXh4MB2R/uN61Ko2f6hTZwB/ZYGOtib8J3gBHzA= github.com/aws/smithy-go v1.13.5 h1:hgz0X/DX0dGqTYpGALqXJoRKRj5oQ7150i5FdTePzO8= github.com/aws/smithy-go v1.13.5/go.mod h1:Tg+OJXh4MB2R/uN61Ko2f6hTZwB/ZYGOtib8J3gBHzA= -github.com/axiomhq/hyperloglog v0.0.0-20180317131949-fe9507de0228/go.mod h1:IOXAcuKIFq/mDyuQ4wyJuJ79XLMsmLM+5RdQ+vWrL7o= 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= github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= github.com/benbjohnson/clock v1.3.0 h1:ip6w0uFQkncKQ979AypyG0ER7mqUSBdKLOgAle/AT8A= github.com/benbjohnson/clock v1.3.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= @@ -678,14 +636,11 @@ 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/bitly/go-hostpool v0.0.0-20171023180738-a3a6125de932/go.mod h1:NOuUCSz6Q9T7+igc/hlvDOUdtWKryOrtFyIVABv/p7k= -github.com/bitly/go-hostpool v0.1.0/go.mod h1:4gOCgp6+NZnVqlKyZ/iBZFTAJKembaVENUpMkpg42fw= github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c/go.mod h1:MKsuJmJgSg28kpZDP6UIiPt0e0Oz0kqKNGyRaWEPv84= github.com/bketelsen/crypt v0.0.4/go.mod h1:aI6NrJ0pMGgvZKL1iVgXLnfIFJtfV+bKCoqOes/6LfM= github.com/bkielbasa/cyclop v1.2.0/go.mod h1:qOI0yy6A7dYC4Zgsa72Ppm9kONl0RoIlPbzot9mhmeI= github.com/blang/semver v3.5.1+incompatible h1:cQNTCjp13qL8KC3Nbxr/y2Bqb63oX6wdnnjpJbkM4JQ= github.com/blang/semver v3.5.1+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk= -github.com/bmatcuk/doublestar v1.2.2 h1:oC24CykoSAB8zd7XgruHo33E0cHJf/WhQA/7BeXj+x0= -github.com/bmatcuk/doublestar v1.2.2/go.mod h1:wiQtGV+rzVYxB7WIlirSN++5HPtPlXEo9MEoZQC/PmE= github.com/bmatcuk/doublestar/v4 v4.4.0 h1:LmAwNwhjEbYtyVLzjcP/XeVw4nhuScHGkF/XWXnvIic= github.com/bmatcuk/doublestar/v4 v4.4.0/go.mod h1:xBQ8jztBU6kakFMg+8WGxn0c6z1fTSPVIjEY1Wr7jzc= github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869/go.mod h1:Ekp36dRnpXw/yCqJaO+ZrUyxD+3VXMFFr56k5XYrpB4= @@ -693,16 +648,10 @@ github.com/bmizerany/perks v0.0.0-20141205001514-d9a9656a3a4b/go.mod h1:ac9efd0D github.com/bombsimon/wsl/v3 v3.2.0/go.mod h1:st10JtZYLE4D5sC7b8xV4zTKZwAQjCH/Hy2Pm1FNZIc= github.com/boombuler/barcode v1.0.0/go.mod h1:paBWMcWSl3LHKBqUq+rly7CNSldXjb2rDl3JlRe0mD8= github.com/bsm/sarama-cluster v2.1.13+incompatible/go.mod h1:r7ao+4tTNXvWm+VRpRJchr2kQhqxgmAp2iEX5W96gMM= -github.com/buger/jsonparser v1.1.1 h1:2PnMjfWD7wBILjqQbt530v576A/cAbQvEW9gGIpYMUs= -github.com/buger/jsonparser v1.1.1/go.mod h1:6RYKKt7H4d4+iWqouImQ9R2FZql3VbhNgx27UK13J/0= -github.com/c2h5oh/datasize v0.0.0-20200112174442-28bbd4740fee h1:BnPxIde0gjtTnc9Er7cxvBk8DHLWhEux0SxayC8dP6I= -github.com/c2h5oh/datasize v0.0.0-20200112174442-28bbd4740fee/go.mod h1:S/7n9copUssQ56c7aAgHqftWO4LTf4xY6CGWt8Bc+3M= -github.com/caio/go-tdigest v2.3.0+incompatible/go.mod h1:sHQM/ubZStBUmF1WbB8FAm8q9GjDajLC5T7ydxE3JHI= github.com/caio/go-tdigest v3.1.0+incompatible h1:uoVMJ3Q5lXmVLCCqaMGHLBWnbGoN6Lpu7OAUPR60cds= github.com/caio/go-tdigest v3.1.0+incompatible/go.mod h1:sHQM/ubZStBUmF1WbB8FAm8q9GjDajLC5T7ydxE3JHI= github.com/casbin/casbin/v2 v2.1.2/go.mod h1:YcPU1XXisHhLzuxH9coDNf2FbKpjGlbCg3n9yuLkIJQ= github.com/casbin/casbin/v2 v2.37.0/go.mod h1:vByNa/Fchek0KZUgG5wEsl7iFsiviAYKRtgrQfcJqHg= -github.com/cenkalti/backoff v2.0.0+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM= github.com/cenkalti/backoff v2.2.1+incompatible h1:tNowT99t7UNflLxfYYSlKYsBpXdEet03Pg2g16Swow4= github.com/cenkalti/backoff v2.2.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM= github.com/cenkalti/backoff/v4 v4.1.1/go.mod h1:scbssz8iZGpm3xbr14ovlUdkxfGXNInqkPWOWmG2CLw= @@ -714,7 +663,6 @@ github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA github.com/census-instrumentation/opencensus-proto v0.3.0/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/census-instrumentation/opencensus-proto v0.4.1 h1:iKLQ0xPNFxR/2hzXZMrBo8f1j86j5WHzznCCQxV/b8g= github.com/census-instrumentation/opencensus-proto v0.4.1/go.mod h1:4T9NM4+4Vw91VeyqjLS6ao50K5bOcLKN6Q42XnYaRYw= -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= @@ -734,7 +682,6 @@ github.com/cilium/ebpf v0.8.1 h1:bLSSEbBLqGPXxls55pGr5qWZaTqcmfDJHhou7t254ao= github.com/cilium/ebpf v0.8.1/go.mod h1:f5zLIM0FSNuAkSyLAN7X+Hy6yznlF1mNiWUMfxMtrgk= github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod h1:nmEj6Dob7S7YxXgwXpfOuvO54S+tGdZdw9fuRZt25Ag= github.com/circonus-labs/circonusllhist v0.1.3/go.mod h1:kMXHVDlOchFAehlya5ePtbp5jckzBHf4XRpQvBOLI+I= -github.com/cisco-ie/nx-telemetry-proto v0.0.0-20190531143454-82441e232cf6/go.mod h1:ugEfq4B8T8ciw/h5mCkgdiDRFS4CkqqhH2dymDB4knc= github.com/clbanning/mxj v1.8.4/go.mod h1:BVjHeAH+rl9rs6f+QIpeRl0tfu10SXn1pUSa5PVGJng= github.com/clbanning/x2j v0.0.0-20191024224557-825249438eec/go.mod h1:jMjuTZXRI4dUb/I5gc9Hdhagfvm9+RyrPryS/auMzxE= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= @@ -759,12 +706,10 @@ github.com/cockroachdb/apd v1.1.0/go.mod h1:8Sl8LxpKi29FqWXR16WEFZRNSz3SoPzUzeMe github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8= github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI= github.com/codahale/rfc6979 v0.0.0-20141003034818-6a90f24967eb/go.mod h1:ZjrT6AXHbDs86ZSdt/osfBi5qfexBrKUdONk989Wnk4= -github.com/codegangsta/negroni v1.0.0/go.mod h1:v0y3T5G7Y1UlFfyxFn/QLRU4a2EuNau2iZY63YTKWo0= github.com/containerd/cgroups v1.0.4 h1:jN/mbWBEaz+T1pi5OFtnkQ+8qnmEbAr1Oo1FRm5B0dA= github.com/containerd/cgroups v1.0.4/go.mod h1:nLNQtsF7Sl2HxNebu77i1R0oDlhiTG+kO4JTrUzo6IA= github.com/containerd/console v1.0.3 h1:lIr7SlA5PxZyMV30bDW0MGbiOPXwc63yRuCP0ARubLw= github.com/containerd/console v1.0.3/go.mod h1:7LqA/THxQ86k76b8c/EMSiaJ3h1eZkMkXar0TQ1gf3U= -github.com/containerd/containerd v1.4.1/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA= github.com/containerd/containerd v1.6.8 h1:h4dOFDwzHmqFEP754PgfgTeVXFnLiRc6kiqC7tplDJs= github.com/containerd/ttrpc v1.1.0 h1:GbtyLRxb0gOLR0TYQWt3O6B0NvT8tMdorEHqIQo/lWI= github.com/containerd/ttrpc v1.1.0/go.mod h1:XX4ZTnoOId4HklF4edwc4DcqskFZuvXB1Evzy5KFQpQ= @@ -777,21 +722,15 @@ github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8Nz github.com/coreos/go-oidc v2.2.1+incompatible h1:mh48q/BqXqgjVHpy2ZY7WnWAbenxRjsz9N1i1YxjHAk= github.com/coreos/go-oidc v2.2.1+incompatible/go.mod h1:CgnwVTmzoESiwO9qyAFEMiHoZ1nMCKZlZ9V6mm3/LKc= github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= -github.com/coreos/go-semver v0.3.0 h1:wkHLiw0WNATZnSG7epLsujiMCgPAc9xhjJ4tgnAxmfM= github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= -github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf h1:iW4rZ826su+pqaw19uhpSCzhj44qo35pNgKFGqzDKkU= -github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= github.com/coreos/go-systemd/v22 v22.4.0 h1:y9YHcjnjynCd/DVbg5j9L/33jQM3MxJlbj/zWskzfGU= github.com/coreos/go-systemd/v22 v22.4.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= -github.com/couchbase/go-couchbase v0.0.0-20180501122049-16db1f1fe037/go.mod h1:TWI8EKQMs5u5jLKW/tsb9VwauIrMIxQG1r5fMsswK5U= -github.com/couchbase/gomemcached v0.0.0-20180502221210-0da75df14530/go.mod h1:srVSlQLB8iXBVXHgnqemxUXqN6FCvClgCMPCsjBDR7c= -github.com/couchbase/goutils v0.0.0-20180530154633-e865a1461c8a/go.mod h1:BQwMFlJzDjFDG3DJUdU0KORxn88UlsOULuxLExMh3Hs= github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE= github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= @@ -802,21 +741,17 @@ github.com/creack/pty v1.1.11/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ github.com/crossdock/crossdock-go v0.0.0-20160816171116-049aabb0122b/go.mod h1:v9FBN7gdVTpiD/+LZ7Po0UKvROyT87uLVxTHVky/dlQ= github.com/cyphar/filepath-securejoin v0.2.3 h1:YX6ebbZCZP7VkM3scTTokDgBL2TY741X51MTk3ycuNI= github.com/cyphar/filepath-securejoin v0.2.3/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxGGx79pTxQpKOJNYHHl4= -github.com/cyriltovena/cloudflare-go v0.27.1-0.20211118103540-ff77400bcb93 h1:PEBeRA25eDfHWkXNJs0HOnMhjIuKMcxKg/Z3VeuoRbU= -github.com/cyriltovena/cloudflare-go v0.27.1-0.20211118103540-ff77400bcb93/go.mod h1:sPWL/lIC6biLEdyGZwBQ1rGQKF1FhM7N60fuNiFdYTI= github.com/daixiang0/gci v0.2.8/go.mod h1:+4dZ7TISfSmqfAGv59ePaHfNzgGtIkHAhhdKggP1JAc= github.com/danieljoos/wincred v1.0.2/go.mod h1:SnuYRW9lp1oJrZX/dXJqr0cPK5gYXqx3EJbmjhLdK9U= github.com/danieljoos/wincred v1.1.2 h1:QLdCxFs1/Yl4zduvBdcHB8goaYk9RARS2SgLLRuAyr0= github.com/danieljoos/wincred v1.1.2/go.mod h1:GijpziifJoIBfYh+S7BbkdUTU4LfM+QnGqR5Vl2tAx0= github.com/dannykopping/go-kit-log v0.2.2-0.20221002180827-5591c1641b6b h1:G8g9mAKEj9O3RsU6Hd/ow6lIcHarlcUl5omV6sFKEOU= github.com/dannykopping/go-kit-log v0.2.2-0.20221002180827-5591c1641b6b/go.mod h1:NwTd00d/i8cPZ3xOwwiv2PO5MOcx78fFErGNcVmBjv0= -github.com/davecgh/go-spew v0.0.0-20151105211317-5215b55f46b2/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v0.0.0-20161028175848-04cdfd42973b/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= 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/denis-tingajkin/go-header v0.4.2/go.mod h1:eLRHAVXzE5atsKAnNRDB90WHCFFnBUn4RN0nRcs1LJA= -github.com/denisenkom/go-mssqldb v0.0.0-20190707035753-2be1aa521ff4/go.mod h1:zAg7JM8CkOJ43xKXIj7eRO9kmWm/TW578qo+oDO6tuM= github.com/denisenkom/go-mssqldb v0.12.2 h1:1OcPn5GBIobjWNd+8yjfHNIaFX14B1pWI3F9HZy5KXw= github.com/denisenkom/go-mssqldb v0.12.2/go.mod h1:lnIw1mZukFRZDJYQ0Pb833QS2IaC3l5HkEfra2LJ+sk= github.com/dennwc/varint v1.0.0 h1:kGNFFSSw8ToIy3obO/kKr8U9GZYUAxQEVuix4zfDWzE= @@ -832,13 +767,9 @@ github.com/dgraph-io/ristretto v0.1.0/go.mod h1:fux0lOrBhrVCJd3lcTHsIJhq1T2rokOu github.com/dgraph-io/ristretto v0.1.1 h1:6CWw5tJNgpegArSHpNHJKldNeq03FQCwYvfMVWajOK8= github.com/dgraph-io/ristretto v0.1.1/go.mod h1:S1GPSBCYCIhmVNfcth17y2zZtQT6wzkzgwUve0VDWWA= github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= -github.com/dgrijalva/jwt-go/v4 v4.0.0-preview1/go.mod h1:+hnT3ywWDTAFrW5aE+u2Sa/wT555ZqwoCS+pk3p6ry4= github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw= github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 h1:fAjc9m62+UWV/WAFKLNi6ZS0675eEUC9y3AlwSbQu1Y= github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw= -github.com/dgryski/go-metro v0.0.0-20180109044635-280f6062b5bc/go.mod h1:c9O8+fpSOX1DM8cPNSkX/qsBWdkD4yd2dpciOWQjpBw= -github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78= -github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc= github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no= github.com/digitalocean/godo v1.88.0 h1:SAEdw63xOMmzlwCeCWjLH1GcyDPUjbSAR1Bh7VELxzc= github.com/digitalocean/godo v1.88.0/go.mod h1:NRpFznZFvhHjBoqZAaOD3khVzsJ3EibzKqFL4R60dmA= @@ -850,14 +781,11 @@ github.com/dimfeld/httptreemux v5.0.1+incompatible/go.mod h1:rbUlSV+CCpv/SuqUTP/ github.com/dnaeon/go-vcr v1.1.0/go.mod h1:M7tiix8f0r6mKKJ3Yq/kqU1OYf3MnfmBWVbPx/yU9ko= github.com/dnaeon/go-vcr v1.2.0 h1:zHCHvJYTMh1N7xnV7zf1m1GPBF9Ad0Jk/whtQ1663qI= github.com/dnaeon/go-vcr v1.2.0/go.mod h1:R4UdLID7HZT3taECzJs4YgbbH6PIGXB6W/sc5OLb6RQ= -github.com/docker/distribution v2.6.0-rc.1.0.20170726174610-edc3ab29cdff+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= github.com/docker/distribution v2.8.1+incompatible h1:Q50tZOPR6T/hjNsyc9g8/syEs6bk8XXApsHjKukMl68= github.com/docker/distribution v2.8.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= -github.com/docker/docker v17.12.0-ce-rc1.0.20200916142827-bd33bbf0497b+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/docker v20.10.18+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/docker v20.10.21+incompatible h1:UTLdBmHk3bEY+w8qeO5KttOhy6OmXWsl/FEet9Uswog= github.com/docker/docker v20.10.21+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= -github.com/docker/go-connections v0.3.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec= github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec= github.com/docker/go-connections v0.4.1-0.20210727194412-58542c764a11 h1:IPrmumsT9t5BS7XcPhgsCTlkWbYg80SEXUzDpReaU6Y= github.com/docker/go-connections v0.4.1-0.20210727194412-58542c764a11/go.mod h1:a6bNUGTbQBsY6VRHTr4h/rkOXjl244DyRD0tx3fgq4Q= @@ -865,8 +793,6 @@ github.com/docker/go-units v0.3.3/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDD 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/docker/libnetwork v0.8.0-dev.2.0.20181012153825-d7b61745d166/go.mod h1:93m0aTqz6z+g32wla4l4WxTrdtvBRmVzYRkYvasA5Z8= -github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod h1:Qh8CwZgvJUkLughtfhJv5dyTYa91l1fOUCrgjqmcifM= github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3ebgob9U8Nd0kOddGdZWjyMGR8Wziv+TBNwSE= github.com/dropbox/godropbox v0.0.0-20180512210157-31879d3884b9 h1:NAvZb7gqQfLSNBPzVsvI7eZMosXtg2g2kxXrei90CtU= github.com/dropbox/godropbox v0.0.0-20180512210157-31879d3884b9/go.mod h1:glr97hP/JuXb+WMYCizc4PIFuzw1lCR97mwbe1VVXhQ= @@ -876,7 +802,6 @@ github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25Kn github.com/dvsekhvalnov/jose2go v0.0.0-20200901110807-248326c1351b/go.mod h1:7BvyPhdbLxMXIYTFPLsyJRFMsKmOZnQmzh6Gb+uquuM= github.com/dvsekhvalnov/jose2go v1.5.0 h1:3j8ya4Z4kMCwT5nXIKFSV84YS+HdqSSO0VsTQxaLAeM= github.com/dvsekhvalnov/jose2go v1.5.0/go.mod h1:QsHjhyTlD/lAVqn/NSbVZmSCGeDehTB/mPZadG+mhXU= -github.com/dvyukov/go-fuzz v0.0.0-20210103155950-6a8e9d1f2415/go.mod h1:11Gm+ccJnvAhCNLlf5+cS9KjtbaD5I5zaZpFMsTHWTw= github.com/dynatrace-oss/dynatrace-metric-utils-go v0.5.0 h1:wHGPJSXvwKQVf/XfhjUPyrhpcPKWNy8F3ikH+eiwoBg= github.com/dynatrace-oss/dynatrace-metric-utils-go v0.5.0/go.mod h1:PseHFo8Leko7J4A/TfZ6kkHdkzKBLUta6hRZR/OEbbc= github.com/eapache/go-resiliency v1.1.0/go.mod h1:kFI+JgMyC7bLPUVY133qvEBtVayf5mFgVsvEsIPBvNs= @@ -887,10 +812,7 @@ github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21 h1:YEetp8 github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1:+020luEh2TKB4/GOp8oxxtq0Daoen/Cii55CzbTV6DU= github.com/eapache/queue v1.1.0 h1:YOEu7KNc61ntiQlcEeUIoDTJ2o8mQznoNvUhiigpIqc= github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I= -github.com/eclipse/paho.mqtt.golang v1.2.0/go.mod h1:H9keYFcgq3Qr5OUJm/JZI/i6U7joQ8SYLhZwfeOo6Ts= github.com/edsrzf/mmap-go v1.0.0/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaBNrHW5M= -github.com/edsrzf/mmap-go v1.1.0 h1:6EUwBLQ/Mcr1EYLE4Tn1VdW1A4ckqCQWZBw8Hr0kjpQ= -github.com/edsrzf/mmap-go v1.1.0/go.mod h1:19H/e8pUPLicwkyNgOykDXkJ9F0MHE+Z52B8EIth78Q= github.com/elastic/elastic-transport-go/v8 v8.0.0-20211216131617-bbee439d559c/go.mod h1:87Tcz8IVNe6rVSLdBux1o/PEItLtyabHU3naC7IoqKI= github.com/elastic/elastic-transport-go/v8 v8.1.0 h1:NeqEz1ty4RQz+TVbUrpSU7pZ48XkzGWQj02k5koahIE= github.com/elastic/elastic-transport-go/v8 v8.1.0/go.mod h1:87Tcz8IVNe6rVSLdBux1o/PEItLtyabHU3naC7IoqKI= @@ -898,7 +820,6 @@ github.com/elastic/go-elasticsearch/v8 v8.5.0 h1:p6j6RFztHvkIg0NaUlfR0OnRmVdCG6Z github.com/elastic/go-elasticsearch/v8 v8.5.0/go.mod h1:Usvydt+x0dv9a1TzEUaovqbJor8rmOHy5dSmPeMAE2k= github.com/elastic/go-structform v0.0.10 h1:oy08o/Ih2hHTkNcRY/1HhaYvIp5z6t8si8gnCJPDo1w= github.com/elastic/go-structform v0.0.10/go.mod h1:CZWf9aIRYY5SuKSmOhtXScE5uQiLZNqAFnwKR4OrIM4= -github.com/elazarl/goproxy v0.0.0-20170405201442-c4fc26588b6e/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc= github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc= github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs= github.com/emicklei/go-restful v2.9.5+incompatible/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs= @@ -920,11 +841,9 @@ github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7 github.com/envoyproxy/protoc-gen-validate v0.6.7/go.mod h1:dyJXwwfPK2VSqiB9Klm1J6romD608Ba7Hij42vrOBCo= github.com/envoyproxy/protoc-gen-validate v0.6.13 h1:TvDcILLkjuZV3ER58VkBmncKsLUBqBDxra/XctCzuMM= github.com/envoyproxy/protoc-gen-validate v0.6.13/go.mod h1:qEySVqXrEugbHKvmhI8ZqtQi75/RHSSRNpffvB4I6Bw= -github.com/ericchiang/k8s v1.2.0/go.mod h1:/OmBgSq2cd9IANnsGHGlEz27nwMZV2YxlpXuQtU3Bz4= github.com/esimonov/ifshort v1.0.1/go.mod h1:yZqNJUrNn20K8Q9n2CrjTKYyVEmX209Hgu+M1LBpeZE= 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.2.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= 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/facebook/time v0.0.0-20220713225404-f7a0d7702d50 h1:3fALCgsB+zI8Bxlv4ph4lCgt1CEQHIdU5sWxbkaMkuc= @@ -933,8 +852,6 @@ github.com/facebookgo/stack v0.0.0-20160209184415-751773369052 h1:JWuenKqqX8nojt github.com/facebookgo/stack v0.0.0-20160209184415-751773369052/go.mod h1:UbMTZqLaRiH3MsBH8va0n7s1pQYcu3uTb8G4tygF4Zg= github.com/facebookgo/stackerr v0.0.0-20150612192056-c2fcf88613f4 h1:fP04zlkPjAGpsduG7xN3rRkxjAqkJaIQnnkNYYw/pAk= github.com/facebookgo/stackerr v0.0.0-20150612192056-c2fcf88613f4/go.mod h1:SBHk9aNQtiw4R4bEuzHjVmZikkUKCnO1v3lPQ21HZGk= -github.com/facette/natsort v0.0.0-20181210072756-2cd4dd1e2dcb h1:IT4JYU7k4ikYg1SCxNI1/Tieq/NFvh6dzLdgi7eu0tM= -github.com/facette/natsort v0.0.0-20181210072756-2cd4dd1e2dcb/go.mod h1:bH6Xx7IW64qjjJq8M2u4dxNaBiDfKK+z/3eGDpXEQhc= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU= github.com/fatih/color v1.10.0/go.mod h1:ELkj/draVOlAH/xkhN6mQ50Qd0MPOk5AAr3maGEBuJM= @@ -980,13 +897,9 @@ github.com/gdamore/encoding v1.0.0/go.mod h1:alR0ol34c49FCSBLjhosxzcPHQbf2trDkoo github.com/gdamore/tcell v1.3.0/go.mod h1:Hjvr+Ofd+gLglo7RYKxxnzCBmev3BzsS67MebKS4zMM= github.com/getsentry/sentry-go v0.16.0 h1:owk+S+5XcgJLlGR/3+3s6N4d+uKwqYvh/eS0AIMjPWo= github.com/getsentry/sentry-go v0.16.0/go.mod h1:ZXCloQLj0pG7mja5NK6NPf2V4A88YJ4pNlc2mOHwh6Y= -github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= -github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32/go.mod h1:GIjDIg/heH5DOkXY3YJ/wNhfHsQHoXGjl8G8amsYQ1I= -github.com/glinton/ping v0.1.4-0.20200311211934-5ac87da8cd96/go.mod h1:uY+1eqFUyotrQxF1wYFNtMeHp/swbYRsoGzfcPZ8x3o= github.com/globalsign/mgo v0.0.0-20180905125535-1ca0a4f7cbcb/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q= github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q= -github.com/go-chi/chi v4.1.2+incompatible/go.mod h1:eB3wogJHnLi3x/kFX2A+IbTBlXxmMeXJVKy9tTv1XzQ= github.com/go-critic/go-critic v0.5.4/go.mod h1:cjB4YGw+n/+X8gREApej7150Uyy1Tg8If6F2XOAUXNE= github.com/go-errors/errors v1.4.2 h1:J6MZopCL4uSllY1OfXM374weqZFFItUbrImctkmUxIA= github.com/go-faster/city v1.0.1 h1:4WAxSZ3V2Ws4QRDrscLEDcibJY8uf41H6AhXDrNDcGw= @@ -1000,7 +913,6 @@ github.com/go-fonts/stix v0.1.0/go.mod h1:w/c1f0ldAUlJmLBvlbkvVXLAD+tAMqobIIQpmn 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-ini/ini v1.33.0/go.mod h1:ByCAeIL28uOIIG0E3PJtZPDL8WnHpFKFOtgjp+3Ies8= github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-kit/kit v0.10.0/go.mod h1:xUsJbQ/Fp4kEt7AFgCuvyX4a71u8h9jB8tj/ORgOZ7o= @@ -1022,10 +934,7 @@ 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/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= -github.com/go-ole/go-ole v1.2.1/go.mod h1:7FAglXiTm7HKlQRDeOQ6ZNUHidzCWXuZWq/1dTyBNF8= github.com/go-ole/go-ole v1.2.4/go.mod h1:XCwSNxSkXRo4vlyPy93sltvi/qJq0jqQhjqQNIwKuxM= -github.com/go-ole/go-ole v1.2.5/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0= -github.com/go-ole/go-ole v1.2.6-0.20210915003542-8b1f7f90f6b1/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0= github.com/go-ole/go-ole v1.2.6 h1:/Fpf6oFPoeFik9ty7siob0G6Ke8QvQEuVcuChpwXzpY= github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0= github.com/go-openapi/analysis v0.0.0-20180825180245-b006789cd277/go.mod h1:k70tL6pCuVxPJOHXQ+wIac1FUrvNkHolPie/cLEU6hI= @@ -1035,7 +944,6 @@ github.com/go-openapi/analysis v0.19.2/go.mod h1:3P1osvZa9jKjb8ed2TPng3f0i/UY9sn github.com/go-openapi/analysis v0.19.4/go.mod h1:3P1osvZa9jKjb8ed2TPng3f0i/UY9snX6gxi44djMjk= github.com/go-openapi/analysis v0.19.5/go.mod h1:hkEAkxagaIvIP7VTn8ygJNkd4kAYON2rCu0v0ObL0AU= github.com/go-openapi/analysis v0.19.10/go.mod h1:qmhS3VNFxBlquFJ0RGoDtylO9y4pgTAUNE9AEEMdlJQ= -github.com/go-openapi/analysis v0.21.2 h1:hXFrOYFHUAMQdu6zwAiKKJHJQ8kqZs1ux/ru1P1wLJU= github.com/go-openapi/analysis v0.21.2/go.mod h1:HZwRk4RRisyG8vx2Oe6aqeSQcoxRp47Xkp3+K6q+LdY= github.com/go-openapi/errors v0.17.0/go.mod h1:LcZQpmvG4wyF5j4IhA73wkLFQg+QJXOQHVjmcZxhka0= github.com/go-openapi/errors v0.18.0/go.mod h1:LcZQpmvG4wyF5j4IhA73wkLFQg+QJXOQHVjmcZxhka0= @@ -1044,16 +952,13 @@ github.com/go-openapi/errors v0.19.3/go.mod h1:qX0BLWsyaKfvhluLejVpVNwNRdXZhEbTA github.com/go-openapi/errors v0.19.4/go.mod h1:qX0BLWsyaKfvhluLejVpVNwNRdXZhEbTA4kxxpKBC94= github.com/go-openapi/errors v0.19.8/go.mod h1:cM//ZKUKyO06HSwqAelJ5NsEMMcpa6VpXe8DOa1Mi1M= github.com/go-openapi/errors v0.19.9/go.mod h1:cM//ZKUKyO06HSwqAelJ5NsEMMcpa6VpXe8DOa1Mi1M= -github.com/go-openapi/errors v0.20.2 h1:dxy7PGTqEh94zj2E3h1cUmQQWiM1+aeCROfAr02EmK8= github.com/go-openapi/errors v0.20.2/go.mod h1:cM//ZKUKyO06HSwqAelJ5NsEMMcpa6VpXe8DOa1Mi1M= -github.com/go-openapi/jsonpointer v0.0.0-20160704185906-46af16f9f7b1/go.mod h1:+35s3my2LFTysnkMfxsJBAMHj/DoqoB9knIWoYG/Vk0= github.com/go-openapi/jsonpointer v0.17.0/go.mod h1:cOnomiV+CVVwFLk0A/MExoFMjwdsUdVpsRhURCKh+3M= github.com/go-openapi/jsonpointer v0.18.0/go.mod h1:cOnomiV+CVVwFLk0A/MExoFMjwdsUdVpsRhURCKh+3M= github.com/go-openapi/jsonpointer v0.19.2/go.mod h1:3akKfEdA7DF1sugOqz1dVQHBcuDBPKZGEoHC/NkiQRg= github.com/go-openapi/jsonpointer v0.19.3/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg= github.com/go-openapi/jsonpointer v0.19.5 h1:gZr+CIYByUqjcgeLXnQu2gHYQC9o73G2XUeOFYEICuY= github.com/go-openapi/jsonpointer v0.19.5/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg= -github.com/go-openapi/jsonreference v0.0.0-20160704190145-13c6e3589ad9/go.mod h1:W3Z9FmVs9qj+KR4zFKmDPGiLdk1D9Rlm7cyMvf57TTg= github.com/go-openapi/jsonreference v0.17.0/go.mod h1:g4xxGn04lDIRh0GJb5QlpE3HfopLOL6uZrK/VgnsK9I= github.com/go-openapi/jsonreference v0.18.0/go.mod h1:g4xxGn04lDIRh0GJb5QlpE3HfopLOL6uZrK/VgnsK9I= github.com/go-openapi/jsonreference v0.19.2/go.mod h1:jMjeRr2HHw6nAVajTXJ4eiUwohSTlpa0o73RUL1owJc= @@ -1069,15 +974,12 @@ github.com/go-openapi/loads v0.19.2/go.mod h1:QAskZPMX5V0C2gvfkGZzJlINuP7Hx/4+ix github.com/go-openapi/loads v0.19.3/go.mod h1:YVfqhUCdahYwR3f3iiwQLhicVRvLlU/WO5WPaZvcvSI= github.com/go-openapi/loads v0.19.4/go.mod h1:zZVHonKd8DXyxyw4yfnVjPzBjIQcLt0CCsn0N0ZrQsk= github.com/go-openapi/loads v0.19.5/go.mod h1:dswLCAdonkRufe/gSUC3gN8nTSaB9uaS2es0x5/IbjY= -github.com/go-openapi/loads v0.21.1 h1:Wb3nVZpdEzDTcly8S4HMkey6fjARRzb7iEaySimlDW0= github.com/go-openapi/loads v0.21.1/go.mod h1:/DtAMXXneXFjbQMGEtbamCZb+4x7eGwkvZCvBmwUG+g= github.com/go-openapi/runtime v0.0.0-20180920151709-4f900dc2ade9/go.mod h1:6v9a6LTXWQCdL8k1AO3cvqx5OtZY/Y9wKTgaoP6YRfA= github.com/go-openapi/runtime v0.19.0/go.mod h1:OwNfisksmmaZse4+gpV3Ne9AyMOlP1lt4sK4FXt0O64= github.com/go-openapi/runtime v0.19.4/go.mod h1:X277bwSUBxVlCYR3r7xgZZGKVvBd/29gLDlFGtJ8NL4= github.com/go-openapi/runtime v0.19.15/go.mod h1:dhGWCTKRXlAfGnQG0ONViOZpjfg0m2gUt9nTQPQZuoo= -github.com/go-openapi/runtime v0.23.1/go.mod h1:AKurw9fNre+h3ELZfk6ILsfvPN+bvvlaU/M9q/r9hpk= github.com/go-openapi/runtime v0.23.3/go.mod h1:AKurw9fNre+h3ELZfk6ILsfvPN+bvvlaU/M9q/r9hpk= -github.com/go-openapi/spec v0.0.0-20160808142527-6aced65f8501/go.mod h1:J8+jY1nAiCcj+friV/PDoE1/3eeccG9LYBs0tYvLOWc= github.com/go-openapi/spec v0.17.0/go.mod h1:XkF/MOi14NmjsfZ8VtAKf8pIlbZzyoTvZsdfssdxcBI= github.com/go-openapi/spec v0.18.0/go.mod h1:XkF/MOi14NmjsfZ8VtAKf8pIlbZzyoTvZsdfssdxcBI= github.com/go-openapi/spec v0.19.2/go.mod h1:sCxk3jxKgioEJikev4fgkNmwS+3kuYdJtcsZsD5zxMY= @@ -1086,7 +988,6 @@ github.com/go-openapi/spec v0.19.5/go.mod h1:Hm2Jr4jv8G1ciIAo+frC/Ft+rR2kQDh8JHK github.com/go-openapi/spec v0.19.6/go.mod h1:Hm2Jr4jv8G1ciIAo+frC/Ft+rR2kQDh8JHKHb3gWUSk= github.com/go-openapi/spec v0.20.2/go.mod h1:RW6Xcbs6LOyWLU/mXGdzn2Qc+3aj+ASfI7rvSZh1Vls= github.com/go-openapi/spec v0.20.4/go.mod h1:faYFR1CvsJZ0mNsmsphTMSoRrNV3TEDoAM7FOEWeq8I= -github.com/go-openapi/spec v0.20.6 h1:ich1RQ3WDbfoeTqTAb+5EIxNmpKVJZWBNah9RAT0jIQ= github.com/go-openapi/spec v0.20.6/go.mod h1:2OpW+JddWPrpXSCIX8eOx7lZ5iyuWj3RYR6VaaBKcWA= github.com/go-openapi/strfmt v0.17.0/go.mod h1:P82hnJI0CXkErkXi8IKjPbNBM6lV6+5pLP5l494TcyU= github.com/go-openapi/strfmt v0.18.0/go.mod h1:P82hnJI0CXkErkXi8IKjPbNBM6lV6+5pLP5l494TcyU= @@ -1098,9 +999,7 @@ github.com/go-openapi/strfmt v0.19.5/go.mod h1:eftuHTlB/dI8Uq8JJOyRlieZf+WkkxUuk github.com/go-openapi/strfmt v0.21.0/go.mod h1:ZRQ409bWMj+SOgXofQAGTIo2Ebu72Gs+WaRADcS5iNg= github.com/go-openapi/strfmt v0.21.1/go.mod h1:I/XVKeLc5+MM5oPNN7P6urMOpuLXEcNrCX/rPGuWb0k= github.com/go-openapi/strfmt v0.21.2/go.mod h1:I/XVKeLc5+MM5oPNN7P6urMOpuLXEcNrCX/rPGuWb0k= -github.com/go-openapi/strfmt v0.21.3 h1:xwhj5X6CjXEZZHMWy1zKJxvW9AfHC9pkyUjLvHtKG7o= github.com/go-openapi/strfmt v0.21.3/go.mod h1:k+RzNO0Da+k3FrrynSNN8F7n/peCmQQqbbXjtDfvmGg= -github.com/go-openapi/swag v0.0.0-20160704191624-1d0bd113de87/go.mod h1:DXUve3Dpr1UfpPtxFw+EFuQ41HhCWZfha5jSVRG7C7I= github.com/go-openapi/swag v0.17.0/go.mod h1:AByQ+nYG6gQg71GINrmuDXCPWdL640yX49/kXLo40Tg= github.com/go-openapi/swag v0.18.0/go.mod h1:AByQ+nYG6gQg71GINrmuDXCPWdL640yX49/kXLo40Tg= github.com/go-openapi/swag v0.19.2/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk= @@ -1116,17 +1015,9 @@ github.com/go-openapi/validate v0.19.2/go.mod h1:1tRCw7m3jtI8eNWEEliiAqUIcBztB2K github.com/go-openapi/validate v0.19.3/go.mod h1:90Vh6jjkTn+OT1Eefm0ZixWNFjhtOH7vS9k0lo6zwJo= github.com/go-openapi/validate v0.19.8/go.mod h1:8DJv2CVJQ6kGNpFW6eV9N3JviE1C85nY1c2z52x1Gk4= github.com/go-openapi/validate v0.21.0/go.mod h1:rjnrwK57VJ7A8xqfpAOEKRH8yQSGUriMu5/zuPSQ1hg= -github.com/go-openapi/validate v0.22.0 h1:b0QecH6VslW/TxtpKgzpO1SNG7GU2FsaqKdP1E2T50Y= github.com/go-openapi/validate v0.22.0/go.mod h1:rjnrwK57VJ7A8xqfpAOEKRH8yQSGUriMu5/zuPSQ1hg= -github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4= -github.com/go-playground/locales v0.13.0/go.mod h1:taPMhCMXrRLJO55olJkUXHZBHCxTMfnGwq/HNwmWNS8= -github.com/go-playground/universal-translator v0.17.0/go.mod h1:UkSxE5sNxxRwHyU+Scu5vgOQjsIJAF8j9muTVoKLVtA= -github.com/go-playground/validator/v10 v10.4.1/go.mod h1:nlOn6nFhuKACm19sB/8EGNn9GlaMV7XkbRSipzJ0Ii4= -github.com/go-redis/redis v6.15.9+incompatible/go.mod h1:NAIEuMOZ/fxfXJIrKDQDz8wamY7mA7PouImQ2Jvg6kA= github.com/go-redis/redis/v7 v7.4.1 h1:PASvf36gyUpr2zdOUS/9Zqc80GbM+9BDyiJSJDDOrTI= github.com/go-redis/redis/v7 v7.4.1/go.mod h1:JDNMw23GTyLNC4GZu9njt15ctBQVn7xjRfnwdHj/Dcg= -github.com/go-redis/redis/v8 v8.11.5 h1:AcZZR7igkdvfVmQTPnu9WE37LRrO/YrBH5zWyjDC0oI= -github.com/go-redis/redis/v8 v8.11.5/go.mod h1:gREzHqY1hg6oD9ngVRbLStwAWKhA0FEgq8Jd4h5lpwo= github.com/go-resty/resty/v2 v2.1.1-0.20191201195748-d7b97669fe48 h1:JVrqSeQfdhYRFk24TvhTZWU0q8lfCojxZQFi3Ou7+uY= github.com/go-resty/resty/v2 v2.1.1-0.20191201195748-d7b97669fe48/go.mod h1:dZGr0i9PLlaaTD4H/hoZIDjQ+r6xq8mgbRzHZf7f2J8= github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w= @@ -1177,11 +1068,8 @@ github.com/gobuffalo/packd v0.1.0/go.mod h1:M2Juc+hhDXf/PnmBANFCqx4DM3wRbgDvnVWe github.com/gobuffalo/packr/v2 v2.0.9/go.mod h1:emmyGweYTm6Kdper+iywB6YK5YzuKchGtJQZ0Odn4pQ= github.com/gobuffalo/packr/v2 v2.2.0/go.mod h1:CaAwI0GPIAv+5wKLtv8Afwl+Cm78K/I/VCm/3ptBN+0= github.com/gobuffalo/syncx v0.0.0-20190224160051-33c29581e754/go.mod h1:HhnNqWY95UYwwW3uSASeV7vtgYkT2t16hJgV3AEPUpw= -github.com/goburrow/modbus v0.1.0/go.mod h1:Kx552D5rLIS8E7TyUwQ/UdHEqvX5T8tyiGBTlzMcZBg= -github.com/goburrow/serial v0.1.0/go.mod h1:sAiqG0nRVswsm1C97xsttiYCzSLBmUZ/VSlVLZJ8haA= github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y= github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAkT8= -github.com/goccy/go-yaml v1.9.5/go.mod h1:U/jl18uSupI5rdI2jmuCswEA2htH9eXfferR3KfscvA= github.com/gocql/gocql v0.0.0-20200228163523-cd4b606dd2fb/go.mod h1:DL0ekTmBSTdlNF25Orwt/JMzqIq3EJ4MVa/J/uK64OY= github.com/gocql/gocql v0.0.0-20211222173705-d73e6b1002a7/go.mod h1:3gM2c4D3AnkISwBxGnMMsS8Oy4y2lhbPRsH4xnJrHG8= github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 h1:ZpnhV/YsD2/4cESfV5+Hoeu/iUR3ruzNvZ+yQfO03a0= @@ -1190,25 +1078,18 @@ github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5x github.com/godbus/dbus/v5 v5.0.6 h1:mkgN1ofwASrYnJ5W6U/BxG15eXXXjirgZc7CLqkcaro= github.com/godbus/dbus/v5 v5.0.6/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= github.com/gofrs/flock v0.8.0/go.mod h1:F1TvTiK9OcQqauNUHlbJvyl9Qa1QvF/gOUDKA14jxHU= -github.com/gofrs/uuid v2.1.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= github.com/gofrs/uuid v3.3.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= github.com/gofrs/uuid v4.0.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= github.com/gofrs/uuid v4.2.0+incompatible h1:yyYWMnhkhrKwwr8gAOcOCYxOOscHgDS9yZgBrnJfGa0= github.com/gofrs/uuid v4.2.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= -github.com/gogo/googleapis v0.0.0-20180223154316-0cd9801be74a/go.mod h1:gf4bu3Q80BeJ6H1S1vYPm8/ELATdvryBaNFGgqEef3s= github.com/gogo/googleapis v1.1.0/go.mod h1:gf4bu3Q80BeJ6H1S1vYPm8/ELATdvryBaNFGgqEef3s= github.com/gogo/googleapis v1.4.1 h1:1Yx4Myt7BxzvUr5ldGSbwYiZG6t9wGBZ+8/fX3Wvtq0= github.com/gogo/googleapis v1.4.1/go.mod h1:2lpHqI5OcWCtVElxXnPt+s8oJvMpySlOyM6xDCrzib4= github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.2.0/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= -github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o= -github.com/gogo/protobuf v1.3.0/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o= github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= -github.com/gogo/status v1.0.3/go.mod h1:SavQ51ycCLnc7dGyJxp8YAmudx8xqiVrRf+6IXRsugc= -github.com/gogo/status v1.1.1 h1:DuHXlSFHNKqTQ+/ACf5Vs6r4X/dH2EgIzR9Vr+H65kg= -github.com/gogo/status v1.1.1/go.mod h1:jpG3dM5QPcqu19Hg8lkUhBFBa3TcLs1DG7+2Jqci7oU= github.com/golang-jwt/jwt v3.2.1+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzqecmYZeUEB8OUGHkxJ+I= github.com/golang-jwt/jwt v3.2.2+incompatible h1:IfV12K8xAKAnZqdXVzCZ+TOjboZ2keLg81eXfW3O+oY= github.com/golang-jwt/jwt v3.2.2+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzqecmYZeUEB8OUGHkxJ+I= @@ -1221,7 +1102,6 @@ github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe/go.mod h1:8vg3r2V github.com/golang-sql/sqlexp v0.1.0 h1:ZCD6MBpcuOVfGVqsEmY5/4FtYiKz6tSyUv9LPEDei6A= github.com/golang-sql/sqlexp v0.1.0/go.mod h1:J4ad9Vo8ZCWQ2GMrC4UCQy1JpCbwU9m3EOqtpKwwwHI= github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGwJL78qG/PmXZO1EjYhfJinVAhrmmHX6Z8B9k= -github.com/golang/geo v0.0.0-20190916061304-5b978397cfec/go.mod h1:QZ0nwyI2jOfgRAoBvP+ab5aRr7c9x7lhGEJrKvBwjWI= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= github.com/golang/glog v1.0.0 h1:nfP3RFugxnNRyKgeWd4oI1nYvXpxrx8ck8ZrcizshdQ= github.com/golang/glog v1.0.0/go.mod h1:EWib/APOK0SL3dFbYqvxE3UYd8E6s1ouQ7iEp/0LWV4= @@ -1232,7 +1112,6 @@ github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4er github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE= github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= -github.com/golang/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:tluoj9z5200jBnyusfRPU2LqT6J+DAorxEvtC7LHB+E= 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= @@ -1242,7 +1121,6 @@ github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4= github.com/golang/mock v1.5.0/go.mod h1:CWnOUgYIOo4TcNZ0wHX3YZCqsaM1I1Jvs6v3mP3KVu8= github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs= -github.com/golang/protobuf v0.0.0-20161109072736-4bd1920723d7/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= 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= @@ -1277,12 +1155,10 @@ github.com/golangci/maligned v0.0.0-20180506175553-b1d89398deca/go.mod h1:tvlJhZ github.com/golangci/misspell v0.3.5/go.mod h1:dEbvlSfYbMQDtrpRMQU675gSDLDNa8sCPPChZ7PhiVA= github.com/golangci/revgrep v0.0.0-20210208091834-cd28932614b5/go.mod h1:LK+zW4MpyytAWQRz0M4xnzEk50lSvqDQKfx304apFkY= github.com/golangci/unconvert v0.0.0-20180507085042-28b1c447d1f4/go.mod h1:Izgrg8RkN3rCIMLGE9CyYmU9pY2Jer6DgANEnZ/L/cQ= -github.com/gomodule/redigo v1.8.1/go.mod h1:P9dn9mFrCBvWhGE1wpxx6fgq7BAeLBk+UUUzlpkBYO0= github.com/google/addlicense v0.0.0-20200906110928-a0294312aa76/go.mod h1:EMjYTRimagHs1FwlIqKyX3wAM0u3rA+McvlIIWmSamA= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.1 h1:gK4Kx5IaGY9CD5sPJ36FHiBJ6ZXl0kilRiiCj+jdYp4= -github.com/google/btree v1.0.1/go.mod h1:xXMiIv4Fb/0kKde4SpL7qlzvu5cMJDRkFDxJfI9uaxA= github.com/google/cadvisor v0.46.0 h1:ryTIniqhN8/wR8UA1RuYSXHvsAtdpk/01XwTZtYHekY= github.com/google/cadvisor v0.46.0/go.mod h1:YnCDnR8amaS0HoMEjheOI0TMPzFKCBLc30mciLEjwGI= github.com/google/flatbuffers v1.12.1/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8= @@ -1307,16 +1183,12 @@ github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8 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/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= -github.com/google/go-github/v32 v32.1.0/go.mod h1:rIEpZD9CTDQwDK9GDrtMTycQNA4JU3qBsCizh3q2WCI= -github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck= github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8= github.com/google/go-querystring v1.1.0/go.mod h1:Kcdr2DB4koayq7X8pmAG4sNG59So17icRSOU623lUBU= -github.com/google/gofuzz v0.0.0-20161122191042-44d81051d367/go.mod h1:HP5RmnzzSNb993RKQDq4+1A4ia9nllfqcQFTQJedwGI= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= 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/gops v0.3.22/go.mod h1:7diIdLsqpCihPSX3fQagksT/Ku/y4RL9LHTlKyEUDl8= 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/martian/v3 v3.1.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= @@ -1338,8 +1210,6 @@ github.com/google/pprof v0.0.0-20210601050228-01bbb1931b22/go.mod h1:kpwsk12EmLe github.com/google/pprof v0.0.0-20210609004039-a478d1d731e9/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= -github.com/google/renameio/v2 v2.0.0 h1:UifI23ZTGY8Tt29JbYFiuyIU3eX+RNFtUwefq9qAhxg= -github.com/google/renameio/v2 v2.0.0/go.mod h1:BtmJXm5YlszgC+TD4HOEEUFgkJP3nLxehU6hfe7jRt4= 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= @@ -1361,12 +1231,10 @@ github.com/googleapis/gax-go/v2 v2.5.1/go.mod h1:h6B0KMMFNtI2ddbGJn3T3ZbwkeT6yqE github.com/googleapis/gax-go/v2 v2.6.0/go.mod h1:1mjbznJAPHFpesgE5ucqfYEscaz5kMdcIDwU/6+DDoY= github.com/googleapis/gax-go/v2 v2.7.0 h1:IcsPKeInNvYi7eqSaDjiZqDDKu5rsmunY0Y1YupQSSQ= github.com/googleapis/gax-go/v2 v2.7.0/go.mod h1:TEop28CZZQ2y+c0VxMUmu1lV+fQx57QpBWsYpwqHJx8= -github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY= github.com/googleapis/gnostic v0.4.1/go.mod h1:LRhVm6pbyptWbWbuZ38d1eyptfvIytN3ir6b65WBswg= github.com/googleapis/go-type-adapters v1.0.0/go.mod h1:zHW75FOG2aur7gAO2B+MLby+cLsWGBF62rFAi7WjWO4= github.com/googleapis/google-cloud-go-testing v0.0.0-20200911160855-bcd43fbb19e8/go.mod h1:dvDLG8qkwmyD9a/MJJN3XJcT3xFxOKAvTZGvuZmac9g= github.com/gookit/color v1.3.6/go.mod h1:R3ogXq2B9rTbXoSHJ1HyUVAZ3poOJHpd9nQmyGZsfvQ= -github.com/gopcua/opcua v0.1.12/go.mod h1:a6QH4F9XeODklCmWuvaOdL8v9H0d73CEKUHWVZLQyE8= github.com/gophercloud/gophercloud v1.0.0 h1:9nTGx0jizmHxDobe4mck89FyQHVyA3CaXLIUSGJjP9k= github.com/gophercloud/gophercloud v1.0.0/go.mod h1:Q8fZtyi5zZxPS/j9aj3sSxtvj41AdQMDwyo1myduD5c= github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1 h1:EGx4pi6eqNxGaHF6qqu48+N2wcFQ5qg5FXgOdqsJ5d8= @@ -1397,45 +1265,29 @@ github.com/gostaticanalysis/comment v1.3.0/go.mod h1:xMicKDx7XRXYdVwY9f9wQpDJVnq github.com/gostaticanalysis/comment v1.4.1/go.mod h1:ih6ZxzTHLdadaiSnF5WY3dxUoXfXAlTaRzuaNDlSado= github.com/gostaticanalysis/forcetypeassert v0.0.0-20200621232751-01d4955beaa5/go.mod h1:qZEedyP/sY1lTGV1uJ3VhWZ2mqag3IkWsDHVbplHXak= github.com/gostaticanalysis/nilerr v0.1.1/go.mod h1:wZYb6YI5YAxxq0i1+VJbY0s2YONW0HU0GPE3+5PWN4A= -github.com/grafana/dskit v0.0.0-20220928083349-b1b307db4f30 h1:Lbeu0ddFATI+cgXh6LzjAk9TdoU7WUZ2hry+5H4xXdM= -github.com/grafana/dskit v0.0.0-20220928083349-b1b307db4f30/go.mod h1:NTfOwhBMmR7TyG4E3RB4F1qhvk+cawoXacyN30yipVY= -github.com/grafana/go-gelf/v2 v2.0.1 h1:BOChP0h/jLeD+7F9mL7tq10xVkDG15he3T1zHuQaWak= -github.com/grafana/go-gelf/v2 v2.0.1/go.mod h1:lexHie0xzYGwCgiRGcvZ723bSNyNI8ZRD4s0CLobh90= -github.com/grafana/gomemcache v0.0.0-20220812141859-1e3ae89e91a7 h1:EKJ/x3CNzKFtppRriAk0PlWD513f+5YOx4aHSbWm1Y8= -github.com/grafana/gomemcache v0.0.0-20220812141859-1e3ae89e91a7/go.mod h1:H0wQNHz2YrLsuXOZozoeDmnHXkNCRmMW0gwFWDfEZDA= -github.com/grafana/loki v1.6.2-0.20221206154352-fee23745328c h1:WfrjoGZffQ508jBJmI7AAHWGdlJlYPd1Bet04FHClXg= -github.com/grafana/loki v1.6.2-0.20221206154352-fee23745328c/go.mod h1:VArTqN8uZ+Pfr7Fimx1TNji2I6qz3xRzZhgnqAV6YZ4= github.com/grafana/regexp v0.0.0-20221005093135-b4c2bcb0a4b6 h1:A3dhViTeFDSQcGOXuUi6ukCQSMyDtDISBp2z6OOo2YM= github.com/grafana/regexp v0.0.0-20221005093135-b4c2bcb0a4b6/go.mod h1:M5qHK+eWfAv8VR/265dIuEpL3fNfeC21tXXp9itM24A= -github.com/grafana/tail v0.0.0-20220426200921-98e8eb28ea4c h1:qIsCzNln5YzuXfXbJgXhpfM+4gY7qi3mED3eYQS4Fls= github.com/grafana/tail v0.0.0-20220426200921-98e8eb28ea4c/go.mod h1:GIMXMPB/lRAllP5rVDvcGif87ryO2hgD7tCtHMdHrho= github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA= 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-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= -github.com/grpc-ecosystem/go-grpc-middleware v1.1.0/go.mod h1:f5nM7jw/oeRSadq3xCzHAvxcr8HZnzsqU6ILg/0NiiE= -github.com/grpc-ecosystem/go-grpc-middleware v1.2.0/go.mod h1:mJzapYve32yjrKlk9GbyCZHuPgZsrbyIbyKhSzOpg6s= github.com/grpc-ecosystem/go-grpc-middleware v1.2.2/go.mod h1:EaizFBKfUKtMIF5iaDEhniwNedqGo9FuLFzppDr3uwI= github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 h1:+9834+KizmvFV7pXQGSXQTsaWhq2GjuNUt0aUU0YBYw= github.com/grpc-ecosystem/go-grpc-middleware v1.3.0/go.mod h1:z0ButlSOZa5vEBq9m2m2hlwIgKw+rp3sdCBRoJY+30Y= github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= -github.com/grpc-ecosystem/grpc-gateway v1.9.4/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= github.com/grpc-ecosystem/grpc-gateway v1.14.5/go.mod h1:UJ0EZAp832vCd54Wev9N1BMKEyvcZ5+IM0AwDrnlkEc= 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.14.0 h1:t7uX3JBHdVwAi3G7sSSdbsk8NfgA+LnUS88V/2EKaA0= github.com/grpc-ecosystem/grpc-gateway/v2 v2.14.0/go.mod h1:4OGVnY4qf2+gw+ssiHbW+pq4mo2yko94YxxMmXZ7jCA= -github.com/grpc-ecosystem/grpc-opentracing v0.0.0-20180507213350-8e809c8a8645 h1:MJG/KsmcqMwFAkh8mTnAwhyKoB+sTAnY4CACC110tbU= github.com/grpc-ecosystem/grpc-opentracing v0.0.0-20180507213350-8e809c8a8645/go.mod h1:6iZfnjpejD4L/4DwD7NryNaJyCQdzwWwH2MWhCA90Kw= github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c h1:6rhixN/i8ZofjG1Y75iExal34USq5p+wiN1tpie8IrU= github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c/go.mod h1:NMPJylDgVpX0MLRlPy15sqSwOFv/U1GZ2m21JhFfek0= github.com/hailocab/go-hostpool v0.0.0-20160125115350-e80d13ce29ed/go.mod h1:tMWxXQ9wFIaZeTI9F+hmhFiGpFmhOHzyShyFUhRm0H4= -github.com/harlow/kinesis-consumer v0.3.1-0.20181230152818-2f58b136fee0/go.mod h1:dk23l2BruuUzRP8wbybQbPn3J7sZga2QHICCeaEy5rQ= -github.com/hashicorp/consul v1.2.1 h1:66MuuTfV4aOXTQM7cjAIKUWFOITSk4XZlMhE09ymVbg= -github.com/hashicorp/consul v1.2.1/go.mod h1:mFrjN1mfidgJfYP1xrJCF+AfRhr6Eaqhb2+sfyn/OOI= github.com/hashicorp/consul/api v1.1.0/go.mod h1:VmuI/Lkw1nC05EYQWNKwWGbkg+FbDBtguAZLlVdkD9Q= github.com/hashicorp/consul/api v1.3.0/go.mod h1:MmDNSzIMUjNpY/mQ398R4bk2FnqQLoPndWW5VkKPlCE= github.com/hashicorp/consul/api v1.10.1/go.mod h1:XjsvQN+RJGWI2TWy1/kqaE16HrR2J/FWgkYjdZQsX9M= @@ -1489,7 +1341,6 @@ github.com/hashicorp/go-retryablehttp v0.5.3/go.mod h1:9B5zBasrRhHXnJnui7y6sL7es github.com/hashicorp/go-retryablehttp v0.5.4/go.mod h1:9B5zBasrRhHXnJnui7y6sL7es7NDiJgTc6Er0maI1Xs= github.com/hashicorp/go-retryablehttp v0.7.1 h1:sUiuQAnLlbvmExtFQs72iFW/HXeUn8Z1aJLQ4LJJbTQ= github.com/hashicorp/go-retryablehttp v0.7.1/go.mod h1:vAew36LZh98gCBJNLH42IQ1ER/9wtLZZ8meHqQvEYWY= -github.com/hashicorp/go-rootcerts v0.0.0-20160503143440-6bb64b370b90/go.mod h1:o4zcYY1e0GEZI6eSEr+43QDYmuGglw1qSO6qdHUHCgg= github.com/hashicorp/go-rootcerts v1.0.0/go.mod h1:K6zTfqpRlCUIjkwsN4Z+hiSfzSTQa6eBIzfwKfwNnHU= github.com/hashicorp/go-rootcerts v1.0.1/go.mod h1:pqUvnprVnM5bf7AOirdbb01K4ccR319Vf4pU3K5EGc8= github.com/hashicorp/go-rootcerts v1.0.2 h1:jzhAVGtqPKbwpyCPELlgNWhE1znq+qwJtW5Oi2viEzc= @@ -1520,7 +1371,6 @@ github.com/hashicorp/mdns v1.0.0/go.mod h1:tL+uN++7HEJ6SQLQ2/p+z2pH24WQKWjBPkE0m github.com/hashicorp/mdns v1.0.1/go.mod h1:4gW7WsVCke5TE7EPeYliwHlRUyBtfCwuFwuMg2DmyNY= github.com/hashicorp/mdns v1.0.4/go.mod h1:mtBihi+LeNXGtG8L9dX59gAEa12BDtBQSp4v/YAJqrc= github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I= -github.com/hashicorp/memberlist v0.1.5/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I= github.com/hashicorp/memberlist v0.2.2/go.mod h1:MS2lj3INKhZjWNqd3N0m3J+Jxf3DAOnAH9VT3Sh9MUE= github.com/hashicorp/memberlist v0.3.0/go.mod h1:MS2lj3INKhZjWNqd3N0m3J+Jxf3DAOnAH9VT3Sh9MUE= github.com/hashicorp/memberlist v0.3.1/go.mod h1:MS2lj3INKhZjWNqd3N0m3J+Jxf3DAOnAH9VT3Sh9MUE= @@ -1528,7 +1378,6 @@ github.com/hashicorp/memberlist v0.5.0 h1:EtYPN8DpAURiapus508I4n9CzHs2W+8NZGbmmR github.com/hashicorp/memberlist v0.5.0/go.mod h1:yvyXLpo0QaGE59Y7hDTsTzDD25JYBZ4mHgHUZ8lrOI0= github.com/hashicorp/nomad/api v0.0.0-20221102143410-8a95f1239005 h1:jKwXhVS4F7qk0g8laz+Anz0g/6yaSJ3HqmSAuSNLUcA= github.com/hashicorp/nomad/api v0.0.0-20221102143410-8a95f1239005/go.mod h1:vgJmrz4Bz9E1cR/uy70oP9udUJKFRkcEYHlHTp4nFwI= -github.com/hashicorp/serf v0.8.1/go.mod h1:h/Ru6tmZazX7WO/GDmwdpS975F019L4t5ng5IgwbNrE= github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc= github.com/hashicorp/serf v0.9.5/go.mod h1:UWDWwZeL5cuWDJdl0C6wrvrUwEqtQ4ZKBKKENpqIUyk= github.com/hashicorp/serf v0.9.6/go.mod h1:TXZNMjZQijwlDvp+r0b63xZ45H7JmCmgg4gpTwn9UV4= @@ -1541,31 +1390,23 @@ 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/hashicorp/yamux v0.0.0-20190923154419-df201c70410d/go.mod h1:+NfK9FKeTrX5uv1uIXGdwYDTeHna2qgaIlx54MXqjAM= -github.com/heroku/rollrus v0.2.0/go.mod h1:B3MwEcr9nmf4xj0Sr5l9eSht7wLKMa1C+9ajgAU79ek= -github.com/heroku/x v0.0.50 h1:CA0AXkSumucVJD+T+x+6c7X1iDEb+40F8GNgH5UjJwo= -github.com/heroku/x v0.0.50/go.mod h1:vr+jORZ6sG3wgEq2FAS6UbOUrz9/DxpQGN/xPHVgbSM= github.com/hetznercloud/hcloud-go v1.35.3 h1:WCmFAhLRooih2QHAsbCbEdpIHnshQQmrPqsr3rHE1Ow= github.com/hetznercloud/hcloud-go v1.35.3/go.mod h1:mepQwR6va27S3UQthaEPGS86jtzSY9xWL1e9dyxXpgA= github.com/hexops/gotextdiff v1.0.3 h1:gitA9+qJrrTCsiCl7+kh75nPqQt1cx4ZkudSTLoUqJM= github.com/hjson/hjson-go/v4 v4.0.0 h1:wlm6IYYqHjOdXH1gHev4VoXCaW20HdQAGCxdOEEg2cs= github.com/hjson/hjson-go/v4 v4.0.0/go.mod h1:KaYt3bTw3zhBjYqnXkYywcYctk0A2nxeEFTse3rH13E= -github.com/huandu/xstrings v1.3.1 h1:4jgBlKK6tLKFvO8u5pmYjG91cqytmDCDvGh7ECVFfFs= -github.com/huandu/xstrings v1.3.1/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE= github.com/hudl/fargo v1.3.0/go.mod h1:y3CKSmjA+wD2gak7sUSXTAoopbhU08POFhmITJgmKTg= github.com/hudl/fargo v1.4.0/go.mod h1:9Ai6uvFy5fQNq6VPKtg+Ceq1+eTY4nKUlR2JElEOcDo= -github.com/hydrogen18/memlistener v0.0.0-20141126152155-54553eb933fb/go.mod h1:qEIFzExnS6016fRpRfxrExeVn2gbClQA99gQhnIcdhE= github.com/iancoleman/strcase v0.2.0 h1:05I4QRnGpI0m37iZQRuskXh+w77mr6Z41lwQzuHLwW0= github.com/iancoleman/strcase v0.2.0/go.mod h1:iwCmte+B7n89clKwxIoIXy/HfoL7AsD47ZCWhYzw7ho= github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/imdario/mergo v0.3.5/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= -github.com/imdario/mergo v0.3.11/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA= github.com/imdario/mergo v0.3.12 h1:b6R2BslTbIEToALKP7LxUvijTsNI9TAe80pLWN2g/HU= github.com/imdario/mergo v0.3.12/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= github.com/inconshreveable/mousetrap v1.0.1 h1:U3uMjPSQEBMNp1lFxmllqCPM6P5u/Xq7Pgzkat/bFNc= github.com/inconshreveable/mousetrap v1.0.1/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= -github.com/influxdata/go-syslog/v2 v2.0.1/go.mod h1:hjvie1UTaD5E1fTnDmxaCw8RRDrT4Ve+XHr5O2dKSCo= github.com/influxdata/go-syslog/v3 v3.0.1-0.20210608084020-ac565dc76ba6 h1:s9ZL6ZhFF8y6ebnm1FLvobkzoIu5xwDQUcRPk/IEhpM= github.com/influxdata/go-syslog/v3 v3.0.1-0.20210608084020-ac565dc76ba6/go.mod h1:aXdIdfn2OcGnMhOTojXmwZqXKgC3MU5riiNvzwwG9OY= github.com/influxdata/influxdb-observability/common v0.2.32 h1:L9R2Zr3f47eyJf6T+8AAB6eyjywYFCLbnScXG6QEabg= @@ -1583,18 +1424,12 @@ github.com/influxdata/line-protocol/v2 v2.0.0-20210312151457-c52fdecb625a/go.mod github.com/influxdata/line-protocol/v2 v2.1.0/go.mod h1:QKw43hdUBg3GTk2iC3iyCxksNj7PX9aUSeYOYE/ceHY= github.com/influxdata/line-protocol/v2 v2.2.1 h1:EAPkqJ9Km4uAxtMRgUubJyqAr6zgWM0dznKMLRauQRE= github.com/influxdata/line-protocol/v2 v2.2.1/go.mod h1:DmB3Cnh+3oxmG6LOBIxce4oaL4CPj3OmMPgvauXh+tM= -github.com/influxdata/tail v1.0.1-0.20200707181643-03a791b270e4/go.mod h1:VeiWgI3qaGdJWust2fP27a6J+koITo/1c/UhxeOxgaM= -github.com/influxdata/telegraf v1.16.3 h1:x0qeuSGGMg5y+YqP/5ZHwXZu3bcBrO8AAQOTNlYEb1c= -github.com/influxdata/telegraf v1.16.3/go.mod h1:fX/6k7qpIqzVPWyeIamb0wN5hbwc0ANUaTS80lPYFB8= -github.com/influxdata/toml v0.0.0-20190415235208-270119a8ce65/go.mod h1:zApaNFpP/bTpQItGZNNUMISDMDAnTXu9UqJ4yT3ocz8= -github.com/influxdata/wlog v0.0.0-20160411224016-7c63b0a71ef8/go.mod h1:/2NMgWB1DHM1ti/gqhOlg+LJeBVk6FqR5aVGYY0hlwI= github.com/ionos-cloud/sdk-go/v6 v6.1.3 h1:vb6yqdpiqaytvreM0bsn2pXw+1YDvEk2RKSmBAQvgDQ= github.com/ionos-cloud/sdk-go/v6 v6.1.3/go.mod h1:Ox3W0iiEz0GHnfY9e5LmAxwklsxguuNFEUSu0gVRTME= github.com/jackc/chunkreader v1.0.0/go.mod h1:RT6O25fNZIuasFJRyZ4R/Y2BbhasbmZXF9QQ7T3kePo= github.com/jackc/chunkreader/v2 v2.0.0/go.mod h1:odVSm741yZoC3dpHEUXIqA9tQRhFrgOHwnPIn9lDKlk= github.com/jackc/chunkreader/v2 v2.0.1 h1:i+RDz65UE+mmpjTfyz0MoVTnzeYxroil2G82ki7MGG8= github.com/jackc/chunkreader/v2 v2.0.1/go.mod h1:odVSm741yZoC3dpHEUXIqA9tQRhFrgOHwnPIn9lDKlk= -github.com/jackc/fake v0.0.0-20150926172116-812a484cc733/go.mod h1:WrMFNQdiFJ80sQsxDoMokWK1W5TQtxBFNpzWTD84ibQ= github.com/jackc/pgconn v0.0.0-20190420214824-7e0022ef6ba3/go.mod h1:jkELnwuX+w9qN5YIfX0fl88Ehu4XC3keFuOJJk9pcnA= github.com/jackc/pgconn v0.0.0-20190824142844-760dd75542eb/go.mod h1:lLjNuW/+OfW9/pnVKPazfWOgNfH2aPem8YQ7ilXGvJE= github.com/jackc/pgconn v0.0.0-20190831204454-2fabfa3c18b7/go.mod h1:ZJKsE/KZfsUgOEh9hBm+xYTstcNHg7UPMVJqRfQxq4s= @@ -1628,7 +1463,6 @@ github.com/jackc/pgtype v0.0.0-20190828014616-a8802b16cc59/go.mod h1:MWlu30kVJrU github.com/jackc/pgtype v1.8.1-0.20210724151600-32e20a603178/go.mod h1:C516IlIV9NKqfsMCXTdChteoXmwgUceqaLfjg2e3NlM= github.com/jackc/pgtype v1.12.0 h1:Dlq8Qvcch7kiehm8wPGIW0W3KsCCHJnRacKW0UM8n5w= github.com/jackc/pgtype v1.12.0/go.mod h1:LUMuVrfsFfdKGLw+AFFVv6KtHOFMwRgDDzBt76IqCA4= -github.com/jackc/pgx v3.6.0+incompatible/go.mod h1:0ZGrqGqkRlliWnWB4zKnWtjbSWbGkVEFm4TeybAXq+I= github.com/jackc/pgx/v4 v4.0.0-20190420224344-cc3461e65d96/go.mod h1:mdxmSJJuR08CZQyj1PVQBHy9XOp5p8/SHH6a0psbY9Y= github.com/jackc/pgx/v4 v4.0.0-20190421002000-1b8f0016e912/go.mod h1:no/Y67Jkk/9WuGR0JG/JseM9irFbnEPbuWV2EELPNuM= github.com/jackc/pgx/v4 v4.0.0-pre1.0.20190824185557-6972a5742186/go.mod h1:X+GQnOEnf1dqHGpw7JmHqHc1NxDoalibchSk9/RWuDc= @@ -1660,12 +1494,10 @@ github.com/jcmturner/gokrb5/v8 v8.4.3 h1:iTonLeSJOn7MVUtyMT+arAn5AKAPrkilzhGw8wE github.com/jcmturner/gokrb5/v8 v8.4.3/go.mod h1:dqRwJGXznQrzw6cWmyo6kH+E7jksEQG/CyVWsJEsJO0= github.com/jcmturner/rpc/v2 v2.0.3 h1:7FXXj8Ti1IaVFpSAziCZWNzbNuZmnvw/i6CqLNdWfZY= github.com/jcmturner/rpc/v2 v2.0.3/go.mod h1:VUJYCIDm3PVOEHw8sgt091/20OJjskO/YJki3ELg/Hc= -github.com/jessevdk/go-flags v1.5.0/go.mod h1:Fw0T6WPc1dYxT4mKEZRfG5kJhaTDP9pj1c2EWnYs/m4= github.com/jgautheron/goconst v1.4.0/go.mod h1:aAosetZ5zaeC/2EfMeRswtxUFBpe2Hr7HzkgX4fanO4= github.com/jhump/protoreflect v1.6.0/go.mod h1:eaTn3RZAmMBcV0fifFvlm6VHNz3wSkYyXYWUh7ymB74= github.com/jingyugao/rowserrcheck v0.0.0-20210130005344-c6a0c12dd98d/go.mod h1:/EZlaYCnEX24i7qdVhT9du5JrtFWYRQr67bVgR7JJC8= github.com/jirfag/go-printf-func-name v0.0.0-20200119135958-7558a9eaa5af/go.mod h1:HEWGJkRDzjJY2sqdDwxccsGicWEf9BQOZsq2tV+xzM0= -github.com/jmespath/go-jmespath v0.0.0-20160202185014-0b12d6b521d8/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= github.com/jmespath/go-jmespath v0.3.0/go.mod h1:9QtRXoHjLGCJ5IBSaohpXITPlowMeeYCZ7fLUTSywik= github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg= @@ -1673,18 +1505,13 @@ github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHW github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8= github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U= github.com/jmoiron/sqlx v1.2.0/go.mod h1:1FEQNm3xlJgrMD+FBdI9+xvCksHtbpVBBw5dYhBSsks= -github.com/joeshaw/envdecode v0.0.0-20180129163420-d5f34bca07f3/go.mod h1:Q+alOFAXgW5SrcfMPt/G4B2oN+qEcQRJjkn/f4mKL04= github.com/joho/godotenv v1.3.0 h1:Zjp+RcGpHhGlrMbJzXTrZZPrWj+1vfm90La1wgB6Bhc= github.com/joho/godotenv v1.3.0/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqxOKXbg= github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY= github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y= -github.com/jpillora/backoff v0.0.0-20180909062703-3050d21c67d7/go.mod h1:2iMrUgbbvHEiQClaW2NsSzMyGHqN+rDFqY705q49KG0= github.com/jpillora/backoff v1.0.0 h1:uvFg412JmmHBHw7iwprIxkPMI+sGQ4kzOWsMeHnm2EA= github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4= -github.com/jsimonetti/rtnetlink v0.0.0-20190606172950-9527aa82566a/go.mod h1:Oz+70psSo5OFh8DBl0Zv2ACw7Esh6pPUphlvZG9x7uw= -github.com/jsimonetti/rtnetlink v0.0.0-20200117123717-f846d4f6c1f4/go.mod h1:WGuG/smIU4J/54PblvSbh+xvCZmpJnFgr3ds6Z55XMQ= -github.com/json-iterator/go v0.0.0-20180612202835-f2b4162afba3/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= github.com/json-iterator/go v1.1.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/json-iterator/go v1.1.8/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= @@ -1702,23 +1529,19 @@ github.com/juju/errors v0.0.0-20181012004132-a4583d0a56ea/go.mod h1:W54LbzXuIE0b github.com/juju/loggo v0.0.0-20190526231331-6e530bcce5d8/go.mod h1:vgyd7OREkbtVEN/8IXZe5Ooef3LQePvuBm9UWj6ZL8U= github.com/juju/testing v0.0.0-20191001232224-ce9dec17d28b/go.mod h1:63prj8cnj0tU0S9OHjGJn+b1h0ZghCndfnbQolrYTwA= github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= -github.com/julienschmidt/httprouter v1.3.0 h1:U0609e9tgbseu3rBINet9P48AI/D3oJs4dN7jwJOQ1U= github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM= github.com/julz/importas v0.0.0-20210226073942-60b4fa260dd0/go.mod h1:oSFU2R4XK/P7kNBrnL/FEQlDGN1/6WoxXEjSSXO0DV0= github.com/jung-kurt/gofpdf v1.0.0/go.mod h1:7Id9E/uU8ce6rXgefFLlgrJj/GYY22cpxn+r32jIOes= github.com/jung-kurt/gofpdf v1.0.3-0.20190309125859-24315acbbda5/go.mod h1:7Id9E/uU8ce6rXgefFLlgrJj/GYY22cpxn+r32jIOes= github.com/k0kubun/pp v3.0.1+incompatible/go.mod h1:GWse8YhT0p8pT4ir3ZgBbfZild3tgzSScAn6HmfYukg= github.com/k0kubun/pp/v3 v3.1.0/go.mod h1:vIrP5CF0n78pKHm2Ku6GVerpZBJvscg48WepUYEk2gw= -github.com/kardianos/service v1.0.0/go.mod h1:8CzDhVuCuugtsHyZoTvsOBuvonN/UDBvl0kH+BUxvbo= github.com/karrick/godirwalk v1.8.0/go.mod h1:H5KPZjojv4lE+QYImBI8xVtrBRgYrIVsaRPx4tDPEn4= github.com/karrick/godirwalk v1.10.3/go.mod h1:RoGL9dQei4vP9ilrpETWE8CLOZ1kiN0LhBygSwrAsHA= -github.com/karrick/godirwalk v1.16.1/go.mod h1:j4mkqPuvaLI8mp1DroR3P6ad7cyYd4c1qeJ3RV7ULlk= github.com/karrick/godirwalk v1.17.0 h1:b4kY7nqDdioR/6qnbHQyDvmA17u5G1cZ6J+CZXwSWoI= github.com/karrick/godirwalk v1.17.0/go.mod h1:j4mkqPuvaLI8mp1DroR3P6ad7cyYd4c1qeJ3RV7ULlk= github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 h1:Z9n2FFNUXsshfwJMBgNA0RU6/i7WVaAegv3PtuIHPMs= github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod h1:CzGEWj7cYgsdH8dAjBGEr58BoE7ScuLd+fwFZ44+/x8= github.com/keybase/go-keychain v0.0.0-20190712205309-48d3d31d256d/go.mod h1:JJNrCn9otv/2QP4D7SMJBgaleKpOf66PnW6F5WGNRIc= -github.com/keybase/go-ps v0.0.0-20190827175125-91aafc93ba19/go.mod h1:hY+WOq6m2FpbvyrI93sMaypsttvaIL5nhVR92dTMUcQ= github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q= github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= @@ -1759,16 +1582,12 @@ github.com/kr/pty v1.1.8/go.mod h1:O1sed60cT9XZ5uDucP5qwvh+TE3NnUj51EiZO/lmSfw= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= -github.com/kubernetes/apimachinery v0.0.0-20190119020841-d41becfba9ee/go.mod h1:Pe/YBTPc3vqoMkbuIWPH8CF9ehINdvNyS0dP3J6HC0s= github.com/kulti/thelper v0.4.0/go.mod h1:vMu2Cizjy/grP+jmsvOFDx1kYP6+PD1lqg4Yu5exl2U= github.com/kunwardeep/paralleltest v1.0.2/go.mod h1:ZPqNm1fVHPllh5LPVujzbVz1JN2GhLxSfY+oqUsvG30= github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc= github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw= github.com/kyoh86/exportloopref v0.1.8/go.mod h1:1tUcJeiioIs7VWe5gcOObrux3lb66+sBqGZrRkMwPgg= -github.com/leesper/go_rng v0.0.0-20171009123644-5344a9259b21/go.mod h1:N0SVk0uhy+E1PZ3C9ctsPRlvOPAFPkCNlcPBDkt0N3U= github.com/leesper/go_rng v0.0.0-20190531154944-a612b043e353 h1:X/79QL0b4YJVO5+OsPH9rF2u428CIrGL/jLmPsoOQQ4= -github.com/leesper/go_rng v0.0.0-20190531154944-a612b043e353/go.mod h1:N0SVk0uhy+E1PZ3C9ctsPRlvOPAFPkCNlcPBDkt0N3U= -github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII= github.com/leodido/ragel-machinery v0.0.0-20181214104525-299bdde78165 h1:bCiVCRCs1Heq84lurVinUPy19keqGEe4jh5vtK37jcg= github.com/leodido/ragel-machinery v0.0.0-20181214104525-299bdde78165/go.mod h1:WZxr2/6a/Ar9bMDc2rN/LJrE/hF6bXE4LPyDSIxwAfg= github.com/leoluk/perflib_exporter v0.2.0 h1:WJU7N3AIHxfc3CjoEJcBgG3i2ltF5Yz1ADVY9T6f1BY= @@ -1776,7 +1595,6 @@ github.com/leoluk/perflib_exporter v0.2.0/go.mod h1:MinSWm88jguXFFrGsP56PtleUb4Q github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= github.com/lib/pq v1.1.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= -github.com/lib/pq v1.3.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= github.com/lib/pq v1.9.0/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= github.com/lib/pq v1.10.2/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= github.com/lib/pq v1.10.7 h1:p7ZhMD+KsSRozJr34udlUrhboJwWAgCg34+/ZZNvZZw= @@ -1790,7 +1608,6 @@ github.com/linkedin/goavro/v2 v2.9.8/go.mod h1:UgQUb2N/pmueQYH9bfqFioWxzYCZXSfF8 github.com/linode/linodego v1.9.3 h1:+lxNZw4avRxhCqGjwfPgQ2PvMT+vOL0OMsTdzixR7hQ= github.com/linode/linodego v1.9.3/go.mod h1:h6AuFR/JpqwwM/vkj7s8KV3iGN8/jxn+zc437F8SZ8w= github.com/logrusorgru/aurora v0.0.0-20181002194514-a7b3b318ed4e/go.mod h1:7rIyQOR62GCctdiQpZ/zOJlFyk6y+94wXzv6RNZgaR4= -github.com/lstoll/grpce v1.7.0/go.mod h1:XiCWl3R+avNCT7KsTjv3qCblgsSqd0SC4ymySrH226g= github.com/lucasb-eyer/go-colorful v1.0.2/go.mod h1:0MS4r+7BZKSJ5mw4/S5MPN+qHFF1fYclkSPilDOKW0s= github.com/lucasb-eyer/go-colorful v1.0.3/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0= github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0/go.mod h1:zJYVVT2jmtg6P3p1VtQj7WsuWi/y4VnjVBn7F8KPB3I= @@ -1805,8 +1622,6 @@ github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czP github.com/magiconair/properties v1.8.5/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60= github.com/magiconair/properties v1.8.6 h1:5ibWZ6iY0NctNGWo87LalDlEZ6R41TqbbDamhfG/Qzo= github.com/magiconair/properties v1.8.6/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60= -github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= -github.com/mailru/easyjson v0.0.0-20180717111219-efc7eb8984d6/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/mailru/easyjson v0.0.0-20180823135443-60711f1a8329/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/mailru/easyjson v0.0.0-20190312143242-1de009706dbe/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= @@ -1846,7 +1661,6 @@ github.com/mattn/go-runewidth v0.0.2/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzp github.com/mattn/go-runewidth v0.0.4/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= github.com/mattn/go-runewidth v0.0.7/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI= github.com/mattn/go-runewidth v0.0.8/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI= -github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI= github.com/mattn/go-sqlite3 v1.9.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc= github.com/mattn/go-sqlite3 v2.0.3+incompatible h1:gXHsfypPkaMZrKbD5209QV9jbUTJKjyR5WD3HYQSd+U= github.com/mattn/go-sqlite3 v2.0.3+incompatible/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc= @@ -1855,14 +1669,8 @@ github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5 github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo= github.com/matttproud/golang_protobuf_extensions v1.0.4/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4= github.com/mbilski/exhaustivestruct v1.2.0/go.mod h1:OeTBVxQWoEmB2J2JCHmXWPJ0aksxSUOUy+nvtVEfzXc= -github.com/mdlayher/apcupsd v0.0.0-20200608131503-2bf01da7bf1b/go.mod h1:WYK/Z/aXq9cbMFIL5ihcA4sX/r/3/WCas/Qvs/2fXcA= -github.com/mdlayher/genetlink v1.0.0/go.mod h1:0rJ0h4itni50A86M2kHcgS85ttZazNt7a8H2a2cw0Gc= -github.com/mdlayher/netlink v0.0.0-20190409211403-11939a169225/go.mod h1:eQB3mZE4aiYnlUsyGGCOpPETfdQq4Jhsgf1fk3cwQaA= -github.com/mdlayher/netlink v1.0.0/go.mod h1:KxeJAFOFLG6AjpyDkQ/iIhxygIUKD+vcwqcnu43w/+M= -github.com/mdlayher/netlink v1.1.0/go.mod h1:H4WCitaheIsdF9yOYu8CFmCgQthAPIWZmcKp9uZHgmY= github.com/mgechev/dots v0.0.0-20190921121421-c36f7dcfbb81/go.mod h1:KQ7+USdGKfpPjXk4Ga+5XxQM4Lm4e3gAogrreFAYpOg= github.com/mgechev/revive v1.0.3/go.mod h1:POGGZagSo/0frdr7VeAifzS5Uka0d0GPiM35MsTO8nE= -github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b/go.mod h1:01TrycV0kFyexm33Z7vhZRXopbI8J3TDReVlkTgMUxE= github.com/microsoft/ApplicationInsights-Go v0.4.4 h1:G4+H9WNs6ygSCe6sUyxRc2U81TI5Es90b2t/MwX5KqY= github.com/microsoft/ApplicationInsights-Go v0.4.4/go.mod h1:fKRUseBqkw6bDiXTs3ESTiU/4YTIHsQS4W3fP2ieF4U= github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= @@ -1871,7 +1679,6 @@ github.com/miekg/dns v1.1.41/go.mod h1:p6aan82bvRIyn+zDIv9xYNUpwa73JcSh9BKwknJys github.com/miekg/dns v1.1.43/go.mod h1:+evo5L0630/F6ca/Z9+GAqzhjGyn8/c+TBaOyfEl0V4= github.com/miekg/dns v1.1.50 h1:DQUfb9uc6smULcREF09Uc+/Gd46YWqJd5DbpPE9xkcA= github.com/miekg/dns v1.1.50/go.mod h1:e3IlAVfNqAllflbibAZEWOXOQ+Ynzk/dDozDxY7XnME= -github.com/mikioh/ipaddr v0.0.0-20190404000644-d465c8ab6721/go.mod h1:Ickgr2WtCLZ2MDGd4Gr0geeCH5HybhRJbonOgQpvSxc= github.com/mindprince/gonvml v0.0.0-20190828220739-9ebdce4bb989 h1:PS1dLCGtD8bb9RPKJrc8bS7qHL6JnW1CZvwzH9dPoUs= github.com/mindprince/gonvml v0.0.0-20190828220739-9ebdce4bb989/go.mod h1:2eu9pRWp8mo84xCg6KswZ+USQHjwgRhNp06sozOdsTY= github.com/minio/highwayhash v1.0.1/go.mod h1:BQskDq+xkJ12lmlUUi7U0M5Swg3EWR+dLTk+kldvVxY= @@ -1921,7 +1728,6 @@ github.com/moby/term v0.0.0-20220808134915-39b0c02b01ae/go.mod h1:E2VnQOmVuvZB6U github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= -github.com/modern-go/reflect2 v0.0.0-20180320133207-05fbef0ca5da/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= @@ -1942,7 +1748,6 @@ github.com/mrunalp/fileutils v0.5.0 h1:NKzVxiH7eSk+OQ4M+ZYW1K6h27RUV3MI6NUTsHhU6 github.com/mrunalp/fileutils v0.5.0/go.mod h1:M1WthSahJixYnrXQl/DFQuteStB1weuxD2QJNHXfbSQ= github.com/mtibben/percent v0.2.1 h1:5gssi8Nqo8QU/r2pynCm+hBQHpkB/uNK7BJCFogWdzs= github.com/mtibben/percent v0.2.1/go.mod h1:KG9uO+SZkUp+VkRHsCdYQV3XSZrrSpR3O9ibNBTZrns= -github.com/multiplay/go-ts3 v1.0.0/go.mod h1:14S6cS3fLNT3xOytrA/DkRyAFNuQLMLEqOYAsf87IbQ= github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= 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= @@ -1951,13 +1756,11 @@ github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f h1:KUppIJq7/+ github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw= github.com/nakabonne/nestif v0.3.0/go.mod h1:dI314BppzXjJ4HsCnbo7XzrJHPszZsjnk5wEBSYHI2c= -github.com/naoina/go-stringutil v0.1.0/go.mod h1:XJ2SJL9jCtBh+P9q5btrd/Ylo8XwT/h1USek5+NqSA0= github.com/nats-io/jwt v0.3.0/go.mod h1:fRYCDE99xlTsqUzISS1Bi75UBJ6ljOJQOAAu5VglpSg= github.com/nats-io/jwt v0.3.2/go.mod h1:/euKqTS1ZD+zzjYrY7pseZrTtWQSjujC7xjPc8wL6eU= github.com/nats-io/jwt v1.2.2/go.mod h1:/xX356yQA6LuXI9xWW7mZNpxgF2mBmGecH+Fj34sP5Q= github.com/nats-io/jwt/v2 v2.0.3/go.mod h1:VRP+deawSXyhNjXmxPCHskrR6Mq50BqpEI5SEcNiGlY= github.com/nats-io/nats-server/v2 v2.1.2/go.mod h1:Afk+wRZqkMQs/p45uXdrVLuab3gwv3Z8C4HTBu8GD/k= -github.com/nats-io/nats-server/v2 v2.1.4/go.mod h1:Jw1Z28soD/QasIA2uWjXyM9El1jly3YwyFOuR8tH1rg= github.com/nats-io/nats-server/v2 v2.5.0/go.mod h1:Kj86UtrXAL6LwYRA6H4RqzkHhK0Vcv2ZnKD5WbQ1t3g= github.com/nats-io/nats.go v1.9.1/go.mod h1:ZjDU1L/7fJ09jvUSRVBR2e7+RnLiiIQyqyzEE/Zbp4w= github.com/nats-io/nats.go v1.12.1/go.mod h1:BPko4oXsySz4aSWeFgOHLZs3G4Jq4ZAyE6/zMCxRT6w= @@ -1968,7 +1771,6 @@ github.com/nats-io/nkeys v0.3.0/go.mod h1:gvUNGjVcM2IPr5rCsRsC6Wb3Hr2CQAm08dsxtV github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c= github.com/nbutton23/zxcvbn-go v0.0.0-20180912185939-ae427f1e4c1d/go.mod h1:o96djdrsSGy3AWPyBgZMAGfxZNfgntdJG+11KU4QvbU= github.com/nbutton23/zxcvbn-go v0.0.0-20201221231540-e56b841a3c88/go.mod h1:KSVJerMDfblTH7p5MZaTt+8zaT2iEk3AkVb9PQdZuE8= -github.com/newrelic/newrelic-telemetry-sdk-go v0.2.0/go.mod h1:G9MqE/cHGv3Hx3qpYhfuyFUsGx2DpVcGi1iJIqTg+JQ= github.com/nginxinc/nginx-plus-go-client v0.6.0/go.mod h1:DBAmdDP71tOhgFPdCMVusegzdKmLVpVL0nVcMX17pbY= github.com/nginxinc/nginx-prometheus-exporter v0.8.1-0.20201110005315-f5a5f8086c19 h1:jR4KbeVA+KYmPq+amRe6AdB4mIfEaSOZGY2zCpqt/p8= github.com/nginxinc/nginx-prometheus-exporter v0.8.1-0.20201110005315-f5a5f8086c19/go.mod h1:L58Se1nwn3cEyHWlcfdlXgiGbHe/efvDbkbi+psz3lA= @@ -1976,7 +1778,6 @@ github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLA github.com/nishanths/exhaustive v0.1.0/go.mod h1:S1j9110vxV1ECdCudXRkeMnFQ/DQk9ajLT0Uf2MYZQQ= github.com/nishanths/predeclared v0.2.1/go.mod h1:HvkGJcA3naj4lOwnFXFDkFxVtSqQMB9sbB1usJ+xjQE= github.com/npillmayer/nestext v0.1.3/go.mod h1:h2lrijH8jpicr25dFY+oAJLyzlya6jhnuG+zWp9L0Uk= -github.com/nsqio/go-nsq v1.0.7/go.mod h1:XP5zaUs3pqf+Q71EqUJs3HYfBIqfK6G83WQMdNN+Ito= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE= github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU= @@ -1990,7 +1791,6 @@ github.com/oklog/ulid v1.3.1 h1:EGfNDEx6MqHz8B3uNV6QAib1UR2Lm97sHi3ocA6ESJ4= github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U= github.com/olekukonko/tablewriter v0.0.0-20170122224234-a0225b3f23b5/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo= github.com/olekukonko/tablewriter v0.0.4/go.mod h1:zq6QwlOf5SlnkVbMSr5EoBv3636FWnp+qbPhuoO21uA= -github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY= github.com/olivere/elastic v6.2.35+incompatible/go.mod h1:J+q1zQJTgAz9woqsbVRqGeB5G1iqDKVBWLNSYW8yfJ8= github.com/olivere/elastic v6.2.37+incompatible/go.mod h1:J+q1zQJTgAz9woqsbVRqGeB5G1iqDKVBWLNSYW8yfJ8= github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= @@ -2022,11 +1822,8 @@ github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAl github.com/onsi/gomega v1.18.1/go.mod h1:0q+aL8jAiMXy9hbwj2mr5GziHiwhAIQpFmmtT5hitRs= github.com/onsi/gomega v1.20.1 h1:PA/3qinGoukvymdIDV8pii6tiZgC8kbmJO6Z5+b002Q= github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk= -github.com/openconfig/gnmi v0.0.0-20180912164834-33a1865c3029/go.mod h1:t+O9It+LKzfOAhKTT5O0ehDix+MTqbtT0T9t+7zzOvc= -github.com/opencontainers/go-digest v1.0.0-rc1/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s= 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.1/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0= github.com/opencontainers/image-spec v1.0.2/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0= github.com/opencontainers/image-spec v1.0.3-0.20211202183452-c5a74bcca799 h1:rc3tiVYb5z54aKaDfakKn0dDjIyPpTtszkjuMzyt7ec= github.com/opencontainers/image-spec v1.0.3-0.20211202183452-c5a74bcca799/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0= @@ -2044,13 +1841,9 @@ github.com/openshift/api v0.0.0-20210521075222-e273a339932a/go.mod h1:izBmoXbUu3 github.com/openshift/build-machinery-go v0.0.0-20210423112049-9415d7ebd33e/go.mod h1:b1BuldmJlbA/xYtdZvKi+7j5YGB44qJUJDZ9zwiNCfE= github.com/openshift/client-go v0.0.0-20210521082421-73d9475a9142 h1:ZHRIMCFIJN1p9LsJt4HQ+akDrys4PrYnXzOWI5LK03I= github.com/openshift/client-go v0.0.0-20210521082421-73d9475a9142/go.mod h1:fjS8r9mqDVsPb5td3NehsNOAWa4uiFkYEfVZioQ2gH0= -github.com/opentracing-contrib/go-grpc v0.0.0-20180928155321-4b5a12d3ff02/go.mod h1:JNdpVEzCpXBgIiv4ds+TzhN1hrtxq6ClLrTlT9OQRSc= github.com/opentracing-contrib/go-grpc v0.0.0-20191001143057-db30781987df/go.mod h1:DYR5Eij8rJl8h7gblRrOZ8g0kW1umSpKqYIBTgeDtLo= -github.com/opentracing-contrib/go-grpc v0.0.0-20210225150812-73cb765af46e h1:4cPxUYdgaGzZIT5/j0IfqOrrXmq6bG8AwvwisMXpdrg= -github.com/opentracing-contrib/go-grpc v0.0.0-20210225150812-73cb765af46e/go.mod h1:DYR5Eij8rJl8h7gblRrOZ8g0kW1umSpKqYIBTgeDtLo= github.com/opentracing-contrib/go-observer v0.0.0-20170622124052-a52f23424492/go.mod h1:Ngi6UdF0k5OKD5t5wlmGhe/EDKPoUM3BXZSSfIuJbis= github.com/opentracing-contrib/go-stdlib v0.0.0-20190519235532-cf7a6c988dc9/go.mod h1:PLldrQSroqzH70Xl+1DQcGnefIbqsKR7UDaiux3zV+w= -github.com/opentracing-contrib/go-stdlib v1.0.0 h1:TBS7YuVotp8myLon4Pv7BtCBzOTo1DeZCld0Z63mW2w= github.com/opentracing-contrib/go-stdlib v1.0.0/go.mod h1:qtI1ogk+2JhVPIXVc6q+NHziSmy2W5GbdQZFUHADCBU= github.com/opentracing/basictracer-go v1.0.0/go.mod h1:QfBfYuafItcjQuMwinw9GhYKwFXS9KnPs5lxoYwgW74= github.com/opentracing/opentracing-go v1.0.2/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= @@ -2064,7 +1857,6 @@ github.com/openzipkin/zipkin-go v0.2.2/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnh github.com/openzipkin/zipkin-go v0.2.5/go.mod h1:KpXfKdgRDnnhsxw4pNIH9Md5lyFqKUa4YDFlwRYAMyE= github.com/openzipkin/zipkin-go v0.4.1 h1:kNd/ST2yLLWhaWrkgchya40TJabe8Hioj9udfPcEO5A= github.com/openzipkin/zipkin-go v0.4.1/go.mod h1:qY0VqDSN1pOBN94dBc6w2GJlWLiovAyg7Qt6/I9HecM= -github.com/openzipkin/zipkin-go-opentracing v0.3.4/go.mod h1:js2AbwmHW0YD9DwIw2JhQWmbfFi/UnWyYwdVhqbCDOE= github.com/ory/go-acc v0.2.6/go.mod h1:4Kb/UnPcT8qRAk3IAxta+hvVapdxTLWtrr7bFLlEgpw= github.com/ory/viper v1.7.5/go.mod h1:ypOuyJmEUb3oENywQZRgeAMwqgOyDqwboO1tj3DjTaM= github.com/ovh/go-ovh v1.3.0 h1:mvZaddk4E4kLcXhzb+cxBsMPYp2pHqiQpWYkInsuZPQ= @@ -2103,7 +1895,6 @@ github.com/pierrec/lz4 v0.0.0-20190327172049-315a67e90e41/go.mod h1:3/3N9NVKO0je github.com/pierrec/lz4 v1.0.2-0.20190131084431-473cd7ce01a1/go.mod h1:3/3N9NVKO0jef7pBehbT1qWhCMrIgbYNnFAZCqQ5LRc= github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= github.com/pierrec/lz4 v2.4.1+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= -github.com/pierrec/lz4 v2.5.2+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= github.com/pierrec/lz4 v2.6.0+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= 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= @@ -2118,7 +1909,6 @@ github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8/go.mod h1:HKlIX3XHQyzL github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA= 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.8.2-0.20190227000051-27936f6d90f9/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/pkg/profile v1.2.1/go.mod h1:hJw3o1OdXxsrSjjVksARp5W95eeEaEfptyVZyv6JUPA= @@ -2137,10 +1927,7 @@ github.com/power-devops/perfstat v0.0.0-20220216144756-c35f1ee13d7c/go.mod h1:Om github.com/pquerna/cachecontrol v0.1.0 h1:yJMy84ti9h/+OEWa752kBTKv4XC30OtVVHYv/8cTqKc= github.com/pquerna/cachecontrol v0.1.0/go.mod h1:NrUG3Z7Rdu85UNR3vm7SOsl1nFIeSiQnrHV5K9mBcUI= github.com/prashantv/gostub v1.1.0/go.mod h1:A5zLQHz7ieHGG7is6LLXLz7I8+3LZzsrV0P1IAHhP5U= -github.com/prometheus/alertmanager v0.24.0 h1:HBWR3lk4uy3ys+naDZthDdV7yEsxpaNeZuUS+hJgrOw= -github.com/prometheus/alertmanager v0.24.0/go.mod h1:r6fy/D7FRuZh5YbnX6J3MBY0eI4Pb5yPYS7/bPSXXqI= github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= -github.com/prometheus/client_golang v0.9.2/go.mod h1:OsXs2jCmiKlQ1lTBmv21f2mNfw4xf/QclQDMrYNZzcM= github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829/go.mod h1:p2iRAGwDERtqlqzRXnrOVns+ignqQo//hLXqYxZYVNs= github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDft0ttaMvbicHlPoso= github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= @@ -2166,7 +1953,6 @@ github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6T github.com/prometheus/client_model v0.3.0 h1:UBgGFHqYdG/TPFD1B1ogZywDqEkwp3fBMvqdiQ7Xew4= github.com/prometheus/client_model v0.3.0/go.mod h1:LDGWKZIo7rky3hgvBe+caln+Dr3dPggB5dvjtD7w9+w= github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= -github.com/prometheus/common v0.0.0-20181126121408-4724e9255275/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= github.com/prometheus/common v0.2.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= github.com/prometheus/common v0.4.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= @@ -2184,11 +1970,7 @@ github.com/prometheus/common v0.37.0 h1:ccBbHCgIiT9uSoFY0vX8H3zsNR5eLt17/RQLUvn8 github.com/prometheus/common v0.37.0/go.mod h1:phzohg0JFMnBEFGxTDbfu3QyL5GI8gTQJFhYO5B3mfA= github.com/prometheus/common/sigv4 v0.1.0 h1:qoVebwtwwEhS85Czm2dSROY5fTo2PAPEVdDeppTwGX4= github.com/prometheus/common/sigv4 v0.1.0/go.mod h1:2Jkxxk9yYvCkE5G1sQT7GuEXm57JrvHu9k5YwTjsNtI= -github.com/prometheus/exporter-toolkit v0.7.1/go.mod h1:ZUBIj498ePooX9t/2xtDjeQYwvRpiPP2lh5u4iblj2g= -github.com/prometheus/exporter-toolkit v0.8.2 h1:sbJAfBXQFkG6sUkbwBun8MNdzW9+wd5YfPYofbmj0YM= -github.com/prometheus/exporter-toolkit v0.8.2/go.mod h1:00shzmJL7KxcsabLWcONwpyNEuWhREOnFqZW7vadFS0= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= -github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= @@ -2211,16 +1993,12 @@ github.com/quasilyte/go-ruleguard/dsl v0.0.0-20210106184943-e47d54850b18/go.mod github.com/quasilyte/go-ruleguard/dsl v0.0.0-20210115110123-c73ee1cbff1f/go.mod h1:KeCP03KrjuSO0H1kTuZQCWlQPulDV6YMIXmpQss17rU= github.com/quasilyte/go-ruleguard/rules v0.0.0-20201231183845-9e62ed36efe1/go.mod h1:7JTjp89EGyU1d6XfBiXihJNG37wB2VRkd125Q1u7Plc= github.com/quasilyte/regex/syntax v0.0.0-20200407221936-30656e2c4a95/go.mod h1:rlzQ04UMyJXu/aOvhd8qT+hvDrFpiwqp8MRXDY9szc0= -github.com/rafaeljusto/redigomock v0.0.0-20190202135759-257e089e14a1/go.mod h1:JaY6n2sDr+z2WTsXkOmNRUfDy6FN0L6Nk7x06ndm4tY= -github.com/rcrowley/go-metrics v0.0.0-20160613154715-cfa5a85e9f0a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= github.com/rcrowley/go-metrics v0.0.0-20190826022208-cac0b30c2563/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= -github.com/rcrowley/go-metrics v0.0.0-20200313005456-10cdbea86bc0/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 h1:N/ElC8H3+5XpJzTSTfLsJV/mx9Q9g7kxmchpfZyxgzM= github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= github.com/relvacode/iso8601 v1.1.0 h1:2nV8sp0eOjpoKQ2vD3xSDygsjAx37NHG2UlZiCkDH4I= github.com/relvacode/iso8601 v1.1.0/go.mod h1:FlNp+jz+TXpyRqgmM7tnzHHzBnz776kmAH2h3sZCn0I= -github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo= github.com/rhnvrm/simples3 v0.6.1/go.mod h1:Y+3vYm2V7Y4VijFoJHHTrja6OgPrJ2cBti8dPGkC3sA= github.com/rivo/tview v0.0.0-20200219210816-cd38d7432498/go.mod h1:6lkG1x+13OShEf0EaOCaTQYyB7d5nSbb181KtjlS+84= github.com/rivo/uniseg v0.1.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= @@ -2233,8 +2011,6 @@ 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.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8= github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs= -github.com/rollbar/rollbar-go v1.0.2/go.mod h1:AcFs5f0I+c71bpHlXNNDbOWJiKwjFDtISeXco0L5PKQ= -github.com/rollbar/rollbar-go v1.2.0/go.mod h1:czC86b8U4xdUH7W2C6gomi2jutLm8qK0OtrF5WMvpcc= github.com/rs/cors v1.7.0/go.mod h1:gFx+x8UowdsKA9AchylcLynDq+nNFfI8FkUZdN/jGCU= github.com/rs/cors v1.8.2 h1:KCooALfAYGs415Cwu5ABvv9n9509fSiG5SQJn/AQo4U= github.com/rs/cors v1.8.2/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU= @@ -2250,15 +2026,12 @@ github.com/ryanrolds/sqlclosecheck v0.3.0/go.mod h1:1gREqxyTGR3lVtpngyFo3hZAgk0K 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/safchain/ethtool v0.0.0-20200218184317-f459e2d13664/go.mod h1:Z0q5wiBQGYcxhMZ6gUqHn6pYNLypFAvaL3UvgZLR0U4= github.com/sagikazarmark/crypt v0.6.0/go.mod h1:U8+INwJo3nBv1m6A/8OBXAq7Jnpspk5AxSgDyEQcea8= github.com/sagikazarmark/crypt v0.8.0/go.mod h1:TmKwZAo97S4Fy4sfMH/HX/cQP5D+ijra2NyLpNNmttY= -github.com/samuel/go-zookeeper v0.0.0-20180130194729-c4fab1ac1bec/go.mod h1:gi+0XIa01GRL2eRQVjQkKGqKF3SF9vZR/HnPullcV2E= github.com/samuel/go-zookeeper v0.0.0-20190923202752-2cc03de413da/go.mod h1:gi+0XIa01GRL2eRQVjQkKGqKF3SF9vZR/HnPullcV2E= github.com/sanity-io/litter v1.2.0/go.mod h1:JF6pZUFgu2Q0sBZ+HSV35P8TVPI1TTzEwyu9FXAw2W4= github.com/sanposhiho/wastedassign v0.1.3/go.mod h1:LGpq5Hsv74QaqM47WtIsRSF/ik9kqk07kchgv66tLVE= github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0= -github.com/satori/go.uuid v1.2.1-0.20181028125025-b2ce2384e17b/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0= github.com/scaleway/scaleway-sdk-go v1.0.0-beta.9 h1:0roa6gXKgyta64uqh52AQG3wzZXH21unn+ltzQSXML0= github.com/scaleway/scaleway-sdk-go v1.0.0-beta.9/go.mod h1:fCa7OJZ/9DRTnOKmxvT6pn+LPWUptQAmHF/SBJUGEcg= github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529 h1:nn5Wsu0esKSJiIVhscUtVbo7ada43DJhG55ua/hjS5I= @@ -2272,28 +2045,21 @@ github.com/securego/gosec v0.0.0-20200203094520-d13bb6d2420c/go.mod h1:gp0gaHj0W github.com/securego/gosec/v2 v2.6.1/go.mod h1:I76p3NTHBXsGhybUW+cEQ692q2Vp+A0Z6ZLzDIZy+Ao= github.com/segmentio/asm v1.2.0 h1:9BQrFxC+YOHJlTlHGkTrFWf59nbL3XnCoFLTwDCI7ys= github.com/segmentio/asm v1.2.0/go.mod h1:BqMnlJP91P8d+4ibuonYZw9mfnzI9HfxselHZr5aAcs= -github.com/sercand/kuberesolver v2.4.0+incompatible h1:WE2OlRf6wjLxHwNkkFLQGaZcVLEXjMjBPjjEU5vksH8= -github.com/sercand/kuberesolver v2.4.0+incompatible/go.mod h1:lWF3GL0xptCB/vCiJPl/ZshwPsX/n4Y7u0CW9E7aQIQ= github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo= github.com/shazow/go-diff v0.0.0-20160112020656-b6b7b6733b8c/go.mod h1:/PevMnwAxekIXwN8qQyfc5gl2NlkB3CQlkizAbOkeBs= -github.com/shirou/gopsutil v2.20.9+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA= github.com/shirou/gopsutil/v3 v3.21.1/go.mod h1:igHnfak0qnw1biGeI2qKQvu0ZkwvEkUcCLlYhZzdr/4= -github.com/shirou/gopsutil/v3 v3.21.9/go.mod h1:YWp/H8Qs5fVmf17v7JNZzA0mPJ+mS2e9JdiUF9LlKzQ= github.com/shirou/gopsutil/v3 v3.22.2/go.mod h1:WapW1AOOPlHyXr+yOyw3uYx36enocrtSoSBy0L5vUHY= github.com/shirou/gopsutil/v3 v3.22.6/go.mod h1:EdIubSnZhbAvBS1yJ7Xi+AShB/hxwLHOMz4MCYz7yMs= github.com/shirou/gopsutil/v3 v3.22.10 h1:4KMHdfBRYXGF9skjDWiL4RA2N+E8dRdodU/bOZpPoVg= github.com/shirou/gopsutil/v3 v3.22.10/go.mod h1:QNza6r4YQoydyCfo6rH0blGfKahgibh4dQmV5xdFkQk= github.com/shoenig/test v0.4.3 h1:3+CjrpqCwtL08S0wZQilu9WWR/S2CdsLKhHjbJqPj/I= github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24/go.mod h1:M+9NzErvs504Cn4c5DxATwIqPbtswREoFCre64PpcG4= -github.com/shopspring/decimal v0.0.0-20200105231215-408a2507e114/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o= github.com/shopspring/decimal v1.2.0/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o= github.com/shopspring/decimal v1.3.1 h1:2Usl1nmF/WZucqkFZhnfFYxxxu8LG21F6nPQBE5gKV8= github.com/shopspring/decimal v1.3.1/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o= github.com/shurcooL/go v0.0.0-20180423040247-9e1955d9fb6e/go.mod h1:TDJrrUr11Vxrven61rcy3hJMUqaf/CLWYhHNPmT14Lk= github.com/shurcooL/go-goon v0.0.0-20170922171312-37c2f522c041/go.mod h1:N5mDOmsrJOB+vfqUK+7DmDyjhSLIIBnXo9lvZJj3MWQ= -github.com/shurcooL/httpfs v0.0.0-20190707220628-8d4bc4ba7749/go.mod h1:ZY1cvUeJuFPAdZ/B6v7RHavJWZn2YPVFQ1OSXhCGOkg= github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= -github.com/shurcooL/vfsgen v0.0.0-20200824052919-0d455de96546/go.mod h1:TrYk7fJVaAttu97ZZKrO9UbRa8izdowaMIZcxYMbVaw= github.com/signalfx/com_signalfx_metrics_protobuf v0.0.3 h1:32k2QLgsKhcEs55q4REPKyIadvid5FPy2+VMgvbmKJ0= github.com/signalfx/com_signalfx_metrics_protobuf v0.0.3/go.mod h1:gJrXWi7wSGXfiC7+VheQaz+ypdCt5SmZNL+BRxUe7y4= github.com/signalfx/gohistogram v0.0.0-20160107210732-1ccfd2ff5083 h1:WsShHmu12ZztYPfh9b+I+VjYD1o8iOHhB67WZCMEEE8= @@ -2320,7 +2086,6 @@ github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0 github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d h1:zE9ykElWQ6/NYmHa3jpm/yHnI4xSofP+UP6SpjHcSeM= github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= -github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= github.com/smartystreets/goconvey v1.6.4 h1:fv0U8FUIMPNf1L9lnHLvLhgicrIVChEkdzIKYqbNC9s= github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= github.com/snowflakedb/gosnowflake v1.6.15 h1:P8ddNHa+suNqJtjkgx03PUXge5HkxP/aOcGqcPoPv9g= @@ -2329,12 +2094,8 @@ github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4k github.com/soheilhy/cmux v0.1.5 h1:jjzc5WVemNEDTLwv9tlmemhC73tI08BNOIGwBOo10Js= github.com/soheilhy/cmux v0.1.5/go.mod h1:T7TcVDs9LWfQgPlPsdngu6I6QIoyIFZDDC6sNE1GqG0= github.com/sonatard/noctx v0.0.1/go.mod h1:9D2D/EoULe8Yy2joDHJj7bv3sZoq9AaSb8B4lqBjiZI= -github.com/soniah/gosnmp v1.25.0/go.mod h1:8YvfZxH388NIIw2A+X5z2Oh97VcNhtmxDLt5QeUzVuQ= github.com/sony/gobreaker v0.4.1/go.mod h1:ZKptC7FHNvhBz7dN2LGjPVBz2sZJmc0/PkyDJOjmxWY= -github.com/sony/gobreaker v0.5.0 h1:dRCvqm0P490vZPmy7ppEk2qCnCieBooFJ+YoXGYB+yg= -github.com/sony/gobreaker v0.5.0/go.mod h1:ZKptC7FHNvhBz7dN2LGjPVBz2sZJmc0/PkyDJOjmxWY= github.com/sourcegraph/go-diff v0.6.1/go.mod h1:iBszgVvyxdc8SFZ7gm69go2KDdt3ag071iBaWPF6cjs= -github.com/soveran/redisurl v0.0.0-20180322091936-eb325bc7a4b8/go.mod h1:FVJ8jbHu7QrNFs3bZEsv/L5JjearIAY9N0oXh2wk+6Y= github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= github.com/spaolacci/murmur3 v1.1.0 h1:7c1g84S4BPRrfL5Xrdp6fOJ206sU9y293DDHaoy0bLI= github.com/spaolacci/murmur3 v1.1.0/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= @@ -2349,7 +2110,6 @@ github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkU github.com/spf13/cast v1.3.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= github.com/spf13/cast v1.5.0 h1:rj3WzYc11XZaIZMPKmwP96zkFEnnAmV8s6XbB2aY32w= github.com/spf13/cast v1.5.0/go.mod h1:SpXXQ5YoyJw6s3/6cMTQuxvgRl3PCJiyaX9p6b155UU= -github.com/spf13/cobra v0.0.2/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ= github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ= github.com/spf13/cobra v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU= github.com/spf13/cobra v0.0.7/go.mod h1:/6GTrnGXV9HjY+aR4k0oJ5tcvakLuG6EuKReYlHNrgE= @@ -2378,7 +2138,6 @@ github.com/spf13/viper v1.14.0 h1:Rg7d3Lo706X9tHsJMUjdiwMpHB7W8WnSVOssIY+JElU= github.com/spf13/viper v1.14.0/go.mod h1:WT//axPky3FdvXHzGw33dNdXXXfFQqmEalje+egj8As= github.com/ssgreg/nlreturn/v2 v2.1.0/go.mod h1:E/iiPB78hV7Szg2YfRgyIrk1AD6JVMTRkkxBiELzh2I= github.com/stoewer/go-strcase v1.2.0/go.mod h1:IBiWB2sKIp3wVVQ3Y035++gc+knqhUQag1KpM8ahLw8= -github.com/streadway/amqp v0.0.0-20180528204448-e5adc2ada8b8/go.mod h1:1WNBiOZtZQLpVAyu0iTduoJL9hEsMloAK5XWrtW0xdY= github.com/streadway/amqp v0.0.0-20190404075320-75d898a42a94/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= github.com/streadway/amqp v0.0.0-20190827072141-edfb9018d271/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= github.com/streadway/amqp v1.0.0/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= @@ -2390,7 +2149,6 @@ github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoH github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= github.com/stretchr/objx v0.5.0 h1:1zr/of2m5FGMsad5YfcqgdqdWrIhu+EBEJRhR1U7z/c= github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= -github.com/stretchr/testify v0.0.0-20151208002404-e3a8ff8ce365/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v0.0.0-20161117074351-18a02ba4a312/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.1.4/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= @@ -2413,25 +2171,19 @@ github.com/subosito/gotenv v1.4.1/go.mod h1:ayKnFf/c6rvx/2iiLrJUk1e6plDbT3edrFNG github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635 h1:kdXcSzyDtseVEc4yCz2qF8ZrQvIDBJLl4S1c3GCXmoI= github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww= github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7/go.mod h1:q4W45IWZaF22tdD+VEXcAWRA037jwmWEB5VWYORlTpc= -github.com/tbrandon/mbserver v0.0.0-20170611213546-993e1772cc62/go.mod h1:qUzPVlSj2UgxJkVbH0ZwuuiR46U8RBMDT5KLY78Ifpw= 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/tedsuo/ifrit v0.0.0-20191009134036-9a97d0632f00/go.mod h1:eyZnKCc955uh98WQvzOm0dgAeLnf2O0Rz0LPoC5ze+0= github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.553 h1:RB8GWKSifv5QdBQUUWfzCo06FU4mmqH1VG7dTWMm5nQ= github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.553/go.mod h1:7sCQWVkxcsR38nffDW057DRGk8mUjK1Ing/EFOK8s8Y= github.com/testcontainers/testcontainers-go v0.15.0 h1:3Ex7PUGFv0b2bBsdOv6R42+SK2qoZnWBd21LvZYhUtQ= github.com/tetafro/godot v1.4.4/go.mod h1:FVDd4JuKliW3UgjswZfJfHq4vAx0bD/Jd5brJjGeaz4= github.com/tg123/go-htpasswd v1.2.0 h1:UKp34m9H467/xklxUxU15wKRru7fwXoTojtxg25ITF0= github.com/tg123/go-htpasswd v1.2.0/go.mod h1:h7IzlfpvIWnVJhNZ0nQ9HaFxHb7pn5uFJYLlEUJa2sM= -github.com/thanos-io/thanos v0.28.0 h1:g0LByBE0ANA30/t/a2C/mceYhO3VtIPQFoxCsqrYM9I= -github.com/thanos-io/thanos v0.28.0/go.mod h1:pqjpOBxOCME9Yn1QztV8bP9C4rkhWvWtyyavdBZ8lDk= github.com/theupdateframework/go-tuf v0.3.0 h1:od2sc5+BSkKZhmUG2o2rmruy0BGSmhrbDhCnpxh87X8= github.com/theupdateframework/go-tuf v0.3.0/go.mod h1:E5XP0wXitrFUHe4b8cUcAAdxBW4LbfnqF4WXXGLgWNo= -github.com/tidwall/gjson v1.6.0/go.mod h1:P256ACg0Mn+j1RXIDXoss50DeIABTYK1PULOJHhxOls= github.com/tidwall/gjson v1.10.2/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk= github.com/tidwall/gjson v1.14.3 h1:9jvXn7olKEHU1S9vwoMGliaT8jq1vJ7IH/n9zD9Dnlw= github.com/tidwall/gjson v1.14.3/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk= -github.com/tidwall/match v1.0.1/go.mod h1:LujAq0jyVjBy028G1WhWfIzbpQfMO8bBZ6Tyb0+pL9E= github.com/tidwall/match v1.1.1 h1:+Ho715JplO36QYgwN9PGYNhgZvoUSc9X2c80KVTi+GA= github.com/tidwall/match v1.1.1/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM= github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk= @@ -2460,10 +2212,8 @@ github.com/tomarrell/wrapcheck v0.0.0-20201130113247-1683564d9756/go.mod h1:yiFB github.com/tommy-muehle/go-mnd/v2 v2.3.1/go.mod h1:WsUAkMJMYww6l/ufffCD3m+P7LEvr8TnZn9lwVDlgzw= github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM= github.com/uber/jaeger-client-go v2.25.0+incompatible/go.mod h1:WVhlPFC8FDjOFMMWRy2pZqQJSXxYSwNYOkTr/Z6d3Kk= -github.com/uber/jaeger-client-go v2.28.0+incompatible/go.mod h1:WVhlPFC8FDjOFMMWRy2pZqQJSXxYSwNYOkTr/Z6d3Kk= github.com/uber/jaeger-client-go v2.30.0+incompatible h1:D6wyKGCecFaSRUpo8lCVbaOOb6ThwMmTEbhRwtKR97o= github.com/uber/jaeger-client-go v2.30.0+incompatible/go.mod h1:WVhlPFC8FDjOFMMWRy2pZqQJSXxYSwNYOkTr/Z6d3Kk= -github.com/uber/jaeger-lib v2.2.0+incompatible/go.mod h1:ComeNDZlWwrWnDv8aPp0Ba6+uUTzImX/AauajbLI56U= github.com/uber/jaeger-lib v2.4.0+incompatible/go.mod h1:ComeNDZlWwrWnDv8aPp0Ba6+uUTzImX/AauajbLI56U= github.com/uber/jaeger-lib v2.4.1+incompatible h1:td4jdvLcExb4cBISKIpHuGoVXh+dVKhn2Um6rjCsSsg= github.com/uber/jaeger-lib v2.4.1+incompatible/go.mod h1:ComeNDZlWwrWnDv8aPp0Ba6+uUTzImX/AauajbLI56U= @@ -2471,11 +2221,8 @@ github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGr github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0= github.com/ultraware/funlen v0.0.3/go.mod h1:Dp4UiAus7Wdb9KUZsYWZEWiRzGuM2kXM1lPbfaF6xhA= github.com/ultraware/whitespace v0.0.4/go.mod h1:aVMh/gQve5Maj9hQ/hg+F75lr/X5A89uZnzAmWSineA= -github.com/unrolled/secure v1.0.1/go.mod h1:R6rugAuzh4TQpbFAq69oqZggyBQxFRFQIewtz5z7Jsc= github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA= -github.com/urfave/cli v1.21.0/go.mod h1:lxDj6qX9Q6lWQxIrbrT0nwecwUtRnhVZAJjJZrVUZZQ= github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= -github.com/urfave/cli/v2 v2.2.0/go.mod h1:SE9GqnLQmjVa0iPEY0f1w3ygNIYcIJ0OKPMoW2caLfQ= github.com/urfave/cli/v2 v2.3.0/go.mod h1:LJmUH05zAU44vOAcrfzZQKsZbVcdbOG8rtL3/XcUArI= github.com/uudashr/gocognit v1.0.1/go.mod h1:j44Ayx2KW4+oB6SWMv8KsmHzZrOInQav7D3cQMJ5JUM= github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= @@ -2487,37 +2234,24 @@ github.com/vektah/gqlparser v1.1.2/go.mod h1:1ycwN7Ij5njmMkPPAOaRFY4rET2Enx7IkVv github.com/vektra/mockery v0.0.0-20181123154057-e78b021dcbb5/go.mod h1:ppEjwdhyy7Y31EnHRDm1JkChoC7LXIJ7Ex0VYLWtZtQ= github.com/vincent-petithory/dataurl v1.0.0 h1:cXw+kPto8NLuJtlMsI152irrVw9fRDX8AbShPRpg2CI= github.com/vincent-petithory/dataurl v1.0.0/go.mod h1:FHafX5vmDzyP+1CQATJn7WFKc9CvnvxyvZy6I1MrG/U= -github.com/vishvananda/netlink v0.0.0-20171020171820-b2de5d10e38e/go.mod h1:+SR5DhBJrl6ZM7CoCKvpw5BKroDKQ+PJqOg65H/2ktk= github.com/vishvananda/netlink v1.1.0/go.mod h1:cTgwzPIzzgDAYoQrMm0EdrjRUBkTqKYppBueQtXaqoE= github.com/vishvananda/netlink v1.1.1-0.20210330154013-f5de75959ad5 h1:+UB2BJA852UkGH42H+Oee69djmxS3ANzl2b/JtT1YiA= github.com/vishvananda/netlink v1.1.1-0.20210330154013-f5de75959ad5/go.mod h1:twkDnbuQxJYemMlGd4JFIcuhgX83tXhKS2B/PRMpOho= -github.com/vishvananda/netns v0.0.0-20180720170159-13995c7128cc/go.mod h1:ZjcWmFBXmLKZu9Nxj3WKYEafiSqer2rnvPr0en9UNpI= github.com/vishvananda/netns v0.0.0-20191106174202-0a2b9b5464df/go.mod h1:JP3t17pCcGlemwknint6hfoeCVQrEMVwxRLRjXpq+BU= github.com/vishvananda/netns v0.0.0-20200728191858-db3c7e526aae/go.mod h1:DD4vA1DwXk04H54A1oHXtwZmA0grkVMdPxx/VGLCah0= github.com/vishvananda/netns v0.0.0-20210104183010-2eb08e3e575f h1:p4VB7kIXpOQvVn1ZaTIVp+3vuYAXFe3OJEvjbUYJLaA= github.com/vishvananda/netns v0.0.0-20210104183010-2eb08e3e575f/go.mod h1:DD4vA1DwXk04H54A1oHXtwZmA0grkVMdPxx/VGLCah0= -github.com/vjeantet/grok v1.0.0/go.mod h1:/FWYEVYekkm+2VjcFmO9PufDU5FgXHUz9oy2EGqmQBo= github.com/vmihailenco/msgpack/v4 v4.3.12 h1:07s4sz9IReOgdikxLTKNbBdqDMLsjPKXwvCazn8G65U= github.com/vmihailenco/tagparser v0.1.2 h1:gnjoVuB/kljJ5wICEEOpx98oXMWPLj22G67Vbd1qPqc= github.com/vmware/go-vmware-nsxt v0.0.0-20220328155605-f49a14c1ef5f h1:NbC9yOr5At92seXK+kOr2TzU3mIWzcJOVzZasGSuwoU= github.com/vmware/go-vmware-nsxt v0.0.0-20220328155605-f49a14c1ef5f/go.mod h1:VEqcmf4Sp7gPB7z05QGyKVmn6xWppr7Nz8cVNvyC80o= -github.com/vmware/govmomi v0.19.0/go.mod h1:URlwyTFZX72RmxtxuaFL2Uj3fD1JTvZdx59bHWk6aFU= github.com/vmware/govmomi v0.29.0 h1:SHJQ7DUc4fltFZv16znJNGHR1/XhiDK5iKxm2OqwkuU= github.com/vmware/govmomi v0.29.0/go.mod h1:F7adsVewLNHsW/IIm7ziFURaXDaHEwcc+ym4r3INMdY= github.com/vultr/govultr/v2 v2.17.2 h1:gej/rwr91Puc/tgh+j33p/BLR16UrIPnSr+AIwYWZQs= github.com/vultr/govultr/v2 v2.17.2/go.mod h1:ZFOKGWmgjytfyjeyAdhQlSWwTjh2ig+X49cAp50dzXI= github.com/wadey/gocovmerge v0.0.0-20160331181800-b5bfa59ec0ad/go.mod h1:Hy8o65+MXnS6EwGElrSRjUzQDLXreJlzYLlWiHtt8hM= -github.com/wavefronthq/wavefront-sdk-go v0.9.2/go.mod h1:hQI6y8M9OtTCtc0xdwh+dCER4osxXdEAeCpacjpDZEU= github.com/wavefronthq/wavefront-sdk-go v0.11.0 h1:U9iJ4KFKebf4FB87z182DGiu1OXsRexv8DYCEj48HTA= github.com/wavefronthq/wavefront-sdk-go v0.11.0/go.mod h1:oKJ9Y0y36n+szFm2NiivXI+UubZe3lwfWnN1p+mFNDw= -github.com/weaveworks/common v0.0.0-20221201103051-7c2720a9024d h1:9Z/HiqeGN+LOnmotAMpFEQjuXZ4AGAVFG0rC1laP5Go= -github.com/weaveworks/common v0.0.0-20221201103051-7c2720a9024d/go.mod h1:Fnq3+U51tMkPRMC6Wr7zKGUeFFYX4YjNrNK50iU0fcE= -github.com/weaveworks/promrus v1.2.0 h1:jOLf6pe6/vss4qGHjXmGz4oDJQA+AOCqEL3FvvZGz7M= -github.com/weaveworks/promrus v1.2.0/go.mod h1:SaE82+OJ91yqjrE1rsvBWVzNZKcHYFtMUyS1+Ogs/KA= -github.com/willf/bitset v1.1.11 h1:N7Z7E9UvjW+sGsEl7k/SJrvY2reP1A07MrGuCjIOjRE= -github.com/willf/bloom v2.0.3+incompatible h1:QDacWdqcAUI1MPOwIQZRy9kOR7yxfyEmxX8Wdm2/JPA= -github.com/wvanbergen/kafka v0.0.0-20171203153745-e2edea948ddf/go.mod h1:nxx7XRXbR9ykhnC8lXqQyJS0rfvJGxKyKw/sT1YOttg= -github.com/wvanbergen/kazoo-go v0.0.0-20180202103751-f72d8611297a/go.mod h1:vQQATAGxVK20DC1rRubTJbZDDhhpA4QfU02pMdPxGO4= github.com/xdg-go/pbkdf2 v1.0.0 h1:Su7DPu48wXMwC3bs7MCNG+z4FhcyEuz5dlvchbq0B0c= github.com/xdg-go/pbkdf2 v1.0.0/go.mod h1:jrpuAogTd400dnrH08LKmI/xc1MbPOebTwRqcT5RDeI= github.com/xdg-go/scram v1.0.2/go.mod h1:1WAq6h33pAW+iRreB34OORO2Nf7qel3VV3fjBj+hCSs= @@ -2531,7 +2265,6 @@ github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c/go.mod h1:lB8K/P019DLNhe github.com/xdg/stringprep v0.0.0-20180714160509-73f8eece6fdc/go.mod h1:Jhud4/sHMO4oL310DaZAKk9ZaJ08SJfe+sJh0HrGL1Y= github.com/xdg/stringprep v1.0.0/go.mod h1:Jhud4/sHMO4oL310DaZAKk9ZaJ08SJfe+sJh0HrGL1Y= github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= -github.com/xlab/treeprint v1.1.0/go.mod h1:gj5Gd3gPdKtR1ikdDK6fnFLdmIS0X30kTTuNd/WEJu0= github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q= github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d h1:splanxYIlg+5LfHAM6xpdFEAYOk8iySO56hMFq6uLyA= github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d/go.mod h1:rHwXgn7JulP+udvsHwJoVG1YGAP6VLg4y9I5dyZdqmA= @@ -2540,9 +2273,7 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= -github.com/yuin/goldmark v1.4.1/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= -github.com/yuin/gopher-lua v0.0.0-20180630135845-46796da1b0b4/go.mod h1:aEV29XrmTYFr3CiRxZeGHpkvbwq+prZduBqMaascyCU= github.com/yuin/gopher-lua v0.0.0-20200816102855-ee81675732da/go.mod h1:E1AXubJBdNmFERAOucpDIxNzeGfLzg0mYh+UfMWdChA= github.com/yuin/gopher-lua v0.0.0-20220504180219-658193537a64 h1:5mLPGnFdSsevFRFc9q3yYbBkB6tsm4aCwwQV/j1JQAQ= github.com/yuin/gopher-lua v0.0.0-20220504180219-658193537a64/go.mod h1:GBR0iDaNXjAgGg9zfCvksxSRnQx76gclCIb7kdAd1Pw= @@ -2557,18 +2288,15 @@ go.etcd.io/bbolt v1.3.6/go.mod h1:qXsaaIqmgQH0T+OPdb99Bf+PKfBBQVAdyD6TY9G8XM4= go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738/go.mod h1:dnLIgRNXwCJa5e+c6mIZCrds/GIG4ncV9HhK5PX7jPg= go.etcd.io/etcd/api/v3 v3.5.0/go.mod h1:cbVKeC6lCfl7j/8jBhAK6aIYO9XOjdptoxU/nLQcPvs= go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A= -go.etcd.io/etcd/api/v3 v3.5.5 h1:BX4JIbQ7hl7+jL+g+2j5UAr0o1bctCm6/Ct+ArBGkf0= go.etcd.io/etcd/api/v3 v3.5.5/go.mod h1:KFtNaxGDw4Yx/BA4iPPwevUTAuqcsPxzyX8PHydchN8= go.etcd.io/etcd/client/pkg/v3 v3.5.0/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= -go.etcd.io/etcd/client/pkg/v3 v3.5.5 h1:9S0JUVvmrVl7wCF39iTQthdaaNIiAaQbmK75ogO6GU8= go.etcd.io/etcd/client/pkg/v3 v3.5.5/go.mod h1:ggrwbk069qxpKPq8/FKkQ3Xq9y39kbFR4LnKszpRXeQ= go.etcd.io/etcd/client/v2 v2.305.0/go.mod h1:h9puh54ZTgAKtEbut2oe9P4L/oqKCVB6xsXlzd7alYQ= go.etcd.io/etcd/client/v2 v2.305.4/go.mod h1:Ud+VUwIi9/uQHOMA+4ekToJ12lTxlv0zB/+DHwTGEbU= go.etcd.io/etcd/client/v2 v2.305.5/go.mod h1:zQjKllfqfBVyVStbt4FaosoX2iYd8fV/GRy/PbowgP4= go.etcd.io/etcd/client/v3 v3.5.0/go.mod h1:AIKXXVX/DQXtfTEqBryiLTUXwON+GuvO6Z7lLS/oTh0= go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= -go.etcd.io/etcd/client/v3 v3.5.5 h1:q++2WTJbUgpQu4B6hCuT7VkdwaTP7Qz6Daak3WzbrlI= go.etcd.io/etcd/client/v3 v3.5.5/go.mod h1:aApjR4WGlSumpnJ2kloS75h6aHUmAyaPLjHMxpc7E7c= go.mongodb.org/atlas v0.19.0 h1:gvezG9d0KsSDaExEdTtcGqZHRvvVazzuEcBUpBXxmlg= go.mongodb.org/atlas v0.19.0/go.mod h1:PFk1IGhiGjFXHGVspOK7i1U2nnPjK8wAjYwQf6FoVf4= @@ -2587,7 +2315,6 @@ go.opencensus.io v0.20.1/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk= go.opencensus.io v0.20.2/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk= go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= -go.opencensus.io v0.22.1/go.mod h1:Ap50jQcDJrx6rB6VgeeFPtuPIf3wMRvRfrfYDO6+BmA= 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= @@ -2597,60 +2324,45 @@ go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= go.opentelemetry.io/collector v0.57.2/go.mod h1:9TwWyMRhbFNzaaGLtm/6poWNDJw+etvQMS6Fy+8/8Xs= go.opentelemetry.io/collector v0.64.1/go.mod h1:RxdEKzwxTEhBAgzC4wzyJEwSFgjWU73CHnLjKUKQDyo= -go.opentelemetry.io/collector v0.65.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/component v0.65.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/consumer v0.65.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/exporter/loggingexporter v0.66.1-0.20221202005155-1c54042beb70 h1:/C637mgJY6I0l/KFLXmL9I1foefM53aob20WF2Yh/0Y= -go.opentelemetry.io/collector/exporter/loggingexporter v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:xxkHO5NrxffTV22dhCy3K8XZThGJ1ak7LZ1ctoiJp5k= -go.opentelemetry.io/collector/exporter/otlpexporter v0.66.1-0.20221202005155-1c54042beb70 h1:m9GPfziw/079Xt7/Pfby/5obJhtqR19WKkgQQ/VxNZo= -go.opentelemetry.io/collector/exporter/otlpexporter v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:bCD3trc7OqeEVCgyQdO3kwGgogZMjcMu2tX49SFv1lU= -go.opentelemetry.io/collector/exporter/otlphttpexporter v0.66.1-0.20221202005155-1c54042beb70 h1:7rDNCZS1qfqZxnCLaBWItnX/TweYKC6NyULpelzXl4g= -go.opentelemetry.io/collector/exporter/otlphttpexporter v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:vkFlRP0DDfDfSDVl96Gvy5Ah8L8sMcVAxMZn+0af2ew= -go.opentelemetry.io/collector/extension/ballastextension v0.66.1-0.20221202005155-1c54042beb70 h1:pSGZDMMURLRp7iSxeNlDNDxDgFQJqCYt+Fv7bZxC0JU= -go.opentelemetry.io/collector/extension/ballastextension v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:+YdyZisEXLDE8rhZE7Ce4wli0ZVE164SFN0qg2mPjDU= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/component v0.67.0 h1:GCBRZAqk4yNaT4L1uwlbbwophFHrxYccLZ4Uj1Ifs/M= +go.opentelemetry.io/collector/component v0.67.0/go.mod h1:Txa2lm9oe7xsGQN8u7GdUIrRpAHFIKsTO4Qi3/CSmKk= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/exporter/loggingexporter v0.67.0 h1:09dH5PKxcqKuvxzCVf/j+oEgDYC2LBTgDhaDxujdEO8= +go.opentelemetry.io/collector/exporter/loggingexporter v0.67.0/go.mod h1:8sHgDw0tYsBQTunEBZojJ/L43CyaKVPAvT6eqGlo7xo= +go.opentelemetry.io/collector/exporter/otlpexporter v0.67.0 h1:AxejzV7pxCQjdIsIBLQPbeub2SqbyAsu09TA1BG0jcs= +go.opentelemetry.io/collector/exporter/otlpexporter v0.67.0/go.mod h1:urludZR9ya0gUNf7JXzKL06gX2Anu4BDa6UfCvI61Hw= +go.opentelemetry.io/collector/exporter/otlphttpexporter v0.67.0 h1:B91LfbKa0Khqc8SX2aVd5D2g9aDpeCEJ+jDjNb894mA= +go.opentelemetry.io/collector/exporter/otlphttpexporter v0.67.0/go.mod h1:o7HgN765fAq2cuATsQF2BLhbXiFJ+fK0NIbfcmw2Pa8= +go.opentelemetry.io/collector/extension/ballastextension v0.67.0 h1:fqwrpnAZ/4B5Ghs3vkAZiBnW5b9ro8dbhNa1kw61IXA= +go.opentelemetry.io/collector/extension/ballastextension v0.67.0/go.mod h1:aLm/LXcYAfRW+VWPczi5DKgCcajYPve0Z+fcPLw0w3U= go.opentelemetry.io/collector/extension/zpagesextension v0.64.1/go.mod h1:XenhQAUbOHgqNq5YQ/vQIcDHRcPUaDgZQxDC2qoI4Bc= -go.opentelemetry.io/collector/extension/zpagesextension v0.65.0/go.mod h1:+IPas7AeffG0GMIXhZr8IzpTNhH1Ri/6S/9YFqbLsmQ= -go.opentelemetry.io/collector/extension/zpagesextension v0.66.0/go.mod h1:+IPas7AeffG0GMIXhZr8IzpTNhH1Ri/6S/9YFqbLsmQ= -go.opentelemetry.io/collector/extension/zpagesextension v0.66.1-0.20221202005155-1c54042beb70 h1:+vq59gRJpiAcUshBVxhqhc9aXOc/8Z5wuWlyng5Hfm4= -go.opentelemetry.io/collector/extension/zpagesextension v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tejEMB1pDXsmEeyg7UHB+S++4Lvgtki7N5CVWk5rI4A= -go.opentelemetry.io/collector/featuregate v0.65.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/extension/zpagesextension v0.67.0 h1:TRW8vZwE+/h2vJqqMDmyQO9X0sxcYCSXf5MyXozSLas= +go.opentelemetry.io/collector/extension/zpagesextension v0.67.0/go.mod h1:let/Bt3vTou1cVKhfv+z6FTSk3JaYV11z9C4O/PDPrA= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= go.opentelemetry.io/collector/pdata v0.56.0/go.mod h1:mYcCREWiIJyHss0dbU+GSiz2tmGZ6u09vtfkKTciog4= go.opentelemetry.io/collector/pdata v0.57.2/go.mod h1:RU9I8lwBUxucwOsSYzHEcHi15M9QaX78hgQ2PRdSxV0= go.opentelemetry.io/collector/pdata v0.64.1/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= -go.opentelemetry.io/collector/pdata v0.65.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= go.opentelemetry.io/collector/processor/batchprocessor v0.64.1/go.mod h1:qVl0+aYokPfiq5y+JVAvlII2rrUFBDEqqiDbTSnax78= -go.opentelemetry.io/collector/processor/batchprocessor v0.65.0/go.mod h1:XhGTsC1B/bq4gpg8IZ/QYBLXkzE4Gw3r7Xu2+ik8A1Q= -go.opentelemetry.io/collector/processor/batchprocessor v0.66.0/go.mod h1:XhGTsC1B/bq4gpg8IZ/QYBLXkzE4Gw3r7Xu2+ik8A1Q= -go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221202005155-1c54042beb70 h1:Y4e8NnVevonnAgmjX9Z7QIMA32yMqHAOnAlh8SzTS8c= -go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:Pi1CsKDQFoDrUP1i3+VdE6s2Xuji7bOGFBgqHK0J32E= -go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.66.1-0.20221202005155-1c54042beb70 h1:l0005D1ERsXKno9Ax5Gr2A8FaysF7n40yer6r5qAMHQ= -go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:9CBysimj8fH0weF6Wu8S8nW7cG/XRanrMU1BWlIXeN4= +go.opentelemetry.io/collector/processor/batchprocessor v0.67.0 h1:Qn4Ytth3q1trwTSAYYTzIRs4SBh9rz0xBou1nZB+Dko= +go.opentelemetry.io/collector/processor/batchprocessor v0.67.0/go.mod h1:+ZXCkUG9tlwbbVLi+PT9DjQ7vz+lfFSQqvW45snLYno= +go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.67.0 h1:m3GK5/lZIznGFzzvSPuQo5jxvEn43efv4VkvPtZwDI8= +go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.67.0/go.mod h1:YYjx8ouKYP6AZJ4f4PQPo8cuzcE8n4atn7gOoB890FQ= go.opentelemetry.io/collector/receiver/otlpreceiver v0.64.1/go.mod h1:4rwNi9SeCKBP9XGLWNRFKPsWUV5NK4iqMvdj2WRMksQ= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.66.1-0.20221202005155-1c54042beb70 h1:KBbbPVDV7o5w857g6ePphdu4MV87jrcQevFYDA1okUk= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:0Py8RNjNiFRH6/F+vM2uptdaw9hMj1FBdv0ySntM2gE= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.67.0 h1:pMluLYSSAH7n8zkPWYkWGY/pALrVxG9rHX8J/WDrcx0= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.67.0/go.mod h1:GIJc0eu4N2oJB420N3NhSFJ1IhAgCwvlTCMGWxKhXgg= go.opentelemetry.io/collector/semconv v0.56.0/go.mod h1:EH1wbDvTyqKpKBBpoMIe0KQk2plCcFS66Mo17WtR7CQ= go.opentelemetry.io/collector/semconv v0.57.2/go.mod h1:84YnUjmm+nhGu4YTDLnHCbxnL74ooWpismPG79tFD7w= go.opentelemetry.io/collector/semconv v0.64.1/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= -go.opentelemetry.io/collector/semconv v0.65.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= -go.opentelemetry.io/collector/semconv v0.66.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 h1:Q5L9Urod3c8as6ZYaoaqBjarx/HXxsxy34DFZIU2fO4= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector/semconv v0.67.0 h1:zLAvcQa6Kgow52FFLrmk7/9ZVtEYyA73+xDtCcFG78Q= +go.opentelemetry.io/collector/semconv v0.67.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.33.0/go.mod h1:y/SlJpJQPd2UzfBCj0E9Flk9FDCtTyqUmaCB41qFrWI= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4 h1:PRXhsszxTt5bbPriTjmaweWUsAnJYeWBhUMLRetUgBU= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4/go.mod h1:05eWWy6ZWzmpeImD3UowLTB3VjDMU1yxQ+ENuVWDM3c= @@ -2662,53 +2374,31 @@ go.opentelemetry.io/contrib/propagators/b3 v1.11.1/go.mod h1:ECIveyMXgnl4gorxFcA go.opentelemetry.io/contrib/zpages v0.33.0/go.mod h1:ddmD63NkBVE29GucaBBCR8/b/TRlY+PkpIbF3m2JF7Y= go.opentelemetry.io/contrib/zpages v0.36.4 h1:Z2VK5WsDhWs9VwZ1p0TM5RyusTOgAQfdMMDDQPRnlmY= go.opentelemetry.io/contrib/zpages v0.36.4/go.mod h1:h1gnOu0cOfDGEncNgLsjQ5H/9eAzt9LXsa1WvH7I5KU= -go.opentelemetry.io/otel v1.0.0-RC1/go.mod h1:x9tRa9HK4hSSq7jf2TKbqFbtt58/TGk0f9XiEYISI1I= -go.opentelemetry.io/otel v1.0.0-RC3/go.mod h1:Ka5j3ua8tZs4Rkq4Ex3hwgBgOchyPVq5S6P2lz//nKQ= go.opentelemetry.io/otel v1.8.0/go.mod h1:2pkj+iMj0o03Y+cW6/m8Y4WkRdYN3AvCXCnzRMp9yvM= go.opentelemetry.io/otel v1.9.0/go.mod h1:np4EoPGzoPs3O67xUVNoPPcmSvsfOxNlNA4F4AC+0Eo= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= -go.opentelemetry.io/otel/exporters/otlp/otlpmetric v0.22.0/go.mod h1:gIp6+vQxqmh6Vd/mucqnsaFpOuVycQAS/BBXMKzJk0w= -go.opentelemetry.io/otel/exporters/otlp/otlpmetric v0.23.0/go.mod h1:pe9oOWRaZyapdajWCn64fnl76v3cmTEmNBgh7MkKvwE= -go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v0.23.0/go.mod h1:aSP5oMNaAfOYq+sRydHANZ0vBYLyZR/3lR9pru9aPLk= -go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v0.22.0/go.mod h1:FX3Hvv/Hwb4WtlrAvco4QCsfxsaqg/UoYA6WFCnT1Ro= go.opentelemetry.io/otel/exporters/prometheus v0.31.0/go.mod h1:QarXIB8L79IwIPoNgG3A6zNvBgVmcppeFogV1d8612s= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= go.opentelemetry.io/otel/exporters/prometheus v0.33.0/go.mod h1:ZSmYfKdYWEdSDBB4njLBIwTf4AU2JNsH3n2quVQDebI= -go.opentelemetry.io/otel/internal/metric v0.22.0/go.mod h1:7qVuMihW/ktMonEfOvBXuh6tfMvvEyoIDgeJNRloYbQ= -go.opentelemetry.io/otel/internal/metric v0.23.0/go.mod h1:z+RPiDJe30YnCrOhFGivwBS+DU1JU/PiLKkk4re2DNY= -go.opentelemetry.io/otel/metric v0.22.0/go.mod h1:KcsUkBiYGW003DJ+ugd2aqIRIfjabD9jeOUXqsAtrq0= -go.opentelemetry.io/otel/metric v0.23.0/go.mod h1:G/Nn9InyNnIv7J6YVkQfpc0JCfKBNJaERBGw08nqmVQ= go.opentelemetry.io/otel/metric v0.31.0/go.mod h1:ohmwj9KTSIeBnDBm/ZwH2PSZxZzoOaG2xZeekTRzL5A= go.opentelemetry.io/otel/metric v0.33.0 h1:xQAyl7uGEYvrLAiV/09iTJlp1pZnQ9Wl793qbVvED1E= go.opentelemetry.io/otel/metric v0.33.0/go.mod h1:QlTYc+EnYNq/M2mNk1qDDMRLpqCOj2f/r5c7Fd5FYaI= -go.opentelemetry.io/otel/oteltest v1.0.0-RC1/go.mod h1:+eoIG0gdEOaPNftuy1YScLr1Gb4mL/9lpDkZ0JjMRq4= -go.opentelemetry.io/otel/sdk v1.0.0-RC1/go.mod h1:kj6yPn7Pgt5ByRuwesbaWcRLA+V7BSDg3Hf8xRvsvf8= -go.opentelemetry.io/otel/sdk v1.0.0-RC3/go.mod h1:78H6hyg2fka0NYT9fqGuFLvly2yCxiBXDJAgLKo/2Us= go.opentelemetry.io/otel/sdk v1.8.0/go.mod h1:uPSfc+yfDH2StDM/Rm35WE8gXSNdvCg023J6HeGNO0c= go.opentelemetry.io/otel/sdk v1.11.1 h1:F7KmQgoHljhUuJyA+9BiU+EkJfyX5nVVF4wyzWZpKxs= go.opentelemetry.io/otel/sdk v1.11.1/go.mod h1:/l3FE4SupHJ12TduVjUkZtlfFqDCQJlOlithYrdktys= -go.opentelemetry.io/otel/sdk/export/metric v0.22.0/go.mod h1:a14rf2CiHSn9xjB6cHuv0HoZGl5C4w2PAgl+Lja1VzU= -go.opentelemetry.io/otel/sdk/export/metric v0.23.0/go.mod h1:SuMiREmKVRIwFKq73zvGTvwFpxb/ZAYkMfyqMoOtDqs= -go.opentelemetry.io/otel/sdk/metric v0.22.0/go.mod h1:LzkI0G0z6KhEagqmzgk3bw/dglE2Tk2OXs455UMcI0s= -go.opentelemetry.io/otel/sdk/metric v0.23.0/go.mod h1:wa0sKK13eeIFW+0OFjcC3S1i7FTRRiLAXe1kjBVbhwg= go.opentelemetry.io/otel/sdk/metric v0.31.0/go.mod h1:fl0SmNnX9mN9xgU6OLYLMBMrNAsaZQi7qBwprwO3abk= go.opentelemetry.io/otel/sdk/metric v0.33.0 h1:oTqyWfksgKoJmbrs2q7O7ahkJzt+Ipekihf8vhpa9qo= go.opentelemetry.io/otel/sdk/metric v0.33.0/go.mod h1:xdypMeA21JBOvjjzDUtD0kzIcHO/SPez+a8HOzJPGp0= -go.opentelemetry.io/otel/trace v1.0.0-RC1/go.mod h1:86UHmyHWFEtWjfWPSbu0+d0Pf9Q6e1U+3ViBOc+NXAg= -go.opentelemetry.io/otel/trace v1.0.0-RC3/go.mod h1:VUt2TUYd8S2/ZRX09ZDFZQwn2RqfMB5MzO17jBojGxo= go.opentelemetry.io/otel/trace v1.8.0/go.mod h1:0Bt3PXY8w+3pheS3hQUt+wow8b1ojPaTBoTCh2zIFI4= go.opentelemetry.io/otel/trace v1.9.0/go.mod h1:2737Q0MuG8q1uILYm2YYVkAyLtOofiTNGg6VODnOiPo= go.opentelemetry.io/otel/trace v1.11.1 h1:ofxdnzsNrGBYXbP7t7zpUK281+go5rF7dvdIZXF8gdQ= go.opentelemetry.io/otel/trace v1.11.1/go.mod h1:f/Q9G7vzk5u91PhbmKbg1Qn0rzH1LJ4vbPHFGkTPtOk= 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.15.0/go.mod h1:H7XAot3MsfNsj7EXtrA2q5xSNQ10UqI405h3+duxN4U= -go.starlark.net v0.0.0-20200901195727-6e684ef5eeee/go.mod h1:f0znQkUKRrkk36XxWbGjMqQM8wGv/xHBVE2qc3B5oFU= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= -go.uber.org/atomic v1.5.1/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= @@ -2740,18 +2430,12 @@ go.uber.org/zap v1.22.0/go.mod h1:H4siCOZOrAolnUPJEkfaSjDqyP+BDS0DdDWzwcgt3+U= go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= -go4.org/intern v0.0.0-20211027215823-ae77deb06f29 h1:UXLjNohABv4S58tHmeuIZDO6e3mHpW2Dx33gaNt03LE= -go4.org/intern v0.0.0-20211027215823-ae77deb06f29/go.mod h1:cS2ma+47FKrLPdXFpr7CuxiTW3eyJbWew4qx0qtQWDA= -go4.org/unsafe/assume-no-moving-gc v0.0.0-20211027215541-db492cf91b37/go.mod h1:FftLjUGFEDu5k8lt0ddY+HcrH/qU/0qk+H8j9/nTl3E= -go4.org/unsafe/assume-no-moving-gc v0.0.0-20220617031537-928513b29760 h1:FyBZqvoA/jbNzuAWLQE2kG820zMAkcilx6BMjGbL/E4= -go4.org/unsafe/assume-no-moving-gc v0.0.0-20220617031537-928513b29760/go.mod h1:FftLjUGFEDu5k8lt0ddY+HcrH/qU/0qk+H8j9/nTl3E= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190228161510-8dd112bcdc25/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190320223903-b7391e95e576/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190404164418-38d8ce5564a5/go.mod h1:WFFai1msRO1wXaEeE5yQxYXgSfI8pQAWXbQop6sCtWE= golang.org/x/crypto v0.0.0-20190411191339-88737f569e3a/go.mod h1:WFFai1msRO1wXaEeE5yQxYXgSfI8pQAWXbQop6sCtWE= golang.org/x/crypto v0.0.0-20190422162423-af44ce270edf/go.mod h1:WFFai1msRO1wXaEeE5yQxYXgSfI8pQAWXbQop6sCtWE= @@ -2763,16 +2447,12 @@ golang.org/x/crypto v0.0.0-20190617133340-57b3e21c3d56/go.mod h1:yigFU9vqHzYiE8U golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/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-20191002192127-34f69633bfdc/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20200204104054-c9f3fb736b72/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200323165209-0ec3e9974c59/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20200414173820-0848c9571904/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200510223506-06a226fb4e37/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20201112155050-0c6587e931a9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= @@ -2794,7 +2474,6 @@ golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4/go.mod h1:IxCIyHEi3zRg3s0 golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= -golang.org/x/crypto v0.0.0-20221012134737-56aed061732a/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.3.0 h1:a06MkbcxBrEFc0w0QIZWXrH/9cCX6KJyWbBOIwAn+7A= golang.org/x/crypto v0.3.0/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4= golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= @@ -2823,7 +2502,6 @@ golang.org/x/image v0.0.0-20200430140353-33d19683fad8/go.mod h1:FeLwcggjj3mMvU+o golang.org/x/image v0.0.0-20200618115811-c13761719519/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= golang.org/x/image v0.0.0-20201208152932-35266b937fa6/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= golang.org/x/image v0.0.0-20210216034530-4410531fe030/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= -golang.org/x/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= 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= @@ -2850,18 +2528,15 @@ golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.5.0/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro= -golang.org/x/mod v0.5.1/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= golang.org/x/mod v0.7.0 h1:LapD9S96VoQRhi/GrNTqeBJFrUjs5UHCAtTlgwA5oZA= golang.org/x/mod v0.7.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= -golang.org/x/net v0.0.0-20170114055629-f2499483f923/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180530234432-1e491301e022/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181005035420-146acd28ed58/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20181106065722-10aee1819953/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -2884,9 +2559,6 @@ golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLL golang.org/x/net v0.0.0-20190921015927-1a5e07d1ff72/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20191002035440-2ec189313ef0/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20191003171128-d98b1b443823/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20191004110552-13f9640d40b9/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20191007182048-72f939374954/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20191112182307-2180aed22343/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= @@ -2906,7 +2578,6 @@ golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81R golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20200813134508-3edf25e44fcc/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= -golang.org/x/net v0.0.0-20200904194848-62affa334b73/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20201010224723-4f7140c49acb/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= @@ -2923,7 +2594,6 @@ golang.org/x/net v0.0.0-20210410081132-afb366fc7cd1/go.mod h1:9tjilg8BloeKEkVJvy golang.org/x/net v0.0.0-20210421230115-4e50805a0758/go.mod h1:72T/g9IO56b78aLF+1Kcs5dz7/ng1VjMUvfKvpfy+jM= golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk= golang.org/x/net v0.0.0-20210503060351-7fd8e65b6420/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20210510120150-4163338589ed/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= 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= @@ -2931,7 +2601,6 @@ golang.org/x/net v0.0.0-20210726213435-c6fcb2dbf985/go.mod h1:9nx3DQGgdP8bBQD5qx 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-20210917221730-978cfadd31cf/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20211216030914-fe4d6282115f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= @@ -2999,7 +2668,6 @@ golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20220929204114-8fcdb60fdcc0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o= golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sys v0.0.0-20170830134202-bb24a47a89ea/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= 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= @@ -3017,7 +2685,6 @@ golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5h golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190321052220-f7bb7a8bee54/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190411185658-b44545bcd369/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190419153524-e8e3143a4f4a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -3032,7 +2699,6 @@ golang.org/x/sys v0.0.0-20190626150813-e07cf5db2756/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20190626221950-04f50cda93cb/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190712062909-fae7ac547cb7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190804053845-51ab0e2deafa/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -3040,7 +2706,6 @@ golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7w 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-20191003212358-c178f38b412c/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-20191010194322-b09406accb47/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -3076,7 +2741,6 @@ golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200728102440-3e129f6d46b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200814200057-3d37ad5750ed/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200826173525-f9321e4c35a6/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200923182605-d9f96fdee20d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -3113,15 +2777,12 @@ golang.org/x/sys v0.0.0-20210816074244-15123e1e1f71/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20210816183151-1e6c022a8912/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210819135213-f52c844e1c1c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210902050250-f475640dd07b/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-20210908233432-aa78b53d3365/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210917161153-d61c044b1678/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/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-20211102061401-a2f17f7b995c/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-20211124211545-fe61309f8881/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211210111614-af8b64212486/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -3159,7 +2820,6 @@ golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuX golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.3.0 h1:qoo4akIqOcDME5bhc/NgxUdovd6BSS2uMsVjB56q1xI= golang.org/x/term v0.3.0/go.mod h1:q750SLmJuPmVoN1blW3UFBPREJfb1KmY3vwxfr+nFDA= -golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= 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= @@ -3179,7 +2839,6 @@ golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxb 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.0.0-20200416051211-89c76fbcd5d1/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/time v0.0.0-20201208040808-7e3f01d25324/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20220609170525-579cf78fd858/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= @@ -3189,7 +2848,6 @@ golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGm golang.org/x/tools v0.0.0-20180525024113-a5b4c53f6e8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20181011042414-1f849cf54d09/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20181112210238-4b1f3b6b1646/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190110163146-51295c7ec13a/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= @@ -3251,7 +2909,6 @@ golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod h1:TB2adYChydJhpapK 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-20200317043434-63da46f3035e/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8= golang.org/x/tools v0.0.0-20200324003944-a576cf524670/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8= golang.org/x/tools v0.0.0-20200329025819-fd4102a86c65/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8= golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8= @@ -3301,7 +2958,6 @@ 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.6-0.20210726203631-07bc1bf47fb2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= -golang.org/x/tools v0.1.9/go.mod h1:nABZi5QlRsZVlzPpHl034qft6wpY4eDcsTt5AaioBiU= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= golang.org/x/tools v0.2.0 h1:G6AHpWxTMGY1KyEYoAQ5WTtIekUUvDNjan3ugu60JvE= golang.org/x/tools v0.2.0/go.mod h1:y4OqIKeOV/fWJetJ8bXPU1sEVniLMIyDAZWeHdV+NTA= @@ -3316,11 +2972,7 @@ golang.org/x/xerrors v0.0.0-20220517211312-f3a8303e98df/go.mod h1:K8+ghG5WaK9qNq golang.org/x/xerrors v0.0.0-20220609144429-65e65417b02f/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8= golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 h1:H2TDz8ibqkAF6YGhCdN3jS9O0/s90v0rJh3X/OLHEUk= golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8= -golang.zx2c4.com/wireguard v0.0.20200121/go.mod h1:P2HsVp8SKwZEufsnezXZA4GRX/T49/HlU7DGuelXsU4= -golang.zx2c4.com/wireguard/wgctrl v0.0.0-20200205215550-e35592f146e4/go.mod h1:UdS9frhv65KTfwxME1xE8+rHYoFpbm36gOud1GhBe9c= gonum.org/v1/gonum v0.0.0-20180816165407-929014505bf4/go.mod h1:Y+Yx5eoAFn32cQvJDxZx5Dpnq+c3wtXuadVZAcxbbBo= -gonum.org/v1/gonum v0.0.0-20190502212712-4a2eb0188cbc/go.mod h1:2ltnJ7xHfj0zHS40VVPYEAAMTa3ZGguvHGBSJeRWqE0= -gonum.org/v1/gonum v0.6.2/go.mod h1:9mxDZsDKxgMAuccQkewq682L+0eCu4dCN2yonUJTCLU= 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.12.0 h1:xKuo6hzt+gMav00meVPUlXwSdoEJP46BR+wdxQEFK2o= @@ -3394,16 +3046,13 @@ google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCID 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-20170818010345-ee236bd376b0/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= -google.golang.org/genproto v0.0.0-20180518175338-11a468237815/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= -google.golang.org/genproto v0.0.0-20181221175505-bd9b4fb69e2f/go.mod h1:7Ep/1NZk928CDR8SjdVbjWNpdIf6nzjE3BTgJDr2Atg= 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-20190530194941-fb225487d101/go.mod h1:z3L6/3dTEVtUr6QSP8miRzeRqwQOioJ9I66odjN4I7s= -google.golang.org/genproto v0.0.0-20190716160619-c506a9f90610/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= 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= @@ -3420,7 +3069,6 @@ google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63/go.mod h1:55QSHmfG 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-20200317114155-1f3552e48f24/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= @@ -3431,7 +3079,6 @@ google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEY 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-20200806141610-86f49bd18e98/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= @@ -3518,9 +3165,7 @@ google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c/go.mod h1:CGI5F/G+ google.golang.org/genproto v0.0.0-20221206210731-b1a01be3a5f6 h1:AGXp12e/9rItf6/4QymU7WsAUwCf+ICW75cuR91nJIc= google.golang.org/genproto v0.0.0-20221206210731-b1a01be3a5f6/go.mod h1:1dOng4TWOomJrDGhpXjfCD35wQC6jnC7HpRmOFRqEV0= google.golang.org/grpc v1.8.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= -google.golang.org/grpc v1.12.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= google.golang.org/grpc v1.14.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= -google.golang.org/grpc v1.16.0/go.mod h1:0JHn/cJsOMiMfNA9+DeHDlAU7KAAB5GDlYFpa9MZMio= google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.0/go.mod h1:chYK+tFQF0nDUGJgXMSgLCQk3phJEuONr2DCgLDdAQM= @@ -3568,7 +3213,6 @@ google.golang.org/grpc v1.50.1/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCD google.golang.org/grpc v1.51.0 h1:E1eGv1FTqoLIdnBCZufiSHgKjlqG6fKFf6pPWtMTh8U= google.golang.org/grpc v1.51.0/go.mod h1:wgNDFcnuBGmxLKI/qn4T+m5BtEBYXJPvibbUPsAIPww= google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw= -google.golang.org/grpc/examples v0.0.0-20210916203835-567da6b86340/go.mod h1:gID3PKrg7pWKntu9Ss6zTLJ0ttC0X9IHgREOCZwbCVU= 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= @@ -3587,7 +3231,6 @@ google.golang.org/protobuf v1.28.1 h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175 google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d/go.mod h1:cuepJuh7vyXfUyUwEgHQXw849cJrilpS5NeIjOWESAw= -gopkg.in/caio/go-tdigest.v2 v2.3.0/go.mod h1:HPfh/CLN8UWDMOC76lqxVeKa5E24ypoVuTj4BLMb9cU= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= @@ -3598,18 +3241,13 @@ gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntN gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= gopkg.in/cheggaaa/pb.v1 v1.0.25/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qStrOgw= gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= -gopkg.in/fatih/pool.v2 v2.0.0/go.mod h1:8xVGeu1/2jr2wm5V9SPuMht2H5AEmf5aFMGSQixtjTY= gopkg.in/fsnotify.v1 v1.2.1/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= -gopkg.in/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4= gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= -gopkg.in/fsnotify/fsnotify.v1 v1.4.7 h1:XNNYLJHt73EyYiCZi6+xjupS9CpvmiDgjPTAjrBlQbo= gopkg.in/fsnotify/fsnotify.v1 v1.4.7/go.mod h1:Fyux9zXlo4rWoMSIzpn9fDAYjalPqJ/K1qJ27s+7ltE= gopkg.in/gcfg.v1 v1.2.3/go.mod h1:yesOnuUOFQAhST5vPY4nbZsb/huCgGGXlipJsBn0b3o= -gopkg.in/gorethink/gorethink.v3 v3.0.5/go.mod h1:+3yIIHJUGMBK+wyPH+iN5TP+88ikFDfZdqTlK3Y9q8I= gopkg.in/inconshreveable/log15.v2 v2.0.0-20180818164646-67afb5ed74ec/go.mod h1:aPpfJ7XW+gOuirDoZ8gHhLh3kZ1B08FtV2bbmy7Jv3s= gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc= gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= -gopkg.in/ini.v1 v1.42.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/ini.v1 v1.51.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/ini.v1 v1.52.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/ini.v1 v1.57.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= @@ -3621,20 +3259,15 @@ gopkg.in/jcmturner/aescts.v1 v1.0.1/go.mod h1:nsR8qBOg+OucoIW+WMhB3GspUQXq9XorLn gopkg.in/jcmturner/dnsutils.v1 v1.0.1/go.mod h1:m3v+5svpVOhtFAP/wSz+yzh4Mc0Fg7eRhxkJMWSIz9Q= gopkg.in/jcmturner/goidentity.v3 v3.0.0/go.mod h1:oG2kH0IvSYNIu80dVAyu/yoefjq1mNfM5bm88whjWx4= gopkg.in/jcmturner/gokrb5.v7 v7.2.3/go.mod h1:l8VISx+WGYp+Fp7KRbsiUuXTTOnxIc3Tuvyavf11/WM= -gopkg.in/jcmturner/gokrb5.v7 v7.5.0/go.mod h1:l8VISx+WGYp+Fp7KRbsiUuXTTOnxIc3Tuvyavf11/WM= gopkg.in/jcmturner/rpc.v1 v1.1.0/go.mod h1:YIdkC4XfD6GXbzje11McwsDuOlZQSb9W4vfLvuNnlv8= -gopkg.in/ldap.v3 v3.1.0/go.mod h1:dQjCc0R0kfyFjIlWNMH1DORwUASZyDxo2Ry1B51dXaQ= -gopkg.in/mgo.v2 v2.0.0-20180705113604-9856a29383ce/go.mod h1:yeKp02qBN3iKW1OzL3MGk2IdtZzaj7SFntXj72NppTA= gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22/go.mod h1:yeKp02qBN3iKW1OzL3MGk2IdtZzaj7SFntXj72NppTA= gopkg.in/natefinch/lumberjack.v2 v2.0.0 h1:1Lc07Kr7qY4U2YPouBjpCLxpiyxIVoxqXgkXLknAOE8= gopkg.in/natefinch/lumberjack.v2 v2.0.0/go.mod h1:l0ndWWf7gzL7RNwBG7wST/UCcT4T24xpD6X8LsfU/+k= -gopkg.in/olivere/elastic.v5 v5.0.70/go.mod h1:FylZT6jQWtfHsicejzOm3jIMVPOAksa80i3o+6qtQRk= gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= gopkg.in/square/go-jose.v2 v2.3.1/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI= gopkg.in/square/go-jose.v2 v2.4.1/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI= gopkg.in/square/go-jose.v2 v2.5.1 h1:7odma5RETjNHWJnR32wx8t+Io4djHE1PqxCFx3iiZ2w= gopkg.in/square/go-jose.v2 v2.5.1/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI= -gopkg.in/telebot.v3 v3.0.0/go.mod h1:7rExV8/0mDDNu9epSrDm/8j22KLaActH1Tbee6YjzWg= gopkg.in/tomb.v1 v1.0.0-20140529071818-c131134a1947/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= @@ -3658,11 +3291,8 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/zorkian/go-datadog-api.v2 v2.30.0 h1:umQdVO0Ytx+kYadhuJNjFtDgIsIEBnKrOTvNuu8ClKI= gopkg.in/zorkian/go-datadog-api.v2 v2.30.0/go.mod h1:kx0CSMRpzEZfx/nFH62GLU4stZjparh/BRpM89t4XCQ= -gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo= -gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw= gotest.tools/v3 v3.0.2/go.mod h1:3SzNCllyD9/Y+b5r9JIKQ474KzkZyqLqEfYqMsX94Bk= gotest.tools/v3 v3.2.0 h1:I0DwBVMGAx26dttAj1BtJLAkVGncrkkUXfJLC4Flt/I= -honnef.co/go/netdb v0.0.0-20150201073656-a416d700ae39/go.mod h1:rbNo0ST5hSazCG4rGfpHrwnwvzP1QX62WbhzD+ghGzs= honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= 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= @@ -3673,12 +3303,9 @@ honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9 honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= honnef.co/go/tools v0.1.1/go.mod h1:NgwopIslSNH47DimFoV78dnkksY2EFtX0ajyb3K/las= honnef.co/go/tools v0.1.2/go.mod h1:NgwopIslSNH47DimFoV78dnkksY2EFtX0ajyb3K/las= -inet.af/netaddr v0.0.0-20211027220019-c74959edd3b6 h1:acCzuUSQ79tGsM/O50VRFySfMm19IoMKL+sZztZkCxw= -inet.af/netaddr v0.0.0-20211027220019-c74959edd3b6/go.mod h1:y3MGhcFMlh0KZPMuXXow8mpjxxAk3yoDNsp4cQz54i8= k8s.io/api v0.21.1/go.mod h1:FstGROTmsSHBarKc8bylzXih8BLNYTiS3TZcsoEDg2s= k8s.io/api v0.25.4 h1:3YO8J4RtmG7elEgaWMb4HgmpS2CfY1QlaOz9nwB+ZSs= k8s.io/api v0.25.4/go.mod h1:IG2+RzyPQLllQxnhzD8KQNEu4c4YvyDTpSMztf4A0OQ= -k8s.io/apimachinery v0.17.1/go.mod h1:b9qmWdKlLuU9EBh+06BtLcSf/Mu89rWL33naRxs1uZg= k8s.io/apimachinery v0.21.1/go.mod h1:jbreFvJo3ov9rj7eWT7+sYiRx+qZuCYXwWT1bcDswPY= k8s.io/apimachinery v0.25.4 h1:CtXsuaitMESSu339tfhVXhQrPET+EiWnIY1rcurKnAc= k8s.io/apimachinery v0.25.4/go.mod h1:jaF9C/iPNM1FuLl7Zuy5b9v+n35HGSh6AQ4HYRkCqwo= @@ -3686,10 +3313,8 @@ k8s.io/client-go v0.21.1/go.mod h1:/kEw4RgW+3xnBGzvp9IWxKSNA+lXn3A7AuH3gdOAzLs= k8s.io/client-go v0.25.4 h1:3RNRDffAkNU56M/a7gUfXaEzdhZlYhoW8dgViGy5fn8= k8s.io/client-go v0.25.4/go.mod h1:8trHCAC83XKY0wsBIpbirZU4NTUpbuhc2JnI7OruGZw= k8s.io/code-generator v0.21.1/go.mod h1:hUlps5+9QaTrKx+jiM4rmq7YmH8wPOIko64uZCHDh6Q= -k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= 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 v0.0.0-20181102134211-b9b56d5dfc92/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk= k8s.io/klog v1.0.0 h1:Pt+yjF5aB1xDSVbau4VsWe+dQNzA0qv1LlXdC2dF6Q8= k8s.io/klog v1.0.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I= k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE= @@ -3697,7 +3322,6 @@ 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 h1:atnLQ121W371wYYFawwYx1aEY2eUfs4l3J72wtgAwV4= k8s.io/klog/v2 v2.80.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= -k8s.io/kube-openapi v0.0.0-20191107075043-30be4d16710a/go.mod h1:1TqjTSzOxsLGIKfj0lK8EeCP7K1iUG65v09OM0/WG5E= k8s.io/kube-openapi v0.0.0-20210305001622-591a79e4bda7/go.mod h1:wXW5VT87nVfh/iLV8FpR2uDvrFyomxbtb1KivDbvPTE= k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1 h1:MQ8BAZPZlWk3S9K4a9NCkIFQtZShWqoha7snGixVgEA= k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1/go.mod h1:C/N6wCaBHeBHkHUesQOQy2/MZqGgMAFPqGsGQLdbZBU= @@ -3707,24 +3331,16 @@ k8s.io/utils v0.0.0-20201110183641-67b214c5f920/go.mod h1:jPW/WVKK9YHAvNhRxK0md/ k8s.io/utils v0.0.0-20211116205334-6203023598ed/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed h1:jAne/RjBTyawwAy0utX5eqigAwz/lQhTmy+Hr/Cpue4= k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= -modernc.org/httpfs v1.0.0/go.mod h1:BSkfoMUcahSijQD5J/Vu4UMOxzmEf5SNRwyXC4PJBEw= -modernc.org/libc v1.3.1/go.mod h1:f8sp9GAfEyGYh3lsRIKtBh/XwACdFvGznxm6GJmQvXk= -modernc.org/mathutil v1.1.1/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E= -modernc.org/memory v1.0.1/go.mod h1:NSjvC08+g3MLOpcAxQbdctcThAEX4YlJ20WWHYEhvRg= -modernc.org/sqlite v1.7.4/go.mod h1:xse4RHCm8Fzw0COf5SJqAyiDrVeDwAQthAS1V/woNIA= -modernc.org/tcl v1.4.1/go.mod h1:8YCvzidU9SIwkz7RZwlCWK61mhV8X9UwfkRDRp7y5e0= mvdan.cc/gofumpt v0.1.0/go.mod h1:yXG1r1WqZVKWbVRtBWKWX9+CxGYfA51nSomhM0woR48= mvdan.cc/interfacer v0.0.0-20180901003855-c20040233aed/go.mod h1:Xkxe497xwlCKkIaQYRfC7CSLworTXY9RMqwhhCm+8Nc= mvdan.cc/lint v0.0.0-20170908181259-adc824a0674b/go.mod h1:2odslEg/xrtNQqCYg2/jCoyKnw3vv5biOc3JnIcYfL4= mvdan.cc/unparam v0.0.0-20210104141923-aac4ce9116a7/go.mod h1:hBpJkZE8H/sb+VRFvw2+rBpHNsTBcvSpk61hr8mzXZE= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= -rsc.io/goversion v1.2.0/go.mod h1:Eih9y/uIBS3ulggl7KNJ09xGSLcuNaLgmvvqa07sgfo= rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4= 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/json v0.0.0-20220713155537-f223a00ba0e2 h1:iXTIw73aPyC+oRdyqqvVJuloN1p0AC/kzH07hu3NE+k= sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0= -sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e/go.mod h1:wWxsB5ozmmv/SG7nM11ayaAW51xMvak/t1r0CSlcokI= sigs.k8s.io/structured-merge-diff/v4 v4.0.2/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw= sigs.k8s.io/structured-merge-diff/v4 v4.1.0/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw= sigs.k8s.io/structured-merge-diff/v4 v4.2.3 h1:PRbqxJClWWYMNV1dhaG4NsibJbArud9kFxnAMREiWFE= diff --git a/cmd/mdatagen/go.mod b/cmd/mdatagen/go.mod index 91aa7a8b5c93b..e867953058aa7 100644 --- a/cmd/mdatagen/go.mod +++ b/cmd/mdatagen/go.mod @@ -4,10 +4,11 @@ go 1.18 require ( github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector v0.67.0 + go.opentelemetry.io/collector/component v0.67.0 + go.opentelemetry.io/collector/confmap v0.67.0 + go.opentelemetry.io/collector/pdata v1.0.0-rc1 + go.opentelemetry.io/collector/semconv v0.67.0 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.24.0 ) @@ -28,15 +29,14 @@ require ( github.com/pelletier/go-toml v1.9.4 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rogpeppe/go-internal v1.8.0 // indirect - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 // indirect - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/consumer v0.67.0 // indirect + go.opentelemetry.io/collector/featuregate v0.67.0 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect go.uber.org/atomic v1.10.0 // indirect golang.org/x/net v0.0.0-20220722155237-a158d28d115b // indirect - golang.org/x/sys v0.2.0 // indirect + golang.org/x/sys v0.3.0 // indirect golang.org/x/text v0.4.0 // indirect google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa // indirect google.golang.org/grpc v1.51.0 // indirect diff --git a/cmd/mdatagen/go.sum b/cmd/mdatagen/go.sum index d7950b761c4de..6845a80d167ce 100644 --- a/cmd/mdatagen/go.sum +++ b/cmd/mdatagen/go.sum @@ -267,20 +267,20 @@ github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1 go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A= go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 h1:Q5L9Urod3c8as6ZYaoaqBjarx/HXxsxy34DFZIU2fO4= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/component v0.67.0 h1:GCBRZAqk4yNaT4L1uwlbbwophFHrxYccLZ4Uj1Ifs/M= +go.opentelemetry.io/collector/component v0.67.0/go.mod h1:Txa2lm9oe7xsGQN8u7GdUIrRpAHFIKsTO4Qi3/CSmKk= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= +go.opentelemetry.io/collector/semconv v0.67.0 h1:zLAvcQa6Kgow52FFLrmk7/9ZVtEYyA73+xDtCcFG78Q= +go.opentelemetry.io/collector/semconv v0.67.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/metric v0.33.0 h1:xQAyl7uGEYvrLAiV/09iTJlp1pZnQ9Wl793qbVvED1E= @@ -374,8 +374,8 @@ golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57/go.mod h1:h1NjWce9XRLGQEsW7w 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-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.2.0 h1:ljd4t30dBnAvMZaQCevtY0xLLD0A+bRZXbgLMLU1F/A= -golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.3.0 h1:w8ZOecv6NaNa/zC8944JTU3vz4u6Lagfk4RPQxv92NQ= +golang.org/x/sys v0.3.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.1-0.20181227161524-e6919f6577db/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= diff --git a/cmd/mdatagen/internal/metadata/generated_metrics.go b/cmd/mdatagen/internal/metadata/generated_metrics.go index d7618b02ead56..ac6325dab4da4 100644 --- a/cmd/mdatagen/internal/metadata/generated_metrics.go +++ b/cmd/mdatagen/internal/metadata/generated_metrics.go @@ -9,6 +9,7 @@ import ( "go.opentelemetry.io/collector/confmap" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" + "go.opentelemetry.io/collector/receiver" conventions "go.opentelemetry.io/collector/semconv/v1.9.0" ) @@ -212,7 +213,7 @@ func WithStartTime(startTime pcommon.Timestamp) metricBuilderOption { } } -func NewMetricsBuilder(ms MetricsSettings, settings component.ReceiverCreateSettings, options ...metricBuilderOption) *MetricsBuilder { +func NewMetricsBuilder(ms MetricsSettings, settings receiver.CreateSettings, options ...metricBuilderOption) *MetricsBuilder { if ms.OptionalMetric.Enabled { settings.Logger.Warn("[WARNING] `optional.metric` should not be enabled: This metric is deprecated and will be removed soon.") } diff --git a/cmd/mdatagen/internal/metadata/generated_metrics_test.go b/cmd/mdatagen/internal/metadata/generated_metrics_test.go index 7debc8ee38e89..a6481194eec32 100644 --- a/cmd/mdatagen/internal/metadata/generated_metrics_test.go +++ b/cmd/mdatagen/internal/metadata/generated_metrics_test.go @@ -7,9 +7,9 @@ import ( "testing" "github.com/stretchr/testify/assert" - "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" + "go.opentelemetry.io/collector/receiver/receivertest" "go.uber.org/zap" "go.uber.org/zap/zaptest/observer" ) @@ -17,7 +17,7 @@ import ( func TestDefaultMetrics(t *testing.T) { start := pcommon.Timestamp(1_000_000_000) ts := pcommon.Timestamp(1_000_001_000) - mb := NewMetricsBuilder(DefaultMetricsSettings(), componenttest.NewNopReceiverCreateSettings(), WithStartTime(start)) + mb := NewMetricsBuilder(DefaultMetricsSettings(), receivertest.NewNopCreateSettings(), WithStartTime(start)) enabledMetrics := make(map[string]bool) enabledMetrics["default.metric"] = true @@ -48,7 +48,7 @@ func TestAllMetrics(t *testing.T) { OptionalMetric: MetricSettings{Enabled: true}, } observedZapCore, observedLogs := observer.New(zap.WarnLevel) - settings := componenttest.NewNopReceiverCreateSettings() + settings := receivertest.NewNopCreateSettings() settings.Logger = zap.New(observedZapCore) mb := NewMetricsBuilder(metricsSettings, settings, WithStartTime(start)) @@ -131,7 +131,7 @@ func TestNoMetrics(t *testing.T) { OptionalMetric: MetricSettings{Enabled: false}, } observedZapCore, observedLogs := observer.New(zap.WarnLevel) - settings := componenttest.NewNopReceiverCreateSettings() + settings := receivertest.NewNopCreateSettings() settings.Logger = zap.New(observedZapCore) mb := NewMetricsBuilder(metricsSettings, settings, WithStartTime(start)) diff --git a/cmd/mdatagen/main_test.go b/cmd/mdatagen/main_test.go index e35c12409143c..14df37d3bdbb4 100644 --- a/cmd/mdatagen/main_test.go +++ b/cmd/mdatagen/main_test.go @@ -20,7 +20,7 @@ import ( "testing" "github.com/stretchr/testify/require" - "go.opentelemetry.io/collector/component/componenttest" + "go.opentelemetry.io/collector/receiver/receivertest" md "github.com/open-telemetry/opentelemetry-collector-contrib/cmd/mdatagen/internal/metadata" ) @@ -100,7 +100,7 @@ func Test_run(t *testing.T) { // TestGenerated verifies that the internal/metadata API is generated correctly. func TestGenerated(t *testing.T) { - mb := md.NewMetricsBuilder(md.DefaultMetricsSettings(), componenttest.NewNopReceiverCreateSettings()) + mb := md.NewMetricsBuilder(md.DefaultMetricsSettings(), receivertest.NewNopCreateSettings()) m := mb.Emit() require.Equal(t, 0, m.ResourceMetrics().Len()) } diff --git a/cmd/mdatagen/templates/metrics.go.tmpl b/cmd/mdatagen/templates/metrics.go.tmpl index ad7046b445441..3116f616796f6 100644 --- a/cmd/mdatagen/templates/metrics.go.tmpl +++ b/cmd/mdatagen/templates/metrics.go.tmpl @@ -13,6 +13,7 @@ import ( "go.opentelemetry.io/collector/confmap" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" + "go.opentelemetry.io/collector/receiver" {{- if .SemConvVersion }} conventions "go.opentelemetry.io/collector/semconv/v{{ .SemConvVersion }}" {{- end }} @@ -184,7 +185,7 @@ func WithStartTime(startTime pcommon.Timestamp) metricBuilderOption { } } -func NewMetricsBuilder(ms MetricsSettings, settings component.ReceiverCreateSettings, options ...metricBuilderOption) *MetricsBuilder { +func NewMetricsBuilder(ms MetricsSettings, settings receiver.CreateSettings, options ...metricBuilderOption) *MetricsBuilder { {{- range $name, $metric := .Metrics }} {{- if $metric.Warnings.IfEnabled }} if ms.{{ $name.Render }}.Enabled { diff --git a/cmd/mdatagen/templates/metrics_test.go.tmpl b/cmd/mdatagen/templates/metrics_test.go.tmpl index 5510b935bd54d..c38246efcb77f 100644 --- a/cmd/mdatagen/templates/metrics_test.go.tmpl +++ b/cmd/mdatagen/templates/metrics_test.go.tmpl @@ -7,9 +7,9 @@ import ( "testing" "github.com/stretchr/testify/assert" - "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" + "go.opentelemetry.io/collector/receiver/receivertest" "go.uber.org/zap" "go.uber.org/zap/zaptest/observer" ) @@ -17,7 +17,7 @@ import ( func TestDefaultMetrics(t *testing.T) { start := pcommon.Timestamp(1_000_000_000) ts := pcommon.Timestamp(1_000_001_000) - mb := NewMetricsBuilder(DefaultMetricsSettings(), componenttest.NewNopReceiverCreateSettings(), WithStartTime(start)) + mb := NewMetricsBuilder(DefaultMetricsSettings(), receivertest.NewNopCreateSettings(), WithStartTime(start)) enabledMetrics := make(map[string]bool) {{- range $name, $metric := .Metrics }} @@ -52,7 +52,7 @@ func TestAllMetrics(t *testing.T) { {{- end }} } observedZapCore, observedLogs := observer.New(zap.WarnLevel) - settings := componenttest.NewNopReceiverCreateSettings() + settings := receivertest.NewNopCreateSettings() settings.Logger = zap.New(observedZapCore) mb := NewMetricsBuilder(metricsSettings, settings, WithStartTime(start)) @@ -140,7 +140,7 @@ func TestNoMetrics(t *testing.T) { {{- end }} } observedZapCore, observedLogs := observer.New(zap.WarnLevel) - settings := componenttest.NewNopReceiverCreateSettings() + settings := receivertest.NewNopCreateSettings() settings.Logger = zap.New(observedZapCore) mb := NewMetricsBuilder(metricsSettings, settings, WithStartTime(start)) diff --git a/cmd/otelcontribcol/go.mod b/cmd/otelcontribcol/go.mod index 13b6ed05b6500..1b08ee282737f 100644 --- a/cmd/otelcontribcol/go.mod +++ b/cmd/otelcontribcol/go.mod @@ -2,7 +2,7 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/cmd/otelcontrib go 1.18 -require github.com/open-telemetry/opentelemetry-collector-contrib v0.66.0 +require github.com/open-telemetry/opentelemetry-collector-contrib v0.0.0-00010101000000-000000000000 require ( bitbucket.org/atlassian/go-asap/v2 v2.6.0 // indirect @@ -68,9 +68,6 @@ require ( github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector/googlemanagedprometheus v0.34.3-0.20221202192616-0186b89ba914 // indirect github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.10.2 // indirect github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.34.3-0.20221202192616-0186b89ba914 // indirect - github.com/Masterminds/goutils v1.1.1 // indirect - github.com/Masterminds/semver/v3 v3.1.1 // indirect - github.com/Masterminds/sprig/v3 v3.2.2 // indirect github.com/Microsoft/go-winio v0.5.2 // indirect github.com/ReneKroon/ttlcache/v2 v2.11.0 // indirect github.com/SAP/go-hdb v0.111.5 // indirect @@ -89,7 +86,6 @@ require ( github.com/apache/thrift v0.17.0 // indirect github.com/ardielle/ardielle-go v1.5.2 // indirect github.com/armon/go-metrics v0.4.0 // indirect - github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d // indirect github.com/aws/aws-sdk-go v1.44.155 // indirect github.com/aws/aws-sdk-go-v2 v1.17.2 // indirect github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.4.10 // indirect @@ -113,21 +109,15 @@ require ( github.com/aws/smithy-go v1.13.5 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/blang/semver v3.5.1+incompatible // indirect - github.com/bmatcuk/doublestar v1.2.2 // indirect github.com/bmatcuk/doublestar/v4 v4.4.0 // indirect - github.com/bradfitz/gomemcache v0.0.0-20190913173617-a41fca850d0b // indirect - github.com/buger/jsonparser v1.1.1 // indirect - github.com/c2h5oh/datasize v0.0.0-20200112174442-28bbd4740fee // indirect github.com/caio/go-tdigest v3.1.0+incompatible // indirect github.com/cenkalti/backoff v2.2.1+incompatible // indirect github.com/cenkalti/backoff/v4 v4.2.0 // indirect github.com/census-instrumentation/opencensus-proto v0.4.1 // indirect - github.com/cespare/xxhash v1.1.0 // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect github.com/checkpoint-restore/go-criu/v5 v5.3.0 // indirect github.com/cihub/seelog v0.0.0-20170130134532-f561c5e57575 // indirect github.com/cilium/ebpf v0.8.1 // indirect - github.com/cloudflare/cloudflare-go v0.27.0 // indirect github.com/cloudfoundry-incubator/uaago v0.0.0-20190307164349-8136b7bbe76e // indirect github.com/cncf/udpa/go v0.0.0-20210930031921-04548b0d99d4 // indirect github.com/cncf/xds/go v0.0.0-20220314180256-7f1daf1720fc // indirect @@ -135,8 +125,6 @@ require ( github.com/containerd/console v1.0.3 // indirect github.com/containerd/ttrpc v1.1.0 // indirect github.com/coreos/go-oidc v2.2.1+incompatible // indirect - github.com/coreos/go-semver v0.3.0 // indirect - github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf // indirect github.com/coreos/go-systemd/v22 v22.4.0 // indirect github.com/cyphar/filepath-securejoin v0.2.3 // indirect github.com/danieljoos/wincred v1.1.2 // indirect @@ -145,7 +133,6 @@ require ( github.com/dennwc/varint v1.0.0 // indirect github.com/devigned/tab v0.1.1 // indirect github.com/dgraph-io/ristretto v0.1.1 // indirect - github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect github.com/digitalocean/godo v1.88.0 // indirect github.com/dimchansky/utfbom v1.1.1 // indirect github.com/docker/distribution v2.8.1+incompatible // indirect @@ -158,7 +145,6 @@ require ( github.com/eapache/go-resiliency v1.3.0 // indirect github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21 // indirect github.com/eapache/queue v1.1.0 // indirect - github.com/edsrzf/mmap-go v1.1.0 // indirect github.com/elastic/elastic-transport-go/v8 v8.1.0 // indirect github.com/elastic/go-elasticsearch/v8 v8.5.0 // indirect github.com/elastic/go-structform v0.0.10 // indirect @@ -167,7 +153,6 @@ require ( github.com/envoyproxy/protoc-gen-validate v0.6.13 // indirect github.com/euank/go-kmsg-parser v2.0.0+incompatible // indirect github.com/facebook/time v0.0.0-20220713225404-f7a0d7702d50 // indirect - github.com/facette/natsort v0.0.0-20181210072756-2cd4dd1e2dcb // indirect github.com/fatih/color v1.13.0 // indirect github.com/felixge/httpsnoop v1.0.3 // indirect github.com/form3tech-oss/jwt-go v3.2.5+incompatible // indirect @@ -182,17 +167,10 @@ require ( github.com/go-logr/logr v1.2.3 // indirect github.com/go-logr/stdr v1.2.2 // indirect github.com/go-ole/go-ole v1.2.6 // indirect - github.com/go-openapi/analysis v0.21.2 // indirect - github.com/go-openapi/errors v0.20.2 // indirect github.com/go-openapi/jsonpointer v0.19.5 // indirect github.com/go-openapi/jsonreference v0.20.0 // indirect - github.com/go-openapi/loads v0.21.1 // indirect - github.com/go-openapi/spec v0.20.6 // indirect - github.com/go-openapi/strfmt v0.21.3 // indirect github.com/go-openapi/swag v0.22.1 // indirect - github.com/go-openapi/validate v0.22.0 // indirect github.com/go-redis/redis/v7 v7.4.1 // indirect - github.com/go-redis/redis/v8 v8.11.5 // indirect github.com/go-resty/resty/v2 v2.1.1-0.20191201195748-d7b97669fe48 // indirect github.com/go-sql-driver/mysql v1.7.0 // indirect github.com/go-stack/stack v1.8.1 // indirect @@ -203,7 +181,6 @@ require ( github.com/gofrs/uuid v4.2.0+incompatible // indirect github.com/gogo/googleapis v1.4.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect - github.com/gogo/status v1.1.1 // indirect github.com/golang-jwt/jwt v3.2.2+incompatible // indirect github.com/golang-jwt/jwt/v4 v4.4.2 // indirect github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe // indirect @@ -212,14 +189,12 @@ require ( github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect github.com/golang/protobuf v1.5.2 // indirect github.com/golang/snappy v0.0.4 // indirect - github.com/google/btree v1.0.1 // indirect github.com/google/cadvisor v0.46.0 // indirect github.com/google/flatbuffers v2.0.8+incompatible // indirect github.com/google/gnostic v0.5.7-v3refs // 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/renameio/v2 v2.0.0 // indirect github.com/google/uuid v1.3.0 // indirect github.com/googleapis/enterprise-certificate-proxy v0.2.0 // indirect github.com/googleapis/gax-go/v2 v2.7.0 // indirect @@ -227,12 +202,8 @@ require ( github.com/gorilla/mux v1.8.0 // indirect github.com/gorilla/websocket v1.5.0 // indirect github.com/gosnmp/gosnmp v1.35.0 // indirect - github.com/grafana/dskit v0.0.0-20220928083349-b1b307db4f30 // indirect - github.com/grafana/go-gelf/v2 v2.0.1 // indirect - github.com/grafana/loki v1.6.2-0.20221206154352-fee23745328c // indirect github.com/grafana/regexp v0.0.0-20221005093135-b4c2bcb0a4b6 // indirect github.com/grobie/gomemcache v0.0.0-20180201122607-1f779c573665 // indirect - github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 // indirect github.com/grpc-ecosystem/grpc-gateway/v2 v2.14.0 // indirect github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c // indirect github.com/hashicorp/consul/api v1.18.0 // indirect @@ -241,21 +212,15 @@ require ( github.com/hashicorp/go-cleanhttp v0.5.2 // indirect github.com/hashicorp/go-hclog v1.3.1 // indirect github.com/hashicorp/go-immutable-radix v1.3.1 // indirect - github.com/hashicorp/go-msgpack v0.5.5 // indirect github.com/hashicorp/go-multierror v1.1.1 // indirect github.com/hashicorp/go-retryablehttp v0.7.1 // indirect github.com/hashicorp/go-rootcerts v1.0.2 // indirect - github.com/hashicorp/go-sockaddr v1.0.2 // indirect github.com/hashicorp/go-uuid v1.0.3 // indirect github.com/hashicorp/go-version v1.6.0 // indirect github.com/hashicorp/golang-lru v0.5.4 // indirect - github.com/hashicorp/memberlist v0.5.0 // indirect github.com/hashicorp/nomad/api v0.0.0-20221102143410-8a95f1239005 // indirect github.com/hashicorp/serf v0.10.1 // indirect - github.com/heroku/x v0.0.50 // indirect github.com/hetznercloud/hcloud-go v1.35.3 // indirect - github.com/hpcloud/tail v1.0.0 // indirect - github.com/huandu/xstrings v1.3.1 // indirect github.com/iancoleman/strcase v0.2.0 // indirect github.com/imdario/mergo v0.3.12 // indirect github.com/inconshreveable/mousetrap v1.0.1 // indirect @@ -264,7 +229,6 @@ require ( github.com/influxdata/influxdb-observability/influx2otel v0.2.32 // indirect github.com/influxdata/influxdb-observability/otel2influx v0.2.32 // indirect github.com/influxdata/line-protocol/v2 v2.2.1 // indirect - github.com/influxdata/telegraf v1.16.3 // indirect github.com/ionos-cloud/sdk-go/v6 v6.1.3 // indirect github.com/jackc/chunkreader/v2 v2.0.1 // indirect github.com/jackc/pgconn v1.13.0 // indirect @@ -284,7 +248,6 @@ require ( github.com/josharian/intern v1.0.0 // indirect github.com/jpillora/backoff v1.0.0 // indirect github.com/json-iterator/go v1.1.12 // indirect - github.com/julienschmidt/httprouter v1.3.0 // indirect github.com/karrick/godirwalk v1.17.0 // indirect github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect github.com/klauspost/compress v1.15.12 // indirect @@ -326,192 +289,190 @@ require ( github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f // indirect github.com/nginxinc/nginx-prometheus-exporter v0.8.1-0.20201110005315-f5a5f8086c19 // indirect github.com/observiq/ctimefmt v1.0.0 // indirect - github.com/oklog/ulid v1.3.1 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/alibabacloudlogserviceexporter v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awscloudwatchlogsexporter v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsemfexporter v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awskinesisexporter v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsxrayexporter v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/azuredataexplorerexporter v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/azuremonitorexporter v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/carbonexporter v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/clickhouseexporter v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/coralogixexporter v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/datadogexporter v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/dynatraceexporter v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/elasticsearchexporter v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/f5cloudexporter v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/fileexporter v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/googlecloudexporter v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/googlecloudpubsubexporter v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/googlemanagedprometheusexporter v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/humioexporter v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/influxdbexporter v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/instanaexporter v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/jaegerexporter v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/jaegerthrifthttpexporter v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/kafkaexporter v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/loadbalancingexporter v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/logzioexporter v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/lokiexporter v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/mezmoexporter v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/opencensusexporter v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/parquetexporter v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusexporter v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusremotewriteexporter v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/pulsarexporter v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/sapmexporter v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/sentryexporter v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/signalfxexporter v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/skywalkingexporter v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/splunkhecexporter v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/sumologicexporter v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/tanzuobservabilityexporter v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/tencentcloudlogserviceexporter v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/zipkinexporter v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/extension/asapauthextension v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/extension/awsproxy v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/extension/basicauthextension v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/extension/bearertokenauthextension v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/extension/fluentbitextension v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/extension/headerssetterextension v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/extension/httpforwarder v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/extension/oauth2clientauthextension v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/ecstaskobserver v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/hostobserver v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/k8sobserver v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/extension/oidcauthextension v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/extension/pprofextension v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/extension/sigv4authextension v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/containerinsight v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/cwlogs v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/ecsutil v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/k8s v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/metrics v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/proxy v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/internal/docker v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/internal/filter v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/internal/kubelet v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/internal/metadataproviders v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/internal/splunk v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchperresourceattr v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchpersignal v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/experimentalmetricmetadata v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/loki v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheus v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheusremotewrite v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/signalfx v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/zipkin v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/winperfcounters v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/processor/cumulativetodeltaprocessor v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/processor/deltatorateprocessor v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/processor/filterprocessor v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/processor/groupbyattrsprocessor v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/processor/groupbytraceprocessor v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/processor/k8sattributesprocessor v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/processor/metricsgenerationprocessor v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/processor/metricstransformprocessor v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/processor/probabilisticsamplerprocessor v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourceprocessor v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/processor/routingprocessor v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/processor/servicegraphprocessor v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/processor/spanmetricsprocessor v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/processor/spanprocessor v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/processor/tailsamplingprocessor v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/processor/transformprocessor v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/activedirectorydsreceiver v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/aerospikereceiver v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/apachereceiver v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awscloudwatchreceiver v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsecscontainermetricsreceiver v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsfirehosereceiver v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsxrayreceiver v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/azureeventhubreceiver v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/bigipreceiver v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/carbonreceiver v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/chronyreceiver v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/cloudfoundryreceiver v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/collectdreceiver v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/couchdbreceiver v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/dockerstatsreceiver v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/dotnetdiagnosticsreceiver v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/elasticsearchreceiver v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/expvarreceiver v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/filelogreceiver v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/flinkmetricsreceiver v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/fluentforwardreceiver v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/googlecloudpubsubreceiver v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/googlecloudspannerreceiver v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/httpcheckreceiver v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/iisreceiver v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/influxdbreceiver v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jmxreceiver v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/journaldreceiver v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8sclusterreceiver v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8seventsreceiver v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8sobjectsreceiver v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkametricsreceiver v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkareceiver v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kubeletstatsreceiver v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/memcachedreceiver v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/mongodbatlasreceiver v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/mongodbreceiver v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/mysqlreceiver v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/nginxreceiver v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/nsxtreceiver v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/opencensusreceiver v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/oracledbreceiver v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/otlpjsonfilereceiver v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/podmanreceiver v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/postgresqlreceiver v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusexecreceiver v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/promtailreceiver v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/pulsarreceiver v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/purefareceiver v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/rabbitmqreceiver v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/receivercreator v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/redisreceiver v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/riakreceiver v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/saphanareceiver v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/sapmreceiver v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/signalfxreceiver v0.0.0-00010101000000-000000000000 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/simpleprometheusreceiver v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/skywalkingreceiver v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/snmpreceiver v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/solacereceiver v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/splunkhecreceiver v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/sqlqueryreceiver v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/sqlserverreceiver v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/statsdreceiver v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/syslogreceiver v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/tcplogreceiver v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/udplogreceiver v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/vcenterreceiver v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/wavefrontreceiver v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/windowseventlogreceiver v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/windowsperfcountersreceiver v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zookeeperreceiver v0.66.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/alibabacloudlogserviceexporter v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awscloudwatchlogsexporter v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsemfexporter v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awskinesisexporter v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsxrayexporter v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/azuredataexplorerexporter v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/azuremonitorexporter v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/carbonexporter v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/clickhouseexporter v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/coralogixexporter v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/datadogexporter v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/dynatraceexporter v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/elasticsearchexporter v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/f5cloudexporter v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/fileexporter v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/googlecloudexporter v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/googlecloudpubsubexporter v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/googlemanagedprometheusexporter v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/humioexporter v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/influxdbexporter v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/instanaexporter v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/jaegerexporter v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/jaegerthrifthttpexporter v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/kafkaexporter v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/loadbalancingexporter v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/logzioexporter v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/lokiexporter v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/mezmoexporter v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/opencensusexporter v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/parquetexporter v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusexporter v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusremotewriteexporter v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/pulsarexporter v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/sapmexporter v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/sentryexporter v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/signalfxexporter v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/skywalkingexporter v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/splunkhecexporter v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/sumologicexporter v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/tanzuobservabilityexporter v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/tencentcloudlogserviceexporter v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/zipkinexporter v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/extension/asapauthextension v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/extension/awsproxy v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/extension/basicauthextension v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/extension/bearertokenauthextension v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/extension/fluentbitextension v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/extension/headerssetterextension v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/extension/httpforwarder v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/extension/oauth2clientauthextension v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/ecstaskobserver v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/hostobserver v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/k8sobserver v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/extension/oidcauthextension v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/extension/pprofextension v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/extension/sigv4authextension v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/containerinsight v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/cwlogs v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/ecsutil v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/k8s v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/metrics v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/proxy v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/internal/docker v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/internal/filter v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/internal/kubelet v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/internal/metadataproviders v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/internal/splunk v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchperresourceattr v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchpersignal v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/experimentalmetricmetadata v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/loki v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheus v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheusremotewrite v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/signalfx v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/zipkin v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/winperfcounters v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/processor/cumulativetodeltaprocessor v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/processor/deltatorateprocessor v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/processor/filterprocessor v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/processor/groupbyattrsprocessor v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/processor/groupbytraceprocessor v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/processor/k8sattributesprocessor v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/processor/metricsgenerationprocessor v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/processor/metricstransformprocessor v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/processor/probabilisticsamplerprocessor v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourceprocessor v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/processor/routingprocessor v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/processor/servicegraphprocessor v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/processor/spanmetricsprocessor v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/processor/spanprocessor v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/processor/tailsamplingprocessor v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/processor/transformprocessor v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/activedirectorydsreceiver v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/aerospikereceiver v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/apachereceiver v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awscloudwatchreceiver v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsecscontainermetricsreceiver v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsfirehosereceiver v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsxrayreceiver v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/azureeventhubreceiver v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/bigipreceiver v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/carbonreceiver v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/chronyreceiver v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/cloudfoundryreceiver v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/collectdreceiver v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/couchdbreceiver v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/dockerstatsreceiver v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/dotnetdiagnosticsreceiver v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/elasticsearchreceiver v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/expvarreceiver v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/filelogreceiver v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/flinkmetricsreceiver v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/fluentforwardreceiver v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/googlecloudpubsubreceiver v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/googlecloudspannerreceiver v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/httpcheckreceiver v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/iisreceiver v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/influxdbreceiver v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jmxreceiver v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/journaldreceiver v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8sclusterreceiver v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8seventsreceiver v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8sobjectsreceiver v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkametricsreceiver v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkareceiver v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kubeletstatsreceiver v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/memcachedreceiver v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/mongodbatlasreceiver v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/mongodbreceiver v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/mysqlreceiver v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/nginxreceiver v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/nsxtreceiver v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/opencensusreceiver v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/oracledbreceiver v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/otlpjsonfilereceiver v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/podmanreceiver v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/postgresqlreceiver v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusexecreceiver v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/pulsarreceiver v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/purefareceiver v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/rabbitmqreceiver v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/receivercreator v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/redisreceiver v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/riakreceiver v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/saphanareceiver v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/sapmreceiver v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/signalfxreceiver v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/simpleprometheusreceiver v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/skywalkingreceiver v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/snmpreceiver v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/solacereceiver v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/splunkhecreceiver v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/sqlqueryreceiver v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/sqlserverreceiver v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/statsdreceiver v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/syslogreceiver v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/tcplogreceiver v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/udplogreceiver v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/vcenterreceiver v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/wavefrontreceiver v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/windowseventlogreceiver v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/windowsperfcountersreceiver v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zookeeperreceiver v0.67.0 // indirect github.com/opencontainers/go-digest v1.0.0 // indirect github.com/opencontainers/image-spec v1.0.3-0.20211202183452-c5a74bcca799 // indirect github.com/opencontainers/runc v1.1.4 // indirect @@ -520,8 +481,6 @@ require ( github.com/openlyinc/pointy v1.2.0 // indirect github.com/openshift/api v0.0.0-20210521075222-e273a339932a // indirect github.com/openshift/client-go v0.0.0-20210521082421-73d9475a9142 // indirect - github.com/opentracing-contrib/go-grpc v0.0.0-20210225150812-73cb765af46e // indirect - github.com/opentracing-contrib/go-stdlib v1.0.0 // indirect github.com/opentracing/opentracing-go v1.2.0 // indirect github.com/openzipkin/zipkin-go v0.4.1 // indirect github.com/ovh/go-ovh v1.3.0 // indirect @@ -535,12 +494,10 @@ require ( github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect github.com/power-devops/perfstat v0.0.0-20220216144756-c35f1ee13d7c // indirect github.com/pquerna/cachecontrol v0.1.0 // indirect - github.com/prometheus/alertmanager v0.24.0 // indirect github.com/prometheus/client_golang v1.14.0 // indirect github.com/prometheus/client_model v0.3.0 // indirect github.com/prometheus/common v0.37.0 // indirect github.com/prometheus/common/sigv4 v0.1.0 // indirect - github.com/prometheus/exporter-toolkit v0.8.2 // indirect github.com/prometheus/procfs v0.8.0 // indirect github.com/prometheus/prometheus v0.40.5 // indirect github.com/prometheus/statsd_exporter v0.22.7 // indirect @@ -548,11 +505,9 @@ require ( github.com/relvacode/iso8601 v1.1.0 // indirect github.com/rs/cors v1.8.2 // indirect github.com/scaleway/scaleway-sdk-go v1.0.0-beta.9 // indirect - github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529 // indirect github.com/seccomp/libseccomp-golang v0.9.2-0.20220502022130-f33da4d89646 // indirect github.com/secure-systems-lab/go-securesystemslib v0.4.0 // indirect github.com/segmentio/asm v1.2.0 // indirect - github.com/sercand/kuberesolver v2.4.0+incompatible // indirect github.com/shirou/gopsutil/v3 v3.22.10 // indirect github.com/shopspring/decimal v1.3.1 // indirect github.com/signalfx/com_signalfx_metrics_protobuf v0.0.3 // indirect @@ -564,9 +519,7 @@ require ( github.com/sirupsen/logrus v1.9.0 // indirect github.com/snowflakedb/gosnowflake v1.6.15 // indirect github.com/soheilhy/cmux v0.1.5 // indirect - github.com/sony/gobreaker v0.5.0 // indirect github.com/spaolacci/murmur3 v1.1.0 // indirect - github.com/spf13/afero v1.9.2 // indirect github.com/spf13/cast v1.5.0 // indirect github.com/spf13/cobra v1.6.1 // indirect github.com/spf13/pflag v1.0.5 // indirect @@ -575,7 +528,6 @@ require ( github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635 // indirect github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.553 // indirect github.com/tg123/go-htpasswd v1.2.0 // indirect - github.com/thanos-io/thanos v0.28.0 // indirect github.com/theupdateframework/go-tuf v0.3.0 // indirect github.com/tidwall/gjson v1.14.3 // indirect github.com/tidwall/match v1.1.1 // indirect @@ -595,8 +547,6 @@ require ( github.com/vmware/govmomi v0.29.0 // indirect github.com/vultr/govultr/v2 v2.17.2 // indirect github.com/wavefronthq/wavefront-sdk-go v0.11.0 // indirect - github.com/weaveworks/common v0.0.0-20221201103051-7c2720a9024d // indirect - github.com/weaveworks/promrus v1.2.0 // indirect github.com/xdg-go/pbkdf2 v1.0.0 // indirect github.com/xdg-go/scram v1.1.1 // indirect github.com/xdg-go/stringprep v1.0.3 // indirect @@ -604,27 +554,24 @@ require ( github.com/yuin/gopher-lua v0.0.0-20220504180219-658193537a64 // indirect github.com/yusufpapurcu/wmi v1.2.2 // indirect go.etcd.io/bbolt v1.3.6 // indirect - go.etcd.io/etcd/api/v3 v3.5.5 // indirect - go.etcd.io/etcd/client/pkg/v3 v3.5.5 // indirect - go.etcd.io/etcd/client/v3 v3.5.5 // indirect go.mongodb.org/atlas v0.19.0 // indirect go.mongodb.org/mongo-driver v1.10.3 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 // indirect - go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 // indirect - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a // indirect - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 // indirect - go.opentelemetry.io/collector/exporter/loggingexporter v0.66.1-0.20221202005155-1c54042beb70 // indirect - go.opentelemetry.io/collector/exporter/otlpexporter v0.66.1-0.20221202005155-1c54042beb70 // indirect - go.opentelemetry.io/collector/exporter/otlphttpexporter v0.66.1-0.20221202005155-1c54042beb70 // indirect - go.opentelemetry.io/collector/extension/ballastextension v0.66.1-0.20221202005155-1c54042beb70 // indirect - go.opentelemetry.io/collector/extension/zpagesextension v0.66.1-0.20221202005155-1c54042beb70 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 // indirect - go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221202005155-1c54042beb70 // indirect - go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.66.1-0.20221202005155-1c54042beb70 // indirect - go.opentelemetry.io/collector/receiver/otlpreceiver v0.66.1-0.20221202005155-1c54042beb70 // indirect - go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector v0.67.0 // indirect + go.opentelemetry.io/collector/component v0.67.0 // indirect + go.opentelemetry.io/collector/confmap v0.67.0 // indirect + go.opentelemetry.io/collector/consumer v0.67.0 // indirect + go.opentelemetry.io/collector/exporter/loggingexporter v0.67.0 // indirect + go.opentelemetry.io/collector/exporter/otlpexporter v0.67.0 // indirect + go.opentelemetry.io/collector/exporter/otlphttpexporter v0.67.0 // indirect + go.opentelemetry.io/collector/extension/ballastextension v0.67.0 // indirect + go.opentelemetry.io/collector/extension/zpagesextension v0.67.0 // indirect + go.opentelemetry.io/collector/featuregate v0.67.0 // indirect + go.opentelemetry.io/collector/pdata v1.0.0-rc1 // indirect + go.opentelemetry.io/collector/processor/batchprocessor v0.67.0 // indirect + go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.67.0 // indirect + go.opentelemetry.io/collector/receiver/otlpreceiver v0.67.0 // indirect + go.opentelemetry.io/collector/semconv v0.67.0 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 // indirect go.opentelemetry.io/contrib/propagators/b3 v1.11.1 // indirect @@ -639,8 +586,6 @@ require ( go.uber.org/goleak v1.2.0 // indirect go.uber.org/multierr v1.8.0 // indirect go.uber.org/zap v1.24.0 // indirect - go4.org/intern v0.0.0-20211027215823-ae77deb06f29 // indirect - go4.org/unsafe/assume-no-moving-gc v0.0.0-20220617031537-928513b29760 // indirect golang.org/x/crypto v0.3.0 // indirect golang.org/x/exp v0.0.0-20221205204356-47842c84f3db // indirect golang.org/x/mod v0.7.0 // indirect @@ -659,17 +604,13 @@ require ( google.golang.org/genproto v0.0.0-20221206210731-b1a01be3a5f6 // indirect google.golang.org/grpc v1.51.0 // indirect google.golang.org/protobuf v1.28.1 // indirect - gopkg.in/fsnotify.v1 v1.4.7 // indirect - gopkg.in/fsnotify/fsnotify.v1 v1.4.7 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect gopkg.in/square/go-jose.v2 v2.5.1 // indirect - gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect gopkg.in/zorkian/go-datadog-api.v2 v2.30.0 // indirect - inet.af/netaddr v0.0.0-20211027220019-c74959edd3b6 // indirect k8s.io/api v0.25.4 // indirect k8s.io/apimachinery v0.25.4 // indirect k8s.io/client-go v0.25.4 // indirect @@ -928,8 +869,6 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/exporter/pulsa replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/redisreceiver => ../../receiver/redisreceiver -replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/promtailreceiver => ../../receiver/promtailreceiver - replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkareceiver => ../../receiver/kafkareceiver replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/flinkmetricsreceiver => ../../receiver/flinkmetricsreceiver diff --git a/cmd/otelcontribcol/go.sum b/cmd/otelcontribcol/go.sum index 7d26b213c1bbe..048c930cf2951 100644 --- a/cmd/otelcontribcol/go.sum +++ b/cmd/otelcontribcol/go.sum @@ -3,7 +3,6 @@ bitbucket.org/atlassian/go-asap/v2 v2.6.0 h1:KiLw3IgbzFLqNxCrVZoKUDJKMxUGoOd+NEO bitbucket.org/atlassian/go-asap/v2 v2.6.0/go.mod h1:cuRgWb7eeGtsocKmqY2kPlMMlwpkeNh+QOIkjAMlUBc= cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= -cloud.google.com/go v0.37.4/go.mod h1:NHPJ89PdicEuT9hdPXMROBD91xc5uRDxsMtSB16k7hw= 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= @@ -168,7 +167,6 @@ cloud.google.com/go/iap v1.4.0/go.mod h1:RGFwRJdihTINIe4wZ2iCP0zF/qu18ZwyKxrhMhy cloud.google.com/go/ids v1.1.0/go.mod h1:WIuwCaYVOzHIj2OhN9HAwvW+DBdmUAdcWlFxRl+KubM= cloud.google.com/go/iot v1.3.0/go.mod h1:r7RGh2B61+B8oz0AGE+J72AhA0G7tdXItODWsaA2oLs= cloud.google.com/go/kms v1.5.0/go.mod h1:QJS2YY0eJGBg3mnDfuaCyLauWwBJiHRboYxJ++1xJNg= -cloud.google.com/go/kms v1.6.0 h1:OWRZzrPmOZUzurjI2FBGtgY2mB1WaJkqhw6oIwSj0Yg= cloud.google.com/go/language v1.4.0/go.mod h1:F9dRpNFQmJbkaop6g0JhSBXCNlO90e1KWx5iDdxbWic= cloud.google.com/go/language v1.6.0/go.mod h1:6dJ8t3B+lUYfStgls25GusK04NLh3eDLQnWM3mdEbhI= cloud.google.com/go/language v1.7.0/go.mod h1:DJ6dYN/W+SQOjF8e1hLQXMF21AkH2w9wiPzPCJa2MIE= @@ -308,8 +306,6 @@ code.cloudfoundry.org/go-loggregator v7.4.0+incompatible h1:KqZYloMQWM5Zg/BQKunO code.cloudfoundry.org/go-loggregator v7.4.0+incompatible/go.mod h1:KPBTRqj+y738Nhf1+g4JHFaBU8j7dedirR5ETNHvMXU= code.cloudfoundry.org/rfc5424 v0.0.0-20201103192249-000122071b78 h1:mrZQaZmuDIPhSp6b96b+CRKC2uH44ifa5cjDV2epKis= code.cloudfoundry.org/rfc5424 v0.0.0-20201103192249-000122071b78/go.mod h1:tkZo8GtzBjySJ7USvxm4E36lNQw1D3xM6oKHGqdaAJ4= -collectd.org v0.3.0/go.mod h1:A/8DzQBkF6abtvrT2j/AU/4tiBgJWYyh0y/oB/4MlWE= -contrib.go.opencensus.io/exporter/ocagent v0.6.0/go.mod h1:zmKjrJcdo0aYcVS7bmEeSEBLPA9YJp5bjrofdU3pIXs= contrib.go.opencensus.io/exporter/prometheus v0.4.1/go.mod h1:t9wvfitlUjGXG2IXAZsuFq26mDGid/JwCEXp+gTG/9U= contrib.go.opencensus.io/exporter/prometheus v0.4.2 h1:sqfsYl5GIY/L570iT+l93ehxaWJs2/OwXtiWwew3oAg= contrib.go.opencensus.io/exporter/prometheus v0.4.2/go.mod h1:dvEHbiKmgvbr5pjaF9fpw1KeYcjrnC1J8B+JKjsZyRQ= @@ -325,19 +321,15 @@ github.com/99designs/keyring v1.2.1/go.mod h1:fc+wB5KTk9wQ9sDx0kFXB3A0MaeGHM9AwR github.com/AndreasBriese/bbloom v0.0.0-20190825152654-46b345b51c96/go.mod h1:bOvUY6CB00SOBii9/FifXqc0awNKxLFCL/+pkDPuyl8= github.com/AthenZ/athenz v1.10.39 h1:mtwHTF/v62ewY2Z5KWhuZgVXftBej1/Tn80zx4DcawY= github.com/AthenZ/athenz v1.10.39/go.mod h1:3Tg8HLsiQZp81BJY58JBeU2BR6B/H4/0MQGfCwhHNEA= -github.com/Azure/azure-amqp-common-go/v3 v3.0.0/go.mod h1:SY08giD/XbhTz07tJdpw1SoxQXHPN30+DI3Z04SYqyg= github.com/Azure/azure-amqp-common-go/v3 v3.2.3 h1:uDF62mbd9bypXWi19V1bN5NZEO84JqgmI5G73ibAmrk= github.com/Azure/azure-amqp-common-go/v3 v3.2.3/go.mod h1:7rPmbSfszeovxGfc5fSAXE4ehlXQZHpMja2OtxC2Tas= -github.com/Azure/azure-event-hubs-go/v3 v3.2.0/go.mod h1:BPIIJNH/l/fVHYq3Rm6eg4clbrULrQ3q7+icmqHyyLc= github.com/Azure/azure-event-hubs-go/v3 v3.3.20 h1:LRAy00JlV5aDqd0LFXwfwFReYzl03CtH/kD91OHrT94= github.com/Azure/azure-event-hubs-go/v3 v3.3.20/go.mod h1:5GkwDWncbqGCPjf76khiylOAD2NjkrUrLFb/S99BiA8= github.com/Azure/azure-kusto-go v0.9.2 h1:AP0bNhGyvc51XHi6nBMABDjCqgJb/KGrCrcm7KvYFyk= github.com/Azure/azure-kusto-go v0.9.2/go.mod h1:i7WCtgt4XeHge3+Oi5sq84HYhneNi7VY7hr35wsUdrg= github.com/Azure/azure-pipeline-go v0.1.8/go.mod h1:XA1kFWRVhSK+KNFiOhfv83Fv8L9achrP7OxIzeTn1Yg= -github.com/Azure/azure-pipeline-go v0.1.9/go.mod h1:XA1kFWRVhSK+KNFiOhfv83Fv8L9achrP7OxIzeTn1Yg= github.com/Azure/azure-pipeline-go v0.2.3 h1:7U9HBg1JFK3jHl5qmo4CTZKFTVgMwdFHMVtCdfBE21U= github.com/Azure/azure-pipeline-go v0.2.3/go.mod h1:x841ezTBIMG6O3lAcl8ATHnsOPVl2bqk7S3ta6S6u4k= -github.com/Azure/azure-sdk-for-go v37.1.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= github.com/Azure/azure-sdk-for-go v61.2.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= github.com/Azure/azure-sdk-for-go v65.0.0+incompatible h1:HzKLt3kIwMm4KeJYTdx9EbjRYTySD/t8i1Ee/W5EGXw= github.com/Azure/azure-sdk-for-go v65.0.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= @@ -350,17 +342,13 @@ github.com/Azure/azure-sdk-for-go/sdk/internal v0.8.3 h1:E+m3SkZCN0Bf5q7YdTs5lSm github.com/Azure/azure-sdk-for-go/sdk/internal v0.8.3/go.mod h1:KLF4gFr6DcKFZwSuH8w8yEK6DpFl3LP5rhdvAb7Yz5I= github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v0.3.0 h1:Px2UA+2RvSSvv+RvJNuUB6n7rs5Wsel4dXLe90Um2n4= github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v0.3.0/go.mod h1:tPaiy8S5bQ+S5sOiDlINkp7+Ef339+Nz5L5XO+cnOHo= -github.com/Azure/azure-storage-blob-go v0.6.0/go.mod h1:oGfmITT1V6x//CswqY2gtAHND+xIP64/qL7a5QJix0Y= github.com/Azure/azure-storage-blob-go v0.15.0 h1:rXtgp8tN1p29GvpGgfJetavIG0V7OgcSXPpwp3tx6qk= github.com/Azure/azure-storage-blob-go v0.15.0/go.mod h1:vbjsVbX0dlxnRc4FFMPsS9BsJWPcne7GB7onqlPvz58= -github.com/Azure/azure-storage-queue-go v0.0.0-20181215014128-6ed74e755687/go.mod h1:K6am8mT+5iFXgingS9LUc7TmbsW6XBw3nxaRyaMyWc8= github.com/Azure/azure-storage-queue-go v0.0.0-20191125232315-636801874cdd h1:b3wyxBl3vvr15tUAziPBPK354y+LSdfPCpex5oBttHo= github.com/Azure/azure-storage-queue-go v0.0.0-20191125232315-636801874cdd/go.mod h1:K6am8mT+5iFXgingS9LUc7TmbsW6XBw3nxaRyaMyWc8= -github.com/Azure/go-amqp v0.12.6/go.mod h1:qApuH6OFTSKZFmCOxccvAv5rLizBQf4v8pRmG138DPo= github.com/Azure/go-amqp v0.17.0/go.mod h1:9YJ3RhxRT1gquYnzpZO1vcYMMpAdJT+QEg6fwmw9Zlg= github.com/Azure/go-amqp v0.17.5 h1:7Lsi9H9ijCAfqOaMiNmQ4c+GL9bdrpCjebNKhV/eQ+c= github.com/Azure/go-amqp v0.17.5/go.mod h1:9YJ3RhxRT1gquYnzpZO1vcYMMpAdJT+QEg6fwmw9Zlg= -github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8= github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 h1:UQHMgLO+TxOElx5B5HZ4hJQsoJ/PvUvKRhJHDQXO8P8= github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E= github.com/Azure/go-autorest v14.2.0+incompatible h1:V5VMDjClD3GiElqLWO7mz2MxNAK/vTfRHdAubSIPRgs= @@ -396,10 +384,8 @@ github.com/Azure/go-autorest/autorest/mocks v0.3.0/go.mod h1:a8FDP3DYzQ4RYfVAxAN github.com/Azure/go-autorest/autorest/mocks v0.4.1/go.mod h1:LTp+uSrOhSkaKrUy935gNZuuIPPVsHlr9DSOxSayd+k= github.com/Azure/go-autorest/autorest/mocks v0.4.2 h1:PGN4EDXnuQbojHbU0UWoNvmu9AGVwYHG9/fkDYhtAfw= github.com/Azure/go-autorest/autorest/mocks v0.4.2/go.mod h1:Vy7OitM9Kei0i1Oj+LvyAWMXJHeKH1MVlzFugfVrmyU= -github.com/Azure/go-autorest/autorest/to v0.3.0/go.mod h1:MgwOyqaIuKdG4TL/2ywSsIWKAfJfgHDo8ObuUk3t5sA= github.com/Azure/go-autorest/autorest/to v0.4.0 h1:oXVqrxakqqV1UZdSazDOPOLvOIz+XA683u8EctwboHk= github.com/Azure/go-autorest/autorest/to v0.4.0/go.mod h1:fE8iZBn7LQR7zH/9XU2NcPR4o9jEImooCeWJcYV/zLE= -github.com/Azure/go-autorest/autorest/validation v0.2.0/go.mod h1:3EEqHnBxQGHXRYq3HT1WyXAvT7LLY3tl70hw6tQIbjI= github.com/Azure/go-autorest/autorest/validation v0.3.1 h1:AgyqjAd94fwNAoTjl/WQXg4VvFeRFpO+UhNyRXqF1ac= github.com/Azure/go-autorest/autorest/validation v0.3.1/go.mod h1:yhLgjC0Wda5DYXl6JAsWyUe4KVNffhoDhG0zVzUMo3E= github.com/Azure/go-autorest/logger v0.1.0/go.mod h1:oExouG+K6PryycPJfVSxi/koC6LSNgds39diKLz7Vrc= @@ -468,16 +454,10 @@ github.com/HdrHistogram/hdrhistogram-go v1.1.0/go.mod h1:yDgFjdqOqDEKOvasDdhWNXY github.com/HdrHistogram/hdrhistogram-go v1.1.2 h1:5IcZpTvzydCQeHzK4Ef/D5rrSqwxob0t8PQPMybUNFM= github.com/HdrHistogram/hdrhistogram-go v1.1.2/go.mod h1:yDgFjdqOqDEKOvasDdhWNXYg9BVp4O+o5f6V/ehm6Oo= github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0= -github.com/Masterminds/goutils v1.1.1 h1:5nUrii3FMTL5diU80unEVvNevw1nH4+ZV4DSLVJLSYI= -github.com/Masterminds/goutils v1.1.1/go.mod h1:8cTjp+g8YejhMuvIA5y2vz3BpJxksy863GQaJW2MFNU= +github.com/Masterminds/semver v1.5.0 h1:H65muMkzWKEuNDnfl9d70GUjFniHKHRbFPGBuZ3QEww= github.com/Masterminds/semver v1.5.0/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y= github.com/Masterminds/semver/v3 v3.1.1 h1:hLg3sBzpNErnxhQtUy/mmLR2I9foDujNK030IGemrRc= github.com/Masterminds/semver/v3 v3.1.1/go.mod h1:VPu/7SZ7ePZ3QOrcuXROw5FAcLl4a0cBrbBpGY/8hQs= -github.com/Masterminds/sprig/v3 v3.2.2 h1:17jRggJu518dr3QaafizSXOjKYp94wKfABxUmyxvxX8= -github.com/Masterminds/sprig/v3 v3.2.2/go.mod h1:UoaO7Yp8KlPnJIYWTFkMaqPUYKTfGFPhxNuwnnxkKlk= -github.com/Mellanox/rdmamap v0.0.0-20191106181932-7c3c4763a6ee/go.mod h1:jDA6v0TUYrFEIAE5uGJ29LQOeONIgMdP4Rkqb8HUnPM= -github.com/Microsoft/ApplicationInsights-Go v0.4.2/go.mod h1:CukZ/G66zxXtI+h/VcVn3eVVDGDHfXM2zVILF7bMmsg= -github.com/Microsoft/go-winio v0.4.9/go.mod h1:VhR8bwka0BXejwEJY73c50VrPtXAaKcyvVC4A4RozmA= github.com/Microsoft/go-winio v0.4.14/go.mod h1:qXqCSQ3Xa7+6tgxaGTIe4Kpcdsi+P8jBhyzoq1bpyYA= github.com/Microsoft/go-winio v0.4.15/go.mod h1:tTuCMEN+UleMWgg9dVx4Hu52b1bJo+59jBh3ajtinzw= github.com/Microsoft/go-winio v0.5.0/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpzfwIujj1a84= @@ -488,12 +468,9 @@ github.com/Microsoft/hcsshim v0.9.4 h1:mnUj0ivWy6UzbB1uLFqKR6F+ZyiDc7j4iGgHTpO+5 github.com/Mottl/ctimefmt v0.0.0-20190803144728-fd2ac23a585a/go.mod h1:eyj2WSIdoPMPs2eNTLpSmM6Nzqo4V80/d6jHpnJ1SAI= github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= -github.com/OneOfOne/xxhash v1.2.6 h1:U68crOE3y3MPttCMQGywZOLrTeF5HHJ3/vDBCJn9/bA= github.com/OpenPeeDeeP/depguard v1.0.1/go.mod h1:xsIw86fROiiwelg+jB2uM9PiKihMMmUx/1V+TNhjQvM= -github.com/PuerkitoBio/purell v1.0.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0= github.com/PuerkitoBio/purell v1.1.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0= github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0= -github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE= github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE= github.com/ReneKroon/ttlcache/v2 v2.11.0 h1:OvlcYFYi941SBN3v9dsDcC2N8vRxyHcCmJb3Vl4QMoM= github.com/ReneKroon/ttlcache/v2 v2.11.0/go.mod h1:mBxvsNY+BT8qLLd6CuAJubbKo6r0jh3nb5et22bbfGY= @@ -503,7 +480,6 @@ github.com/SermoDigital/jose v0.9.2-0.20161205224733-f6df55f235c2 h1:koK7z0nSsRi github.com/SermoDigital/jose v0.9.2-0.20161205224733-f6df55f235c2/go.mod h1:ARgCUhI1MHQH+ONky/PAtmVHQrP5JlGY0F3poXOp/fA= github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo= github.com/Shopify/sarama v1.22.2-0.20190604114437-cd910a683f9f/go.mod h1:XLH1GYJnLVE0XCr6KdJGVJRTwY30moWNJ4sERjXX6fs= -github.com/Shopify/sarama v1.27.1/go.mod h1:g5s5osgELxgM+Md9Qni9rzo7Rbt+vvFQI4bt/Mc93II= github.com/Shopify/sarama v1.32.0/go.mod h1:+EmJJKZWVT/faR9RcOxJerP+LId4iWdQPBGLy1Y1Njs= github.com/Shopify/sarama v1.33.0/go.mod h1:lYO7LwEBkE0iAeTl94UfPSrDaavFzSFlmn+5isARATQ= github.com/Shopify/sarama v1.37.2 h1:LoBbU0yJPte0cE5TZCGdlzZRmMgMtZU/XgnUKZg9Cv4= @@ -514,12 +490,9 @@ github.com/Shopify/toxiproxy/v2 v2.3.0/go.mod h1:KvQTtB6RjCJY4zqNJn7C7JDFgsG5uoH github.com/Shopify/toxiproxy/v2 v2.5.0 h1:i4LPT+qrSlKNtQf5QliVjdP08GyAH8+BUIc9gT0eahc= github.com/Showmax/go-fqdn v1.0.0 h1:0rG5IbmVliNT5O19Mfuvna9LL7zlHyRfsSvBPZmF9tM= github.com/Showmax/go-fqdn v1.0.0/go.mod h1:SfrFBzmDCtCGrnHhoDjuvFnKsWjEQX/Q9ARZvOrJAko= -github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6/go.mod h1:3eOhrUMpNV+6aFIbp5/iudMxNCF27Vw2OZgy4xEx0Fg= github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d/go.mod h1:3eOhrUMpNV+6aFIbp5/iudMxNCF27Vw2OZgy4xEx0Fg= -github.com/StackExchange/wmi v1.2.1/go.mod h1:rcmrprowKIVzvc+NUiLncP2uuArMWLCbu9SBzvHz7e8= github.com/VividCortex/gohistogram v1.0.0 h1:6+hBz+qvs0JOrrNhhmR7lFxo5sINxBCGXrdtl/UvroE= github.com/VividCortex/gohistogram v1.0.0/go.mod h1:Pf5mBqqDxYaXu3hDrrU+w6nw50o/4+TcAqDqk/vUH7g= -github.com/aerospike/aerospike-client-go v1.27.0/go.mod h1:zj8LBEnWBDOVEIJt8LvaRvDG5ARAoa5dBeHaB472NRc= github.com/aerospike/aerospike-client-go/v6 v6.7.0 h1:La2669CfR3VgwGtgqeIB1U6EUxQOWyFoyQPM/WTM8ws= github.com/aerospike/aerospike-client-go/v6 v6.7.0/go.mod h1:Do5/flmgSo2X32YLGAYd6o5e/U2gOSpgEhrIGyOS3UI= github.com/afex/hystrix-go v0.0.0-20180502004556-fa1af6a1f4f5/go.mod h1:SkGFH1ia65gfNATL8TAiHDNxPzPdmEL5uirI2Uyuz6c= @@ -537,11 +510,8 @@ github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk5 github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 h1:s6gZFSlWYmbqAuRjVTiNNhvNRfY2Wxp9nhfyel4rklc= github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137/go.mod h1:OMCwj8VM1Kc9e19TLln2VL61YJF0x1XFtfdL4JdbSyE= github.com/alexkohler/prealloc v1.0.0/go.mod h1:VetnK3dIgFBBKmg0YnD9F9x6Icjd+9cvfHR56wJVlKE= -github.com/alicebob/gopher-json v0.0.0-20200520072559-a9ecdc9d1d3a h1:HbKu58rmZpUGpz5+4FfNmIU+FmZg2P3Xaj2v2bfNWmk= -github.com/alicebob/miniredis/v2 v2.22.0 h1:lIHHiSkEyS1MkKHCHzN+0mWrA4YdbGdimE5iZ2sHSzo= github.com/aliyun/aliyun-log-go-sdk v0.1.41 h1:aitUXlMIzMb8KZvwAqrJ77Nad9FOpAFi1Ju7rjFOYCM= github.com/aliyun/aliyun-log-go-sdk v0.1.41/go.mod h1:1QQ59pEJiVVXqKgbHcU6FWIgxT5RKBt+CT8AiQ2bEts= -github.com/amir/raidman v0.0.0-20170415203553-1ccc43bfb9c9/go.mod h1:eliMa/PW+RDr2QLWRmLH1R1ZA4RInpmvOzDDXtaIZkc= 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 h1:V7DdXeJtZscaqfNuAdSRuRFzuiKlHSC/Zh3zl9qY3JY= @@ -564,39 +534,29 @@ github.com/apache/thrift v0.17.0/go.mod h1:OLxhMRJxomX+1I/KUw03qoV3mMz16BwaKI+d4 github.com/ardielle/ardielle-go v1.5.2 h1:TilHTpHIQJ27R1Tl/iITBzMwiUGSlVfiVhwDNGM3Zj4= github.com/ardielle/ardielle-go v1.5.2/go.mod h1:I4hy1n795cUhaVt/ojz83SNVCYIGsAFAONtv2Dr7HUI= github.com/ardielle/ardielle-tools v1.5.4/go.mod h1:oZN+JRMnqGiIhrzkRN9l26Cej9dEx4jeNG6A+AdkShk= -github.com/aristanetworks/glog v0.0.0-20191112221043-67e8567f59f3/go.mod h1:KASm+qXFKs/xjSoWn30NrWBBvdTTQq+UjkhjEJHfSFA= -github.com/aristanetworks/goarista v0.0.0-20190325233358-a123909ec740/go.mod h1:D/tb0zPVXnP7fmsLZjtdUhSsumbK/ij54UXjjVgMGxQ= github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY= -github.com/armon/go-metrics v0.3.0/go.mod h1:zXjbSimjXTd7vOpY8B0/2LpvNvDoXBuplAD+gJD3GYs= github.com/armon/go-metrics v0.3.9/go.mod h1:4O98XIr/9W0sxpJ8UaYkvjk10Iff7SnFrb4QAOwNTFc= github.com/armon/go-metrics v0.3.10/go.mod h1:4O98XIr/9W0sxpJ8UaYkvjk10Iff7SnFrb4QAOwNTFc= github.com/armon/go-metrics v0.4.0 h1:yCQqn7dwca4ITXb+CbubHmedzaQYHhNhrEXLYUeEe8Q= github.com/armon/go-metrics v0.4.0/go.mod h1:E6amYzXo6aW1tqzoZGT755KkbgrJsSdpwZ+3JqfkOG4= -github.com/armon/go-proxyproto v0.0.0-20190211145416-68259f75880e/go.mod h1:QmP9hvJ91BbJmGVGSbutW19IC0Q9phDCLGaomwTJbgU= 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/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs= github.com/aryann/difflib v0.0.0-20170710044230-e206f873d14a/go.mod h1:DAHtR1m6lCRdSC2Tm3DSWRPvIPr6xNKyeHdqDQSQT+A= github.com/asaskevich/govalidator v0.0.0-20180720115003-f9ffefc3facf/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY= github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY= github.com/asaskevich/govalidator v0.0.0-20200108200545-475eaeb16496/go.mod h1:oGkLhpf+kjZl6xBf758TQhh5XrAeiJv/7FRz/2spLIg= github.com/asaskevich/govalidator v0.0.0-20200907205600-7a23bdc65eef/go.mod h1:WaHUgvxTVq04UNunO+XhnAqY/wQc+bxr74GqbsZ/Jqw= -github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d h1:Byv0BzEl3/e6D5CLfI0j/7hiIEtvGVFPCZ7Ei2oq8iQ= github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d/go.mod h1:WaHUgvxTVq04UNunO+XhnAqY/wQc+bxr74GqbsZ/Jqw= github.com/ashanbrown/forbidigo v1.1.0/go.mod h1:vVW7PEdqEFqapJe95xHkTfB1+XvZXBFg8t0sG2FIxmI= github.com/ashanbrown/makezero v0.0.0-20201205152432-7b7cdbb3025a/go.mod h1:oG9Dnez7/ESBqc4EdrdNlryeo7d0KcW1ftXHm7nU/UU= github.com/aws/aws-lambda-go v1.13.3/go.mod h1:4UKl9IzQMoD+QF79YdCuzCwp8VbmG4VAQwij/eHl5CU= -github.com/aws/aws-lambda-go v1.27.0/go.mod h1:jJmlefzPfGnckuHdXX7/80O3BvUUi12XOkbv4w9SGLU= -github.com/aws/aws-sdk-go v1.13.10/go.mod h1:ZRmQr0FajVIyZ4ZzBYKG5P3ZqPz9IHG41ZoMu1ADI3k= github.com/aws/aws-sdk-go v1.27.0/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= github.com/aws/aws-sdk-go v1.32.6/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0= -github.com/aws/aws-sdk-go v1.34.34/go.mod h1:H7NKnBqNVzoTJpGfLrQkkD+ytBA93eiDYi/+8rV9s48= github.com/aws/aws-sdk-go v1.35.24/go.mod h1:tlPOdRjfxPBpNIwqDj61rmsnA85v9jc0Ps9+muhnW+k= 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.11/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo= github.com/aws/aws-sdk-go v1.44.155 h1:PMHMuUS0atPD4LhiXuYrLasrlIm4u3lpNQBl9h+Lr2s= github.com/aws/aws-sdk-go v1.44.155/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= github.com/aws/aws-sdk-go-v2 v0.18.0/go.mod h1:JWVYvqSMppoMJC0x5wdwiImzgXTI9FuZwxzkQq9wy+g= @@ -665,10 +625,8 @@ github.com/aws/smithy-go v1.8.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAm github.com/aws/smithy-go v1.13.3/go.mod h1:Tg+OJXh4MB2R/uN61Ko2f6hTZwB/ZYGOtib8J3gBHzA= github.com/aws/smithy-go v1.13.5 h1:hgz0X/DX0dGqTYpGALqXJoRKRj5oQ7150i5FdTePzO8= github.com/aws/smithy-go v1.13.5/go.mod h1:Tg+OJXh4MB2R/uN61Ko2f6hTZwB/ZYGOtib8J3gBHzA= -github.com/axiomhq/hyperloglog v0.0.0-20180317131949-fe9507de0228/go.mod h1:IOXAcuKIFq/mDyuQ4wyJuJ79XLMsmLM+5RdQ+vWrL7o= 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= github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= github.com/benbjohnson/clock v1.3.0 h1:ip6w0uFQkncKQ979AypyG0ER7mqUSBdKLOgAle/AT8A= github.com/benbjohnson/clock v1.3.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= @@ -678,14 +636,11 @@ 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/bitly/go-hostpool v0.0.0-20171023180738-a3a6125de932/go.mod h1:NOuUCSz6Q9T7+igc/hlvDOUdtWKryOrtFyIVABv/p7k= -github.com/bitly/go-hostpool v0.1.0/go.mod h1:4gOCgp6+NZnVqlKyZ/iBZFTAJKembaVENUpMkpg42fw= github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c/go.mod h1:MKsuJmJgSg28kpZDP6UIiPt0e0Oz0kqKNGyRaWEPv84= github.com/bketelsen/crypt v0.0.4/go.mod h1:aI6NrJ0pMGgvZKL1iVgXLnfIFJtfV+bKCoqOes/6LfM= github.com/bkielbasa/cyclop v1.2.0/go.mod h1:qOI0yy6A7dYC4Zgsa72Ppm9kONl0RoIlPbzot9mhmeI= github.com/blang/semver v3.5.1+incompatible h1:cQNTCjp13qL8KC3Nbxr/y2Bqb63oX6wdnnjpJbkM4JQ= github.com/blang/semver v3.5.1+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk= -github.com/bmatcuk/doublestar v1.2.2 h1:oC24CykoSAB8zd7XgruHo33E0cHJf/WhQA/7BeXj+x0= -github.com/bmatcuk/doublestar v1.2.2/go.mod h1:wiQtGV+rzVYxB7WIlirSN++5HPtPlXEo9MEoZQC/PmE= github.com/bmatcuk/doublestar/v4 v4.4.0 h1:LmAwNwhjEbYtyVLzjcP/XeVw4nhuScHGkF/XWXnvIic= github.com/bmatcuk/doublestar/v4 v4.4.0/go.mod h1:xBQ8jztBU6kakFMg+8WGxn0c6z1fTSPVIjEY1Wr7jzc= github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869/go.mod h1:Ekp36dRnpXw/yCqJaO+ZrUyxD+3VXMFFr56k5XYrpB4= @@ -693,16 +648,10 @@ github.com/bmizerany/perks v0.0.0-20141205001514-d9a9656a3a4b/go.mod h1:ac9efd0D github.com/bombsimon/wsl/v3 v3.2.0/go.mod h1:st10JtZYLE4D5sC7b8xV4zTKZwAQjCH/Hy2Pm1FNZIc= github.com/boombuler/barcode v1.0.0/go.mod h1:paBWMcWSl3LHKBqUq+rly7CNSldXjb2rDl3JlRe0mD8= github.com/bsm/sarama-cluster v2.1.13+incompatible/go.mod h1:r7ao+4tTNXvWm+VRpRJchr2kQhqxgmAp2iEX5W96gMM= -github.com/buger/jsonparser v1.1.1 h1:2PnMjfWD7wBILjqQbt530v576A/cAbQvEW9gGIpYMUs= -github.com/buger/jsonparser v1.1.1/go.mod h1:6RYKKt7H4d4+iWqouImQ9R2FZql3VbhNgx27UK13J/0= -github.com/c2h5oh/datasize v0.0.0-20200112174442-28bbd4740fee h1:BnPxIde0gjtTnc9Er7cxvBk8DHLWhEux0SxayC8dP6I= -github.com/c2h5oh/datasize v0.0.0-20200112174442-28bbd4740fee/go.mod h1:S/7n9copUssQ56c7aAgHqftWO4LTf4xY6CGWt8Bc+3M= -github.com/caio/go-tdigest v2.3.0+incompatible/go.mod h1:sHQM/ubZStBUmF1WbB8FAm8q9GjDajLC5T7ydxE3JHI= github.com/caio/go-tdigest v3.1.0+incompatible h1:uoVMJ3Q5lXmVLCCqaMGHLBWnbGoN6Lpu7OAUPR60cds= github.com/caio/go-tdigest v3.1.0+incompatible/go.mod h1:sHQM/ubZStBUmF1WbB8FAm8q9GjDajLC5T7ydxE3JHI= github.com/casbin/casbin/v2 v2.1.2/go.mod h1:YcPU1XXisHhLzuxH9coDNf2FbKpjGlbCg3n9yuLkIJQ= github.com/casbin/casbin/v2 v2.37.0/go.mod h1:vByNa/Fchek0KZUgG5wEsl7iFsiviAYKRtgrQfcJqHg= -github.com/cenkalti/backoff v2.0.0+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM= github.com/cenkalti/backoff v2.2.1+incompatible h1:tNowT99t7UNflLxfYYSlKYsBpXdEet03Pg2g16Swow4= github.com/cenkalti/backoff v2.2.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM= github.com/cenkalti/backoff/v4 v4.1.1/go.mod h1:scbssz8iZGpm3xbr14ovlUdkxfGXNInqkPWOWmG2CLw= @@ -714,7 +663,6 @@ github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA github.com/census-instrumentation/opencensus-proto v0.3.0/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/census-instrumentation/opencensus-proto v0.4.1 h1:iKLQ0xPNFxR/2hzXZMrBo8f1j86j5WHzznCCQxV/b8g= github.com/census-instrumentation/opencensus-proto v0.4.1/go.mod h1:4T9NM4+4Vw91VeyqjLS6ao50K5bOcLKN6Q42XnYaRYw= -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= @@ -734,7 +682,6 @@ github.com/cilium/ebpf v0.8.1 h1:bLSSEbBLqGPXxls55pGr5qWZaTqcmfDJHhou7t254ao= github.com/cilium/ebpf v0.8.1/go.mod h1:f5zLIM0FSNuAkSyLAN7X+Hy6yznlF1mNiWUMfxMtrgk= github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod h1:nmEj6Dob7S7YxXgwXpfOuvO54S+tGdZdw9fuRZt25Ag= github.com/circonus-labs/circonusllhist v0.1.3/go.mod h1:kMXHVDlOchFAehlya5ePtbp5jckzBHf4XRpQvBOLI+I= -github.com/cisco-ie/nx-telemetry-proto v0.0.0-20190531143454-82441e232cf6/go.mod h1:ugEfq4B8T8ciw/h5mCkgdiDRFS4CkqqhH2dymDB4knc= github.com/clbanning/mxj v1.8.4/go.mod h1:BVjHeAH+rl9rs6f+QIpeRl0tfu10SXn1pUSa5PVGJng= github.com/clbanning/x2j v0.0.0-20191024224557-825249438eec/go.mod h1:jMjuTZXRI4dUb/I5gc9Hdhagfvm9+RyrPryS/auMzxE= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= @@ -759,12 +706,10 @@ github.com/cockroachdb/apd v1.1.0/go.mod h1:8Sl8LxpKi29FqWXR16WEFZRNSz3SoPzUzeMe github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8= github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI= github.com/codahale/rfc6979 v0.0.0-20141003034818-6a90f24967eb/go.mod h1:ZjrT6AXHbDs86ZSdt/osfBi5qfexBrKUdONk989Wnk4= -github.com/codegangsta/negroni v1.0.0/go.mod h1:v0y3T5G7Y1UlFfyxFn/QLRU4a2EuNau2iZY63YTKWo0= github.com/containerd/cgroups v1.0.4 h1:jN/mbWBEaz+T1pi5OFtnkQ+8qnmEbAr1Oo1FRm5B0dA= github.com/containerd/cgroups v1.0.4/go.mod h1:nLNQtsF7Sl2HxNebu77i1R0oDlhiTG+kO4JTrUzo6IA= github.com/containerd/console v1.0.3 h1:lIr7SlA5PxZyMV30bDW0MGbiOPXwc63yRuCP0ARubLw= github.com/containerd/console v1.0.3/go.mod h1:7LqA/THxQ86k76b8c/EMSiaJ3h1eZkMkXar0TQ1gf3U= -github.com/containerd/containerd v1.4.1/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA= github.com/containerd/containerd v1.6.8 h1:h4dOFDwzHmqFEP754PgfgTeVXFnLiRc6kiqC7tplDJs= github.com/containerd/ttrpc v1.1.0 h1:GbtyLRxb0gOLR0TYQWt3O6B0NvT8tMdorEHqIQo/lWI= github.com/containerd/ttrpc v1.1.0/go.mod h1:XX4ZTnoOId4HklF4edwc4DcqskFZuvXB1Evzy5KFQpQ= @@ -777,21 +722,15 @@ github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8Nz github.com/coreos/go-oidc v2.2.1+incompatible h1:mh48q/BqXqgjVHpy2ZY7WnWAbenxRjsz9N1i1YxjHAk= github.com/coreos/go-oidc v2.2.1+incompatible/go.mod h1:CgnwVTmzoESiwO9qyAFEMiHoZ1nMCKZlZ9V6mm3/LKc= github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= -github.com/coreos/go-semver v0.3.0 h1:wkHLiw0WNATZnSG7epLsujiMCgPAc9xhjJ4tgnAxmfM= github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= -github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf h1:iW4rZ826su+pqaw19uhpSCzhj44qo35pNgKFGqzDKkU= -github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= github.com/coreos/go-systemd/v22 v22.4.0 h1:y9YHcjnjynCd/DVbg5j9L/33jQM3MxJlbj/zWskzfGU= github.com/coreos/go-systemd/v22 v22.4.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= -github.com/couchbase/go-couchbase v0.0.0-20180501122049-16db1f1fe037/go.mod h1:TWI8EKQMs5u5jLKW/tsb9VwauIrMIxQG1r5fMsswK5U= -github.com/couchbase/gomemcached v0.0.0-20180502221210-0da75df14530/go.mod h1:srVSlQLB8iXBVXHgnqemxUXqN6FCvClgCMPCsjBDR7c= -github.com/couchbase/goutils v0.0.0-20180530154633-e865a1461c8a/go.mod h1:BQwMFlJzDjFDG3DJUdU0KORxn88UlsOULuxLExMh3Hs= github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE= github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= @@ -802,21 +741,17 @@ github.com/creack/pty v1.1.11/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ github.com/crossdock/crossdock-go v0.0.0-20160816171116-049aabb0122b/go.mod h1:v9FBN7gdVTpiD/+LZ7Po0UKvROyT87uLVxTHVky/dlQ= github.com/cyphar/filepath-securejoin v0.2.3 h1:YX6ebbZCZP7VkM3scTTokDgBL2TY741X51MTk3ycuNI= github.com/cyphar/filepath-securejoin v0.2.3/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxGGx79pTxQpKOJNYHHl4= -github.com/cyriltovena/cloudflare-go v0.27.1-0.20211118103540-ff77400bcb93 h1:PEBeRA25eDfHWkXNJs0HOnMhjIuKMcxKg/Z3VeuoRbU= -github.com/cyriltovena/cloudflare-go v0.27.1-0.20211118103540-ff77400bcb93/go.mod h1:sPWL/lIC6biLEdyGZwBQ1rGQKF1FhM7N60fuNiFdYTI= github.com/daixiang0/gci v0.2.8/go.mod h1:+4dZ7TISfSmqfAGv59ePaHfNzgGtIkHAhhdKggP1JAc= github.com/danieljoos/wincred v1.0.2/go.mod h1:SnuYRW9lp1oJrZX/dXJqr0cPK5gYXqx3EJbmjhLdK9U= github.com/danieljoos/wincred v1.1.2 h1:QLdCxFs1/Yl4zduvBdcHB8goaYk9RARS2SgLLRuAyr0= github.com/danieljoos/wincred v1.1.2/go.mod h1:GijpziifJoIBfYh+S7BbkdUTU4LfM+QnGqR5Vl2tAx0= github.com/dannykopping/go-kit-log v0.2.2-0.20221002180827-5591c1641b6b h1:G8g9mAKEj9O3RsU6Hd/ow6lIcHarlcUl5omV6sFKEOU= github.com/dannykopping/go-kit-log v0.2.2-0.20221002180827-5591c1641b6b/go.mod h1:NwTd00d/i8cPZ3xOwwiv2PO5MOcx78fFErGNcVmBjv0= -github.com/davecgh/go-spew v0.0.0-20151105211317-5215b55f46b2/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v0.0.0-20161028175848-04cdfd42973b/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= 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/denis-tingajkin/go-header v0.4.2/go.mod h1:eLRHAVXzE5atsKAnNRDB90WHCFFnBUn4RN0nRcs1LJA= -github.com/denisenkom/go-mssqldb v0.0.0-20190707035753-2be1aa521ff4/go.mod h1:zAg7JM8CkOJ43xKXIj7eRO9kmWm/TW578qo+oDO6tuM= github.com/denisenkom/go-mssqldb v0.12.2 h1:1OcPn5GBIobjWNd+8yjfHNIaFX14B1pWI3F9HZy5KXw= github.com/denisenkom/go-mssqldb v0.12.2/go.mod h1:lnIw1mZukFRZDJYQ0Pb833QS2IaC3l5HkEfra2LJ+sk= github.com/dennwc/varint v1.0.0 h1:kGNFFSSw8ToIy3obO/kKr8U9GZYUAxQEVuix4zfDWzE= @@ -832,13 +767,9 @@ github.com/dgraph-io/ristretto v0.1.0/go.mod h1:fux0lOrBhrVCJd3lcTHsIJhq1T2rokOu github.com/dgraph-io/ristretto v0.1.1 h1:6CWw5tJNgpegArSHpNHJKldNeq03FQCwYvfMVWajOK8= github.com/dgraph-io/ristretto v0.1.1/go.mod h1:S1GPSBCYCIhmVNfcth17y2zZtQT6wzkzgwUve0VDWWA= github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= -github.com/dgrijalva/jwt-go/v4 v4.0.0-preview1/go.mod h1:+hnT3ywWDTAFrW5aE+u2Sa/wT555ZqwoCS+pk3p6ry4= github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw= github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 h1:fAjc9m62+UWV/WAFKLNi6ZS0675eEUC9y3AlwSbQu1Y= github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw= -github.com/dgryski/go-metro v0.0.0-20180109044635-280f6062b5bc/go.mod h1:c9O8+fpSOX1DM8cPNSkX/qsBWdkD4yd2dpciOWQjpBw= -github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78= -github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc= github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no= github.com/digitalocean/godo v1.88.0 h1:SAEdw63xOMmzlwCeCWjLH1GcyDPUjbSAR1Bh7VELxzc= github.com/digitalocean/godo v1.88.0/go.mod h1:NRpFznZFvhHjBoqZAaOD3khVzsJ3EibzKqFL4R60dmA= @@ -850,14 +781,11 @@ github.com/dimfeld/httptreemux v5.0.1+incompatible/go.mod h1:rbUlSV+CCpv/SuqUTP/ github.com/dnaeon/go-vcr v1.1.0/go.mod h1:M7tiix8f0r6mKKJ3Yq/kqU1OYf3MnfmBWVbPx/yU9ko= github.com/dnaeon/go-vcr v1.2.0 h1:zHCHvJYTMh1N7xnV7zf1m1GPBF9Ad0Jk/whtQ1663qI= github.com/dnaeon/go-vcr v1.2.0/go.mod h1:R4UdLID7HZT3taECzJs4YgbbH6PIGXB6W/sc5OLb6RQ= -github.com/docker/distribution v2.6.0-rc.1.0.20170726174610-edc3ab29cdff+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= github.com/docker/distribution v2.8.1+incompatible h1:Q50tZOPR6T/hjNsyc9g8/syEs6bk8XXApsHjKukMl68= github.com/docker/distribution v2.8.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= -github.com/docker/docker v17.12.0-ce-rc1.0.20200916142827-bd33bbf0497b+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/docker v20.10.18+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/docker v20.10.21+incompatible h1:UTLdBmHk3bEY+w8qeO5KttOhy6OmXWsl/FEet9Uswog= github.com/docker/docker v20.10.21+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= -github.com/docker/go-connections v0.3.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec= github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec= github.com/docker/go-connections v0.4.1-0.20210727194412-58542c764a11 h1:IPrmumsT9t5BS7XcPhgsCTlkWbYg80SEXUzDpReaU6Y= github.com/docker/go-connections v0.4.1-0.20210727194412-58542c764a11/go.mod h1:a6bNUGTbQBsY6VRHTr4h/rkOXjl244DyRD0tx3fgq4Q= @@ -865,8 +793,6 @@ github.com/docker/go-units v0.3.3/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDD 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/docker/libnetwork v0.8.0-dev.2.0.20181012153825-d7b61745d166/go.mod h1:93m0aTqz6z+g32wla4l4WxTrdtvBRmVzYRkYvasA5Z8= -github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod h1:Qh8CwZgvJUkLughtfhJv5dyTYa91l1fOUCrgjqmcifM= github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3ebgob9U8Nd0kOddGdZWjyMGR8Wziv+TBNwSE= github.com/dropbox/godropbox v0.0.0-20180512210157-31879d3884b9 h1:NAvZb7gqQfLSNBPzVsvI7eZMosXtg2g2kxXrei90CtU= github.com/dropbox/godropbox v0.0.0-20180512210157-31879d3884b9/go.mod h1:glr97hP/JuXb+WMYCizc4PIFuzw1lCR97mwbe1VVXhQ= @@ -876,7 +802,6 @@ github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25Kn github.com/dvsekhvalnov/jose2go v0.0.0-20200901110807-248326c1351b/go.mod h1:7BvyPhdbLxMXIYTFPLsyJRFMsKmOZnQmzh6Gb+uquuM= github.com/dvsekhvalnov/jose2go v1.5.0 h1:3j8ya4Z4kMCwT5nXIKFSV84YS+HdqSSO0VsTQxaLAeM= github.com/dvsekhvalnov/jose2go v1.5.0/go.mod h1:QsHjhyTlD/lAVqn/NSbVZmSCGeDehTB/mPZadG+mhXU= -github.com/dvyukov/go-fuzz v0.0.0-20210103155950-6a8e9d1f2415/go.mod h1:11Gm+ccJnvAhCNLlf5+cS9KjtbaD5I5zaZpFMsTHWTw= github.com/dynatrace-oss/dynatrace-metric-utils-go v0.5.0 h1:wHGPJSXvwKQVf/XfhjUPyrhpcPKWNy8F3ikH+eiwoBg= github.com/dynatrace-oss/dynatrace-metric-utils-go v0.5.0/go.mod h1:PseHFo8Leko7J4A/TfZ6kkHdkzKBLUta6hRZR/OEbbc= github.com/eapache/go-resiliency v1.1.0/go.mod h1:kFI+JgMyC7bLPUVY133qvEBtVayf5mFgVsvEsIPBvNs= @@ -887,10 +812,7 @@ github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21 h1:YEetp8 github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1:+020luEh2TKB4/GOp8oxxtq0Daoen/Cii55CzbTV6DU= github.com/eapache/queue v1.1.0 h1:YOEu7KNc61ntiQlcEeUIoDTJ2o8mQznoNvUhiigpIqc= github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I= -github.com/eclipse/paho.mqtt.golang v1.2.0/go.mod h1:H9keYFcgq3Qr5OUJm/JZI/i6U7joQ8SYLhZwfeOo6Ts= github.com/edsrzf/mmap-go v1.0.0/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaBNrHW5M= -github.com/edsrzf/mmap-go v1.1.0 h1:6EUwBLQ/Mcr1EYLE4Tn1VdW1A4ckqCQWZBw8Hr0kjpQ= -github.com/edsrzf/mmap-go v1.1.0/go.mod h1:19H/e8pUPLicwkyNgOykDXkJ9F0MHE+Z52B8EIth78Q= github.com/elastic/elastic-transport-go/v8 v8.0.0-20211216131617-bbee439d559c/go.mod h1:87Tcz8IVNe6rVSLdBux1o/PEItLtyabHU3naC7IoqKI= github.com/elastic/elastic-transport-go/v8 v8.1.0 h1:NeqEz1ty4RQz+TVbUrpSU7pZ48XkzGWQj02k5koahIE= github.com/elastic/elastic-transport-go/v8 v8.1.0/go.mod h1:87Tcz8IVNe6rVSLdBux1o/PEItLtyabHU3naC7IoqKI= @@ -898,7 +820,6 @@ github.com/elastic/go-elasticsearch/v8 v8.5.0 h1:p6j6RFztHvkIg0NaUlfR0OnRmVdCG6Z github.com/elastic/go-elasticsearch/v8 v8.5.0/go.mod h1:Usvydt+x0dv9a1TzEUaovqbJor8rmOHy5dSmPeMAE2k= github.com/elastic/go-structform v0.0.10 h1:oy08o/Ih2hHTkNcRY/1HhaYvIp5z6t8si8gnCJPDo1w= github.com/elastic/go-structform v0.0.10/go.mod h1:CZWf9aIRYY5SuKSmOhtXScE5uQiLZNqAFnwKR4OrIM4= -github.com/elazarl/goproxy v0.0.0-20170405201442-c4fc26588b6e/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc= github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc= github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs= github.com/emicklei/go-restful v2.9.5+incompatible/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs= @@ -920,11 +841,9 @@ github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7 github.com/envoyproxy/protoc-gen-validate v0.6.7/go.mod h1:dyJXwwfPK2VSqiB9Klm1J6romD608Ba7Hij42vrOBCo= github.com/envoyproxy/protoc-gen-validate v0.6.13 h1:TvDcILLkjuZV3ER58VkBmncKsLUBqBDxra/XctCzuMM= github.com/envoyproxy/protoc-gen-validate v0.6.13/go.mod h1:qEySVqXrEugbHKvmhI8ZqtQi75/RHSSRNpffvB4I6Bw= -github.com/ericchiang/k8s v1.2.0/go.mod h1:/OmBgSq2cd9IANnsGHGlEz27nwMZV2YxlpXuQtU3Bz4= github.com/esimonov/ifshort v1.0.1/go.mod h1:yZqNJUrNn20K8Q9n2CrjTKYyVEmX209Hgu+M1LBpeZE= 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.2.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= 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/facebook/time v0.0.0-20220713225404-f7a0d7702d50 h1:3fALCgsB+zI8Bxlv4ph4lCgt1CEQHIdU5sWxbkaMkuc= @@ -933,8 +852,6 @@ github.com/facebookgo/stack v0.0.0-20160209184415-751773369052 h1:JWuenKqqX8nojt github.com/facebookgo/stack v0.0.0-20160209184415-751773369052/go.mod h1:UbMTZqLaRiH3MsBH8va0n7s1pQYcu3uTb8G4tygF4Zg= github.com/facebookgo/stackerr v0.0.0-20150612192056-c2fcf88613f4 h1:fP04zlkPjAGpsduG7xN3rRkxjAqkJaIQnnkNYYw/pAk= github.com/facebookgo/stackerr v0.0.0-20150612192056-c2fcf88613f4/go.mod h1:SBHk9aNQtiw4R4bEuzHjVmZikkUKCnO1v3lPQ21HZGk= -github.com/facette/natsort v0.0.0-20181210072756-2cd4dd1e2dcb h1:IT4JYU7k4ikYg1SCxNI1/Tieq/NFvh6dzLdgi7eu0tM= -github.com/facette/natsort v0.0.0-20181210072756-2cd4dd1e2dcb/go.mod h1:bH6Xx7IW64qjjJq8M2u4dxNaBiDfKK+z/3eGDpXEQhc= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU= github.com/fatih/color v1.10.0/go.mod h1:ELkj/draVOlAH/xkhN6mQ50Qd0MPOk5AAr3maGEBuJM= @@ -979,13 +896,9 @@ github.com/gdamore/encoding v1.0.0/go.mod h1:alR0ol34c49FCSBLjhosxzcPHQbf2trDkoo github.com/gdamore/tcell v1.3.0/go.mod h1:Hjvr+Ofd+gLglo7RYKxxnzCBmev3BzsS67MebKS4zMM= github.com/getsentry/sentry-go v0.16.0 h1:owk+S+5XcgJLlGR/3+3s6N4d+uKwqYvh/eS0AIMjPWo= github.com/getsentry/sentry-go v0.16.0/go.mod h1:ZXCloQLj0pG7mja5NK6NPf2V4A88YJ4pNlc2mOHwh6Y= -github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= -github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32/go.mod h1:GIjDIg/heH5DOkXY3YJ/wNhfHsQHoXGjl8G8amsYQ1I= -github.com/glinton/ping v0.1.4-0.20200311211934-5ac87da8cd96/go.mod h1:uY+1eqFUyotrQxF1wYFNtMeHp/swbYRsoGzfcPZ8x3o= github.com/globalsign/mgo v0.0.0-20180905125535-1ca0a4f7cbcb/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q= github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q= -github.com/go-chi/chi v4.1.2+incompatible/go.mod h1:eB3wogJHnLi3x/kFX2A+IbTBlXxmMeXJVKy9tTv1XzQ= github.com/go-critic/go-critic v0.5.4/go.mod h1:cjB4YGw+n/+X8gREApej7150Uyy1Tg8If6F2XOAUXNE= github.com/go-errors/errors v1.4.2 h1:J6MZopCL4uSllY1OfXM374weqZFFItUbrImctkmUxIA= github.com/go-faster/city v1.0.1 h1:4WAxSZ3V2Ws4QRDrscLEDcibJY8uf41H6AhXDrNDcGw= @@ -999,7 +912,6 @@ github.com/go-fonts/stix v0.1.0/go.mod h1:w/c1f0ldAUlJmLBvlbkvVXLAD+tAMqobIIQpmn 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-ini/ini v1.33.0/go.mod h1:ByCAeIL28uOIIG0E3PJtZPDL8WnHpFKFOtgjp+3Ies8= github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-kit/kit v0.10.0/go.mod h1:xUsJbQ/Fp4kEt7AFgCuvyX4a71u8h9jB8tj/ORgOZ7o= @@ -1021,10 +933,7 @@ 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/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= -github.com/go-ole/go-ole v1.2.1/go.mod h1:7FAglXiTm7HKlQRDeOQ6ZNUHidzCWXuZWq/1dTyBNF8= github.com/go-ole/go-ole v1.2.4/go.mod h1:XCwSNxSkXRo4vlyPy93sltvi/qJq0jqQhjqQNIwKuxM= -github.com/go-ole/go-ole v1.2.5/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0= -github.com/go-ole/go-ole v1.2.6-0.20210915003542-8b1f7f90f6b1/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0= github.com/go-ole/go-ole v1.2.6 h1:/Fpf6oFPoeFik9ty7siob0G6Ke8QvQEuVcuChpwXzpY= github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0= github.com/go-openapi/analysis v0.0.0-20180825180245-b006789cd277/go.mod h1:k70tL6pCuVxPJOHXQ+wIac1FUrvNkHolPie/cLEU6hI= @@ -1034,7 +943,6 @@ github.com/go-openapi/analysis v0.19.2/go.mod h1:3P1osvZa9jKjb8ed2TPng3f0i/UY9sn github.com/go-openapi/analysis v0.19.4/go.mod h1:3P1osvZa9jKjb8ed2TPng3f0i/UY9snX6gxi44djMjk= github.com/go-openapi/analysis v0.19.5/go.mod h1:hkEAkxagaIvIP7VTn8ygJNkd4kAYON2rCu0v0ObL0AU= github.com/go-openapi/analysis v0.19.10/go.mod h1:qmhS3VNFxBlquFJ0RGoDtylO9y4pgTAUNE9AEEMdlJQ= -github.com/go-openapi/analysis v0.21.2 h1:hXFrOYFHUAMQdu6zwAiKKJHJQ8kqZs1ux/ru1P1wLJU= github.com/go-openapi/analysis v0.21.2/go.mod h1:HZwRk4RRisyG8vx2Oe6aqeSQcoxRp47Xkp3+K6q+LdY= github.com/go-openapi/errors v0.17.0/go.mod h1:LcZQpmvG4wyF5j4IhA73wkLFQg+QJXOQHVjmcZxhka0= github.com/go-openapi/errors v0.18.0/go.mod h1:LcZQpmvG4wyF5j4IhA73wkLFQg+QJXOQHVjmcZxhka0= @@ -1043,16 +951,13 @@ github.com/go-openapi/errors v0.19.3/go.mod h1:qX0BLWsyaKfvhluLejVpVNwNRdXZhEbTA github.com/go-openapi/errors v0.19.4/go.mod h1:qX0BLWsyaKfvhluLejVpVNwNRdXZhEbTA4kxxpKBC94= github.com/go-openapi/errors v0.19.8/go.mod h1:cM//ZKUKyO06HSwqAelJ5NsEMMcpa6VpXe8DOa1Mi1M= github.com/go-openapi/errors v0.19.9/go.mod h1:cM//ZKUKyO06HSwqAelJ5NsEMMcpa6VpXe8DOa1Mi1M= -github.com/go-openapi/errors v0.20.2 h1:dxy7PGTqEh94zj2E3h1cUmQQWiM1+aeCROfAr02EmK8= github.com/go-openapi/errors v0.20.2/go.mod h1:cM//ZKUKyO06HSwqAelJ5NsEMMcpa6VpXe8DOa1Mi1M= -github.com/go-openapi/jsonpointer v0.0.0-20160704185906-46af16f9f7b1/go.mod h1:+35s3my2LFTysnkMfxsJBAMHj/DoqoB9knIWoYG/Vk0= github.com/go-openapi/jsonpointer v0.17.0/go.mod h1:cOnomiV+CVVwFLk0A/MExoFMjwdsUdVpsRhURCKh+3M= github.com/go-openapi/jsonpointer v0.18.0/go.mod h1:cOnomiV+CVVwFLk0A/MExoFMjwdsUdVpsRhURCKh+3M= github.com/go-openapi/jsonpointer v0.19.2/go.mod h1:3akKfEdA7DF1sugOqz1dVQHBcuDBPKZGEoHC/NkiQRg= github.com/go-openapi/jsonpointer v0.19.3/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg= github.com/go-openapi/jsonpointer v0.19.5 h1:gZr+CIYByUqjcgeLXnQu2gHYQC9o73G2XUeOFYEICuY= github.com/go-openapi/jsonpointer v0.19.5/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg= -github.com/go-openapi/jsonreference v0.0.0-20160704190145-13c6e3589ad9/go.mod h1:W3Z9FmVs9qj+KR4zFKmDPGiLdk1D9Rlm7cyMvf57TTg= github.com/go-openapi/jsonreference v0.17.0/go.mod h1:g4xxGn04lDIRh0GJb5QlpE3HfopLOL6uZrK/VgnsK9I= github.com/go-openapi/jsonreference v0.18.0/go.mod h1:g4xxGn04lDIRh0GJb5QlpE3HfopLOL6uZrK/VgnsK9I= github.com/go-openapi/jsonreference v0.19.2/go.mod h1:jMjeRr2HHw6nAVajTXJ4eiUwohSTlpa0o73RUL1owJc= @@ -1068,15 +973,12 @@ github.com/go-openapi/loads v0.19.2/go.mod h1:QAskZPMX5V0C2gvfkGZzJlINuP7Hx/4+ix github.com/go-openapi/loads v0.19.3/go.mod h1:YVfqhUCdahYwR3f3iiwQLhicVRvLlU/WO5WPaZvcvSI= github.com/go-openapi/loads v0.19.4/go.mod h1:zZVHonKd8DXyxyw4yfnVjPzBjIQcLt0CCsn0N0ZrQsk= github.com/go-openapi/loads v0.19.5/go.mod h1:dswLCAdonkRufe/gSUC3gN8nTSaB9uaS2es0x5/IbjY= -github.com/go-openapi/loads v0.21.1 h1:Wb3nVZpdEzDTcly8S4HMkey6fjARRzb7iEaySimlDW0= github.com/go-openapi/loads v0.21.1/go.mod h1:/DtAMXXneXFjbQMGEtbamCZb+4x7eGwkvZCvBmwUG+g= github.com/go-openapi/runtime v0.0.0-20180920151709-4f900dc2ade9/go.mod h1:6v9a6LTXWQCdL8k1AO3cvqx5OtZY/Y9wKTgaoP6YRfA= github.com/go-openapi/runtime v0.19.0/go.mod h1:OwNfisksmmaZse4+gpV3Ne9AyMOlP1lt4sK4FXt0O64= github.com/go-openapi/runtime v0.19.4/go.mod h1:X277bwSUBxVlCYR3r7xgZZGKVvBd/29gLDlFGtJ8NL4= github.com/go-openapi/runtime v0.19.15/go.mod h1:dhGWCTKRXlAfGnQG0ONViOZpjfg0m2gUt9nTQPQZuoo= -github.com/go-openapi/runtime v0.23.1/go.mod h1:AKurw9fNre+h3ELZfk6ILsfvPN+bvvlaU/M9q/r9hpk= github.com/go-openapi/runtime v0.23.3/go.mod h1:AKurw9fNre+h3ELZfk6ILsfvPN+bvvlaU/M9q/r9hpk= -github.com/go-openapi/spec v0.0.0-20160808142527-6aced65f8501/go.mod h1:J8+jY1nAiCcj+friV/PDoE1/3eeccG9LYBs0tYvLOWc= github.com/go-openapi/spec v0.17.0/go.mod h1:XkF/MOi14NmjsfZ8VtAKf8pIlbZzyoTvZsdfssdxcBI= github.com/go-openapi/spec v0.18.0/go.mod h1:XkF/MOi14NmjsfZ8VtAKf8pIlbZzyoTvZsdfssdxcBI= github.com/go-openapi/spec v0.19.2/go.mod h1:sCxk3jxKgioEJikev4fgkNmwS+3kuYdJtcsZsD5zxMY= @@ -1085,7 +987,6 @@ github.com/go-openapi/spec v0.19.5/go.mod h1:Hm2Jr4jv8G1ciIAo+frC/Ft+rR2kQDh8JHK github.com/go-openapi/spec v0.19.6/go.mod h1:Hm2Jr4jv8G1ciIAo+frC/Ft+rR2kQDh8JHKHb3gWUSk= github.com/go-openapi/spec v0.20.2/go.mod h1:RW6Xcbs6LOyWLU/mXGdzn2Qc+3aj+ASfI7rvSZh1Vls= github.com/go-openapi/spec v0.20.4/go.mod h1:faYFR1CvsJZ0mNsmsphTMSoRrNV3TEDoAM7FOEWeq8I= -github.com/go-openapi/spec v0.20.6 h1:ich1RQ3WDbfoeTqTAb+5EIxNmpKVJZWBNah9RAT0jIQ= github.com/go-openapi/spec v0.20.6/go.mod h1:2OpW+JddWPrpXSCIX8eOx7lZ5iyuWj3RYR6VaaBKcWA= github.com/go-openapi/strfmt v0.17.0/go.mod h1:P82hnJI0CXkErkXi8IKjPbNBM6lV6+5pLP5l494TcyU= github.com/go-openapi/strfmt v0.18.0/go.mod h1:P82hnJI0CXkErkXi8IKjPbNBM6lV6+5pLP5l494TcyU= @@ -1097,9 +998,7 @@ github.com/go-openapi/strfmt v0.19.5/go.mod h1:eftuHTlB/dI8Uq8JJOyRlieZf+WkkxUuk github.com/go-openapi/strfmt v0.21.0/go.mod h1:ZRQ409bWMj+SOgXofQAGTIo2Ebu72Gs+WaRADcS5iNg= github.com/go-openapi/strfmt v0.21.1/go.mod h1:I/XVKeLc5+MM5oPNN7P6urMOpuLXEcNrCX/rPGuWb0k= github.com/go-openapi/strfmt v0.21.2/go.mod h1:I/XVKeLc5+MM5oPNN7P6urMOpuLXEcNrCX/rPGuWb0k= -github.com/go-openapi/strfmt v0.21.3 h1:xwhj5X6CjXEZZHMWy1zKJxvW9AfHC9pkyUjLvHtKG7o= github.com/go-openapi/strfmt v0.21.3/go.mod h1:k+RzNO0Da+k3FrrynSNN8F7n/peCmQQqbbXjtDfvmGg= -github.com/go-openapi/swag v0.0.0-20160704191624-1d0bd113de87/go.mod h1:DXUve3Dpr1UfpPtxFw+EFuQ41HhCWZfha5jSVRG7C7I= github.com/go-openapi/swag v0.17.0/go.mod h1:AByQ+nYG6gQg71GINrmuDXCPWdL640yX49/kXLo40Tg= github.com/go-openapi/swag v0.18.0/go.mod h1:AByQ+nYG6gQg71GINrmuDXCPWdL640yX49/kXLo40Tg= github.com/go-openapi/swag v0.19.2/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk= @@ -1115,17 +1014,9 @@ github.com/go-openapi/validate v0.19.2/go.mod h1:1tRCw7m3jtI8eNWEEliiAqUIcBztB2K github.com/go-openapi/validate v0.19.3/go.mod h1:90Vh6jjkTn+OT1Eefm0ZixWNFjhtOH7vS9k0lo6zwJo= github.com/go-openapi/validate v0.19.8/go.mod h1:8DJv2CVJQ6kGNpFW6eV9N3JviE1C85nY1c2z52x1Gk4= github.com/go-openapi/validate v0.21.0/go.mod h1:rjnrwK57VJ7A8xqfpAOEKRH8yQSGUriMu5/zuPSQ1hg= -github.com/go-openapi/validate v0.22.0 h1:b0QecH6VslW/TxtpKgzpO1SNG7GU2FsaqKdP1E2T50Y= github.com/go-openapi/validate v0.22.0/go.mod h1:rjnrwK57VJ7A8xqfpAOEKRH8yQSGUriMu5/zuPSQ1hg= -github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4= -github.com/go-playground/locales v0.13.0/go.mod h1:taPMhCMXrRLJO55olJkUXHZBHCxTMfnGwq/HNwmWNS8= -github.com/go-playground/universal-translator v0.17.0/go.mod h1:UkSxE5sNxxRwHyU+Scu5vgOQjsIJAF8j9muTVoKLVtA= -github.com/go-playground/validator/v10 v10.4.1/go.mod h1:nlOn6nFhuKACm19sB/8EGNn9GlaMV7XkbRSipzJ0Ii4= -github.com/go-redis/redis v6.15.9+incompatible/go.mod h1:NAIEuMOZ/fxfXJIrKDQDz8wamY7mA7PouImQ2Jvg6kA= github.com/go-redis/redis/v7 v7.4.1 h1:PASvf36gyUpr2zdOUS/9Zqc80GbM+9BDyiJSJDDOrTI= github.com/go-redis/redis/v7 v7.4.1/go.mod h1:JDNMw23GTyLNC4GZu9njt15ctBQVn7xjRfnwdHj/Dcg= -github.com/go-redis/redis/v8 v8.11.5 h1:AcZZR7igkdvfVmQTPnu9WE37LRrO/YrBH5zWyjDC0oI= -github.com/go-redis/redis/v8 v8.11.5/go.mod h1:gREzHqY1hg6oD9ngVRbLStwAWKhA0FEgq8Jd4h5lpwo= github.com/go-resty/resty/v2 v2.1.1-0.20191201195748-d7b97669fe48 h1:JVrqSeQfdhYRFk24TvhTZWU0q8lfCojxZQFi3Ou7+uY= github.com/go-resty/resty/v2 v2.1.1-0.20191201195748-d7b97669fe48/go.mod h1:dZGr0i9PLlaaTD4H/hoZIDjQ+r6xq8mgbRzHZf7f2J8= github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w= @@ -1176,11 +1067,8 @@ github.com/gobuffalo/packd v0.1.0/go.mod h1:M2Juc+hhDXf/PnmBANFCqx4DM3wRbgDvnVWe github.com/gobuffalo/packr/v2 v2.0.9/go.mod h1:emmyGweYTm6Kdper+iywB6YK5YzuKchGtJQZ0Odn4pQ= github.com/gobuffalo/packr/v2 v2.2.0/go.mod h1:CaAwI0GPIAv+5wKLtv8Afwl+Cm78K/I/VCm/3ptBN+0= github.com/gobuffalo/syncx v0.0.0-20190224160051-33c29581e754/go.mod h1:HhnNqWY95UYwwW3uSASeV7vtgYkT2t16hJgV3AEPUpw= -github.com/goburrow/modbus v0.1.0/go.mod h1:Kx552D5rLIS8E7TyUwQ/UdHEqvX5T8tyiGBTlzMcZBg= -github.com/goburrow/serial v0.1.0/go.mod h1:sAiqG0nRVswsm1C97xsttiYCzSLBmUZ/VSlVLZJ8haA= github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y= github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAkT8= -github.com/goccy/go-yaml v1.9.5/go.mod h1:U/jl18uSupI5rdI2jmuCswEA2htH9eXfferR3KfscvA= github.com/gocql/gocql v0.0.0-20200228163523-cd4b606dd2fb/go.mod h1:DL0ekTmBSTdlNF25Orwt/JMzqIq3EJ4MVa/J/uK64OY= github.com/gocql/gocql v0.0.0-20211222173705-d73e6b1002a7/go.mod h1:3gM2c4D3AnkISwBxGnMMsS8Oy4y2lhbPRsH4xnJrHG8= github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 h1:ZpnhV/YsD2/4cESfV5+Hoeu/iUR3ruzNvZ+yQfO03a0= @@ -1189,25 +1077,18 @@ github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5x github.com/godbus/dbus/v5 v5.0.6 h1:mkgN1ofwASrYnJ5W6U/BxG15eXXXjirgZc7CLqkcaro= github.com/godbus/dbus/v5 v5.0.6/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= github.com/gofrs/flock v0.8.0/go.mod h1:F1TvTiK9OcQqauNUHlbJvyl9Qa1QvF/gOUDKA14jxHU= -github.com/gofrs/uuid v2.1.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= github.com/gofrs/uuid v3.3.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= github.com/gofrs/uuid v4.0.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= github.com/gofrs/uuid v4.2.0+incompatible h1:yyYWMnhkhrKwwr8gAOcOCYxOOscHgDS9yZgBrnJfGa0= github.com/gofrs/uuid v4.2.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= -github.com/gogo/googleapis v0.0.0-20180223154316-0cd9801be74a/go.mod h1:gf4bu3Q80BeJ6H1S1vYPm8/ELATdvryBaNFGgqEef3s= github.com/gogo/googleapis v1.1.0/go.mod h1:gf4bu3Q80BeJ6H1S1vYPm8/ELATdvryBaNFGgqEef3s= github.com/gogo/googleapis v1.4.1 h1:1Yx4Myt7BxzvUr5ldGSbwYiZG6t9wGBZ+8/fX3Wvtq0= github.com/gogo/googleapis v1.4.1/go.mod h1:2lpHqI5OcWCtVElxXnPt+s8oJvMpySlOyM6xDCrzib4= github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.2.0/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= -github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o= -github.com/gogo/protobuf v1.3.0/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o= github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= -github.com/gogo/status v1.0.3/go.mod h1:SavQ51ycCLnc7dGyJxp8YAmudx8xqiVrRf+6IXRsugc= -github.com/gogo/status v1.1.1 h1:DuHXlSFHNKqTQ+/ACf5Vs6r4X/dH2EgIzR9Vr+H65kg= -github.com/gogo/status v1.1.1/go.mod h1:jpG3dM5QPcqu19Hg8lkUhBFBa3TcLs1DG7+2Jqci7oU= github.com/golang-jwt/jwt v3.2.1+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzqecmYZeUEB8OUGHkxJ+I= github.com/golang-jwt/jwt v3.2.2+incompatible h1:IfV12K8xAKAnZqdXVzCZ+TOjboZ2keLg81eXfW3O+oY= github.com/golang-jwt/jwt v3.2.2+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzqecmYZeUEB8OUGHkxJ+I= @@ -1220,7 +1101,6 @@ github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe/go.mod h1:8vg3r2V github.com/golang-sql/sqlexp v0.1.0 h1:ZCD6MBpcuOVfGVqsEmY5/4FtYiKz6tSyUv9LPEDei6A= github.com/golang-sql/sqlexp v0.1.0/go.mod h1:J4ad9Vo8ZCWQ2GMrC4UCQy1JpCbwU9m3EOqtpKwwwHI= github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGwJL78qG/PmXZO1EjYhfJinVAhrmmHX6Z8B9k= -github.com/golang/geo v0.0.0-20190916061304-5b978397cfec/go.mod h1:QZ0nwyI2jOfgRAoBvP+ab5aRr7c9x7lhGEJrKvBwjWI= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= github.com/golang/glog v1.0.0 h1:nfP3RFugxnNRyKgeWd4oI1nYvXpxrx8ck8ZrcizshdQ= github.com/golang/glog v1.0.0/go.mod h1:EWib/APOK0SL3dFbYqvxE3UYd8E6s1ouQ7iEp/0LWV4= @@ -1231,7 +1111,6 @@ github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4er github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE= github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= -github.com/golang/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:tluoj9z5200jBnyusfRPU2LqT6J+DAorxEvtC7LHB+E= 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= @@ -1241,7 +1120,6 @@ github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4= github.com/golang/mock v1.5.0/go.mod h1:CWnOUgYIOo4TcNZ0wHX3YZCqsaM1I1Jvs6v3mP3KVu8= github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs= -github.com/golang/protobuf v0.0.0-20161109072736-4bd1920723d7/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= 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= @@ -1276,12 +1154,10 @@ github.com/golangci/maligned v0.0.0-20180506175553-b1d89398deca/go.mod h1:tvlJhZ github.com/golangci/misspell v0.3.5/go.mod h1:dEbvlSfYbMQDtrpRMQU675gSDLDNa8sCPPChZ7PhiVA= github.com/golangci/revgrep v0.0.0-20210208091834-cd28932614b5/go.mod h1:LK+zW4MpyytAWQRz0M4xnzEk50lSvqDQKfx304apFkY= github.com/golangci/unconvert v0.0.0-20180507085042-28b1c447d1f4/go.mod h1:Izgrg8RkN3rCIMLGE9CyYmU9pY2Jer6DgANEnZ/L/cQ= -github.com/gomodule/redigo v1.8.1/go.mod h1:P9dn9mFrCBvWhGE1wpxx6fgq7BAeLBk+UUUzlpkBYO0= github.com/google/addlicense v0.0.0-20200906110928-a0294312aa76/go.mod h1:EMjYTRimagHs1FwlIqKyX3wAM0u3rA+McvlIIWmSamA= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.1 h1:gK4Kx5IaGY9CD5sPJ36FHiBJ6ZXl0kilRiiCj+jdYp4= -github.com/google/btree v1.0.1/go.mod h1:xXMiIv4Fb/0kKde4SpL7qlzvu5cMJDRkFDxJfI9uaxA= github.com/google/cadvisor v0.46.0 h1:ryTIniqhN8/wR8UA1RuYSXHvsAtdpk/01XwTZtYHekY= github.com/google/cadvisor v0.46.0/go.mod h1:YnCDnR8amaS0HoMEjheOI0TMPzFKCBLc30mciLEjwGI= github.com/google/flatbuffers v1.12.1/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8= @@ -1306,16 +1182,12 @@ github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8 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/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= -github.com/google/go-github/v32 v32.1.0/go.mod h1:rIEpZD9CTDQwDK9GDrtMTycQNA4JU3qBsCizh3q2WCI= -github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck= github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8= github.com/google/go-querystring v1.1.0/go.mod h1:Kcdr2DB4koayq7X8pmAG4sNG59So17icRSOU623lUBU= -github.com/google/gofuzz v0.0.0-20161122191042-44d81051d367/go.mod h1:HP5RmnzzSNb993RKQDq4+1A4ia9nllfqcQFTQJedwGI= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= 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/gops v0.3.22/go.mod h1:7diIdLsqpCihPSX3fQagksT/Ku/y4RL9LHTlKyEUDl8= 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/martian/v3 v3.1.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= @@ -1337,8 +1209,6 @@ github.com/google/pprof v0.0.0-20210601050228-01bbb1931b22/go.mod h1:kpwsk12EmLe github.com/google/pprof v0.0.0-20210609004039-a478d1d731e9/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= -github.com/google/renameio/v2 v2.0.0 h1:UifI23ZTGY8Tt29JbYFiuyIU3eX+RNFtUwefq9qAhxg= -github.com/google/renameio/v2 v2.0.0/go.mod h1:BtmJXm5YlszgC+TD4HOEEUFgkJP3nLxehU6hfe7jRt4= 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= @@ -1360,12 +1230,10 @@ github.com/googleapis/gax-go/v2 v2.5.1/go.mod h1:h6B0KMMFNtI2ddbGJn3T3ZbwkeT6yqE github.com/googleapis/gax-go/v2 v2.6.0/go.mod h1:1mjbznJAPHFpesgE5ucqfYEscaz5kMdcIDwU/6+DDoY= github.com/googleapis/gax-go/v2 v2.7.0 h1:IcsPKeInNvYi7eqSaDjiZqDDKu5rsmunY0Y1YupQSSQ= github.com/googleapis/gax-go/v2 v2.7.0/go.mod h1:TEop28CZZQ2y+c0VxMUmu1lV+fQx57QpBWsYpwqHJx8= -github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY= github.com/googleapis/gnostic v0.4.1/go.mod h1:LRhVm6pbyptWbWbuZ38d1eyptfvIytN3ir6b65WBswg= github.com/googleapis/go-type-adapters v1.0.0/go.mod h1:zHW75FOG2aur7gAO2B+MLby+cLsWGBF62rFAi7WjWO4= github.com/googleapis/google-cloud-go-testing v0.0.0-20200911160855-bcd43fbb19e8/go.mod h1:dvDLG8qkwmyD9a/MJJN3XJcT3xFxOKAvTZGvuZmac9g= github.com/gookit/color v1.3.6/go.mod h1:R3ogXq2B9rTbXoSHJ1HyUVAZ3poOJHpd9nQmyGZsfvQ= -github.com/gopcua/opcua v0.1.12/go.mod h1:a6QH4F9XeODklCmWuvaOdL8v9H0d73CEKUHWVZLQyE8= github.com/gophercloud/gophercloud v1.0.0 h1:9nTGx0jizmHxDobe4mck89FyQHVyA3CaXLIUSGJjP9k= github.com/gophercloud/gophercloud v1.0.0/go.mod h1:Q8fZtyi5zZxPS/j9aj3sSxtvj41AdQMDwyo1myduD5c= github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1 h1:EGx4pi6eqNxGaHF6qqu48+N2wcFQ5qg5FXgOdqsJ5d8= @@ -1396,45 +1264,29 @@ github.com/gostaticanalysis/comment v1.3.0/go.mod h1:xMicKDx7XRXYdVwY9f9wQpDJVnq github.com/gostaticanalysis/comment v1.4.1/go.mod h1:ih6ZxzTHLdadaiSnF5WY3dxUoXfXAlTaRzuaNDlSado= github.com/gostaticanalysis/forcetypeassert v0.0.0-20200621232751-01d4955beaa5/go.mod h1:qZEedyP/sY1lTGV1uJ3VhWZ2mqag3IkWsDHVbplHXak= github.com/gostaticanalysis/nilerr v0.1.1/go.mod h1:wZYb6YI5YAxxq0i1+VJbY0s2YONW0HU0GPE3+5PWN4A= -github.com/grafana/dskit v0.0.0-20220928083349-b1b307db4f30 h1:Lbeu0ddFATI+cgXh6LzjAk9TdoU7WUZ2hry+5H4xXdM= -github.com/grafana/dskit v0.0.0-20220928083349-b1b307db4f30/go.mod h1:NTfOwhBMmR7TyG4E3RB4F1qhvk+cawoXacyN30yipVY= -github.com/grafana/go-gelf/v2 v2.0.1 h1:BOChP0h/jLeD+7F9mL7tq10xVkDG15he3T1zHuQaWak= -github.com/grafana/go-gelf/v2 v2.0.1/go.mod h1:lexHie0xzYGwCgiRGcvZ723bSNyNI8ZRD4s0CLobh90= -github.com/grafana/gomemcache v0.0.0-20220812141859-1e3ae89e91a7 h1:EKJ/x3CNzKFtppRriAk0PlWD513f+5YOx4aHSbWm1Y8= -github.com/grafana/gomemcache v0.0.0-20220812141859-1e3ae89e91a7/go.mod h1:H0wQNHz2YrLsuXOZozoeDmnHXkNCRmMW0gwFWDfEZDA= -github.com/grafana/loki v1.6.2-0.20221206154352-fee23745328c h1:WfrjoGZffQ508jBJmI7AAHWGdlJlYPd1Bet04FHClXg= -github.com/grafana/loki v1.6.2-0.20221206154352-fee23745328c/go.mod h1:VArTqN8uZ+Pfr7Fimx1TNji2I6qz3xRzZhgnqAV6YZ4= github.com/grafana/regexp v0.0.0-20221005093135-b4c2bcb0a4b6 h1:A3dhViTeFDSQcGOXuUi6ukCQSMyDtDISBp2z6OOo2YM= github.com/grafana/regexp v0.0.0-20221005093135-b4c2bcb0a4b6/go.mod h1:M5qHK+eWfAv8VR/265dIuEpL3fNfeC21tXXp9itM24A= -github.com/grafana/tail v0.0.0-20220426200921-98e8eb28ea4c h1:qIsCzNln5YzuXfXbJgXhpfM+4gY7qi3mED3eYQS4Fls= github.com/grafana/tail v0.0.0-20220426200921-98e8eb28ea4c/go.mod h1:GIMXMPB/lRAllP5rVDvcGif87ryO2hgD7tCtHMdHrho= github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA= 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-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= -github.com/grpc-ecosystem/go-grpc-middleware v1.1.0/go.mod h1:f5nM7jw/oeRSadq3xCzHAvxcr8HZnzsqU6ILg/0NiiE= -github.com/grpc-ecosystem/go-grpc-middleware v1.2.0/go.mod h1:mJzapYve32yjrKlk9GbyCZHuPgZsrbyIbyKhSzOpg6s= github.com/grpc-ecosystem/go-grpc-middleware v1.2.2/go.mod h1:EaizFBKfUKtMIF5iaDEhniwNedqGo9FuLFzppDr3uwI= github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 h1:+9834+KizmvFV7pXQGSXQTsaWhq2GjuNUt0aUU0YBYw= github.com/grpc-ecosystem/go-grpc-middleware v1.3.0/go.mod h1:z0ButlSOZa5vEBq9m2m2hlwIgKw+rp3sdCBRoJY+30Y= github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= -github.com/grpc-ecosystem/grpc-gateway v1.9.4/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= github.com/grpc-ecosystem/grpc-gateway v1.14.5/go.mod h1:UJ0EZAp832vCd54Wev9N1BMKEyvcZ5+IM0AwDrnlkEc= 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.14.0 h1:t7uX3JBHdVwAi3G7sSSdbsk8NfgA+LnUS88V/2EKaA0= github.com/grpc-ecosystem/grpc-gateway/v2 v2.14.0/go.mod h1:4OGVnY4qf2+gw+ssiHbW+pq4mo2yko94YxxMmXZ7jCA= -github.com/grpc-ecosystem/grpc-opentracing v0.0.0-20180507213350-8e809c8a8645 h1:MJG/KsmcqMwFAkh8mTnAwhyKoB+sTAnY4CACC110tbU= github.com/grpc-ecosystem/grpc-opentracing v0.0.0-20180507213350-8e809c8a8645/go.mod h1:6iZfnjpejD4L/4DwD7NryNaJyCQdzwWwH2MWhCA90Kw= github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c h1:6rhixN/i8ZofjG1Y75iExal34USq5p+wiN1tpie8IrU= github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c/go.mod h1:NMPJylDgVpX0MLRlPy15sqSwOFv/U1GZ2m21JhFfek0= github.com/hailocab/go-hostpool v0.0.0-20160125115350-e80d13ce29ed/go.mod h1:tMWxXQ9wFIaZeTI9F+hmhFiGpFmhOHzyShyFUhRm0H4= -github.com/harlow/kinesis-consumer v0.3.1-0.20181230152818-2f58b136fee0/go.mod h1:dk23l2BruuUzRP8wbybQbPn3J7sZga2QHICCeaEy5rQ= -github.com/hashicorp/consul v1.2.1 h1:66MuuTfV4aOXTQM7cjAIKUWFOITSk4XZlMhE09ymVbg= -github.com/hashicorp/consul v1.2.1/go.mod h1:mFrjN1mfidgJfYP1xrJCF+AfRhr6Eaqhb2+sfyn/OOI= github.com/hashicorp/consul/api v1.1.0/go.mod h1:VmuI/Lkw1nC05EYQWNKwWGbkg+FbDBtguAZLlVdkD9Q= github.com/hashicorp/consul/api v1.3.0/go.mod h1:MmDNSzIMUjNpY/mQ398R4bk2FnqQLoPndWW5VkKPlCE= github.com/hashicorp/consul/api v1.10.1/go.mod h1:XjsvQN+RJGWI2TWy1/kqaE16HrR2J/FWgkYjdZQsX9M= @@ -1488,7 +1340,6 @@ github.com/hashicorp/go-retryablehttp v0.5.3/go.mod h1:9B5zBasrRhHXnJnui7y6sL7es github.com/hashicorp/go-retryablehttp v0.5.4/go.mod h1:9B5zBasrRhHXnJnui7y6sL7es7NDiJgTc6Er0maI1Xs= github.com/hashicorp/go-retryablehttp v0.7.1 h1:sUiuQAnLlbvmExtFQs72iFW/HXeUn8Z1aJLQ4LJJbTQ= github.com/hashicorp/go-retryablehttp v0.7.1/go.mod h1:vAew36LZh98gCBJNLH42IQ1ER/9wtLZZ8meHqQvEYWY= -github.com/hashicorp/go-rootcerts v0.0.0-20160503143440-6bb64b370b90/go.mod h1:o4zcYY1e0GEZI6eSEr+43QDYmuGglw1qSO6qdHUHCgg= github.com/hashicorp/go-rootcerts v1.0.0/go.mod h1:K6zTfqpRlCUIjkwsN4Z+hiSfzSTQa6eBIzfwKfwNnHU= github.com/hashicorp/go-rootcerts v1.0.1/go.mod h1:pqUvnprVnM5bf7AOirdbb01K4ccR319Vf4pU3K5EGc8= github.com/hashicorp/go-rootcerts v1.0.2 h1:jzhAVGtqPKbwpyCPELlgNWhE1znq+qwJtW5Oi2viEzc= @@ -1519,7 +1370,6 @@ github.com/hashicorp/mdns v1.0.0/go.mod h1:tL+uN++7HEJ6SQLQ2/p+z2pH24WQKWjBPkE0m github.com/hashicorp/mdns v1.0.1/go.mod h1:4gW7WsVCke5TE7EPeYliwHlRUyBtfCwuFwuMg2DmyNY= github.com/hashicorp/mdns v1.0.4/go.mod h1:mtBihi+LeNXGtG8L9dX59gAEa12BDtBQSp4v/YAJqrc= github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I= -github.com/hashicorp/memberlist v0.1.5/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I= github.com/hashicorp/memberlist v0.2.2/go.mod h1:MS2lj3INKhZjWNqd3N0m3J+Jxf3DAOnAH9VT3Sh9MUE= github.com/hashicorp/memberlist v0.3.0/go.mod h1:MS2lj3INKhZjWNqd3N0m3J+Jxf3DAOnAH9VT3Sh9MUE= github.com/hashicorp/memberlist v0.3.1/go.mod h1:MS2lj3INKhZjWNqd3N0m3J+Jxf3DAOnAH9VT3Sh9MUE= @@ -1527,7 +1377,6 @@ github.com/hashicorp/memberlist v0.5.0 h1:EtYPN8DpAURiapus508I4n9CzHs2W+8NZGbmmR github.com/hashicorp/memberlist v0.5.0/go.mod h1:yvyXLpo0QaGE59Y7hDTsTzDD25JYBZ4mHgHUZ8lrOI0= github.com/hashicorp/nomad/api v0.0.0-20221102143410-8a95f1239005 h1:jKwXhVS4F7qk0g8laz+Anz0g/6yaSJ3HqmSAuSNLUcA= github.com/hashicorp/nomad/api v0.0.0-20221102143410-8a95f1239005/go.mod h1:vgJmrz4Bz9E1cR/uy70oP9udUJKFRkcEYHlHTp4nFwI= -github.com/hashicorp/serf v0.8.1/go.mod h1:h/Ru6tmZazX7WO/GDmwdpS975F019L4t5ng5IgwbNrE= github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc= github.com/hashicorp/serf v0.9.5/go.mod h1:UWDWwZeL5cuWDJdl0C6wrvrUwEqtQ4ZKBKKENpqIUyk= github.com/hashicorp/serf v0.9.6/go.mod h1:TXZNMjZQijwlDvp+r0b63xZ45H7JmCmgg4gpTwn9UV4= @@ -1540,31 +1389,23 @@ 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/hashicorp/yamux v0.0.0-20190923154419-df201c70410d/go.mod h1:+NfK9FKeTrX5uv1uIXGdwYDTeHna2qgaIlx54MXqjAM= -github.com/heroku/rollrus v0.2.0/go.mod h1:B3MwEcr9nmf4xj0Sr5l9eSht7wLKMa1C+9ajgAU79ek= -github.com/heroku/x v0.0.50 h1:CA0AXkSumucVJD+T+x+6c7X1iDEb+40F8GNgH5UjJwo= -github.com/heroku/x v0.0.50/go.mod h1:vr+jORZ6sG3wgEq2FAS6UbOUrz9/DxpQGN/xPHVgbSM= github.com/hetznercloud/hcloud-go v1.35.3 h1:WCmFAhLRooih2QHAsbCbEdpIHnshQQmrPqsr3rHE1Ow= github.com/hetznercloud/hcloud-go v1.35.3/go.mod h1:mepQwR6va27S3UQthaEPGS86jtzSY9xWL1e9dyxXpgA= github.com/hexops/gotextdiff v1.0.3 h1:gitA9+qJrrTCsiCl7+kh75nPqQt1cx4ZkudSTLoUqJM= github.com/hjson/hjson-go/v4 v4.0.0 h1:wlm6IYYqHjOdXH1gHev4VoXCaW20HdQAGCxdOEEg2cs= github.com/hjson/hjson-go/v4 v4.0.0/go.mod h1:KaYt3bTw3zhBjYqnXkYywcYctk0A2nxeEFTse3rH13E= -github.com/huandu/xstrings v1.3.1 h1:4jgBlKK6tLKFvO8u5pmYjG91cqytmDCDvGh7ECVFfFs= -github.com/huandu/xstrings v1.3.1/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE= github.com/hudl/fargo v1.3.0/go.mod h1:y3CKSmjA+wD2gak7sUSXTAoopbhU08POFhmITJgmKTg= github.com/hudl/fargo v1.4.0/go.mod h1:9Ai6uvFy5fQNq6VPKtg+Ceq1+eTY4nKUlR2JElEOcDo= -github.com/hydrogen18/memlistener v0.0.0-20141126152155-54553eb933fb/go.mod h1:qEIFzExnS6016fRpRfxrExeVn2gbClQA99gQhnIcdhE= github.com/iancoleman/strcase v0.2.0 h1:05I4QRnGpI0m37iZQRuskXh+w77mr6Z41lwQzuHLwW0= github.com/iancoleman/strcase v0.2.0/go.mod h1:iwCmte+B7n89clKwxIoIXy/HfoL7AsD47ZCWhYzw7ho= github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/imdario/mergo v0.3.5/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= -github.com/imdario/mergo v0.3.11/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA= github.com/imdario/mergo v0.3.12 h1:b6R2BslTbIEToALKP7LxUvijTsNI9TAe80pLWN2g/HU= github.com/imdario/mergo v0.3.12/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= github.com/inconshreveable/mousetrap v1.0.1 h1:U3uMjPSQEBMNp1lFxmllqCPM6P5u/Xq7Pgzkat/bFNc= github.com/inconshreveable/mousetrap v1.0.1/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= -github.com/influxdata/go-syslog/v2 v2.0.1/go.mod h1:hjvie1UTaD5E1fTnDmxaCw8RRDrT4Ve+XHr5O2dKSCo= github.com/influxdata/go-syslog/v3 v3.0.1-0.20210608084020-ac565dc76ba6 h1:s9ZL6ZhFF8y6ebnm1FLvobkzoIu5xwDQUcRPk/IEhpM= github.com/influxdata/go-syslog/v3 v3.0.1-0.20210608084020-ac565dc76ba6/go.mod h1:aXdIdfn2OcGnMhOTojXmwZqXKgC3MU5riiNvzwwG9OY= github.com/influxdata/influxdb-observability/common v0.2.32 h1:L9R2Zr3f47eyJf6T+8AAB6eyjywYFCLbnScXG6QEabg= @@ -1582,18 +1423,12 @@ github.com/influxdata/line-protocol/v2 v2.0.0-20210312151457-c52fdecb625a/go.mod github.com/influxdata/line-protocol/v2 v2.1.0/go.mod h1:QKw43hdUBg3GTk2iC3iyCxksNj7PX9aUSeYOYE/ceHY= github.com/influxdata/line-protocol/v2 v2.2.1 h1:EAPkqJ9Km4uAxtMRgUubJyqAr6zgWM0dznKMLRauQRE= github.com/influxdata/line-protocol/v2 v2.2.1/go.mod h1:DmB3Cnh+3oxmG6LOBIxce4oaL4CPj3OmMPgvauXh+tM= -github.com/influxdata/tail v1.0.1-0.20200707181643-03a791b270e4/go.mod h1:VeiWgI3qaGdJWust2fP27a6J+koITo/1c/UhxeOxgaM= -github.com/influxdata/telegraf v1.16.3 h1:x0qeuSGGMg5y+YqP/5ZHwXZu3bcBrO8AAQOTNlYEb1c= -github.com/influxdata/telegraf v1.16.3/go.mod h1:fX/6k7qpIqzVPWyeIamb0wN5hbwc0ANUaTS80lPYFB8= -github.com/influxdata/toml v0.0.0-20190415235208-270119a8ce65/go.mod h1:zApaNFpP/bTpQItGZNNUMISDMDAnTXu9UqJ4yT3ocz8= -github.com/influxdata/wlog v0.0.0-20160411224016-7c63b0a71ef8/go.mod h1:/2NMgWB1DHM1ti/gqhOlg+LJeBVk6FqR5aVGYY0hlwI= github.com/ionos-cloud/sdk-go/v6 v6.1.3 h1:vb6yqdpiqaytvreM0bsn2pXw+1YDvEk2RKSmBAQvgDQ= github.com/ionos-cloud/sdk-go/v6 v6.1.3/go.mod h1:Ox3W0iiEz0GHnfY9e5LmAxwklsxguuNFEUSu0gVRTME= github.com/jackc/chunkreader v1.0.0/go.mod h1:RT6O25fNZIuasFJRyZ4R/Y2BbhasbmZXF9QQ7T3kePo= github.com/jackc/chunkreader/v2 v2.0.0/go.mod h1:odVSm741yZoC3dpHEUXIqA9tQRhFrgOHwnPIn9lDKlk= github.com/jackc/chunkreader/v2 v2.0.1 h1:i+RDz65UE+mmpjTfyz0MoVTnzeYxroil2G82ki7MGG8= github.com/jackc/chunkreader/v2 v2.0.1/go.mod h1:odVSm741yZoC3dpHEUXIqA9tQRhFrgOHwnPIn9lDKlk= -github.com/jackc/fake v0.0.0-20150926172116-812a484cc733/go.mod h1:WrMFNQdiFJ80sQsxDoMokWK1W5TQtxBFNpzWTD84ibQ= github.com/jackc/pgconn v0.0.0-20190420214824-7e0022ef6ba3/go.mod h1:jkELnwuX+w9qN5YIfX0fl88Ehu4XC3keFuOJJk9pcnA= github.com/jackc/pgconn v0.0.0-20190824142844-760dd75542eb/go.mod h1:lLjNuW/+OfW9/pnVKPazfWOgNfH2aPem8YQ7ilXGvJE= github.com/jackc/pgconn v0.0.0-20190831204454-2fabfa3c18b7/go.mod h1:ZJKsE/KZfsUgOEh9hBm+xYTstcNHg7UPMVJqRfQxq4s= @@ -1627,7 +1462,6 @@ github.com/jackc/pgtype v0.0.0-20190828014616-a8802b16cc59/go.mod h1:MWlu30kVJrU github.com/jackc/pgtype v1.8.1-0.20210724151600-32e20a603178/go.mod h1:C516IlIV9NKqfsMCXTdChteoXmwgUceqaLfjg2e3NlM= github.com/jackc/pgtype v1.12.0 h1:Dlq8Qvcch7kiehm8wPGIW0W3KsCCHJnRacKW0UM8n5w= github.com/jackc/pgtype v1.12.0/go.mod h1:LUMuVrfsFfdKGLw+AFFVv6KtHOFMwRgDDzBt76IqCA4= -github.com/jackc/pgx v3.6.0+incompatible/go.mod h1:0ZGrqGqkRlliWnWB4zKnWtjbSWbGkVEFm4TeybAXq+I= github.com/jackc/pgx/v4 v4.0.0-20190420224344-cc3461e65d96/go.mod h1:mdxmSJJuR08CZQyj1PVQBHy9XOp5p8/SHH6a0psbY9Y= github.com/jackc/pgx/v4 v4.0.0-20190421002000-1b8f0016e912/go.mod h1:no/Y67Jkk/9WuGR0JG/JseM9irFbnEPbuWV2EELPNuM= github.com/jackc/pgx/v4 v4.0.0-pre1.0.20190824185557-6972a5742186/go.mod h1:X+GQnOEnf1dqHGpw7JmHqHc1NxDoalibchSk9/RWuDc= @@ -1659,12 +1493,10 @@ github.com/jcmturner/gokrb5/v8 v8.4.3 h1:iTonLeSJOn7MVUtyMT+arAn5AKAPrkilzhGw8wE github.com/jcmturner/gokrb5/v8 v8.4.3/go.mod h1:dqRwJGXznQrzw6cWmyo6kH+E7jksEQG/CyVWsJEsJO0= github.com/jcmturner/rpc/v2 v2.0.3 h1:7FXXj8Ti1IaVFpSAziCZWNzbNuZmnvw/i6CqLNdWfZY= github.com/jcmturner/rpc/v2 v2.0.3/go.mod h1:VUJYCIDm3PVOEHw8sgt091/20OJjskO/YJki3ELg/Hc= -github.com/jessevdk/go-flags v1.5.0/go.mod h1:Fw0T6WPc1dYxT4mKEZRfG5kJhaTDP9pj1c2EWnYs/m4= github.com/jgautheron/goconst v1.4.0/go.mod h1:aAosetZ5zaeC/2EfMeRswtxUFBpe2Hr7HzkgX4fanO4= github.com/jhump/protoreflect v1.6.0/go.mod h1:eaTn3RZAmMBcV0fifFvlm6VHNz3wSkYyXYWUh7ymB74= github.com/jingyugao/rowserrcheck v0.0.0-20210130005344-c6a0c12dd98d/go.mod h1:/EZlaYCnEX24i7qdVhT9du5JrtFWYRQr67bVgR7JJC8= github.com/jirfag/go-printf-func-name v0.0.0-20200119135958-7558a9eaa5af/go.mod h1:HEWGJkRDzjJY2sqdDwxccsGicWEf9BQOZsq2tV+xzM0= -github.com/jmespath/go-jmespath v0.0.0-20160202185014-0b12d6b521d8/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= github.com/jmespath/go-jmespath v0.3.0/go.mod h1:9QtRXoHjLGCJ5IBSaohpXITPlowMeeYCZ7fLUTSywik= github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg= @@ -1672,18 +1504,13 @@ github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHW github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8= github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U= github.com/jmoiron/sqlx v1.2.0/go.mod h1:1FEQNm3xlJgrMD+FBdI9+xvCksHtbpVBBw5dYhBSsks= -github.com/joeshaw/envdecode v0.0.0-20180129163420-d5f34bca07f3/go.mod h1:Q+alOFAXgW5SrcfMPt/G4B2oN+qEcQRJjkn/f4mKL04= github.com/joho/godotenv v1.3.0 h1:Zjp+RcGpHhGlrMbJzXTrZZPrWj+1vfm90La1wgB6Bhc= github.com/joho/godotenv v1.3.0/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqxOKXbg= github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY= github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y= -github.com/jpillora/backoff v0.0.0-20180909062703-3050d21c67d7/go.mod h1:2iMrUgbbvHEiQClaW2NsSzMyGHqN+rDFqY705q49KG0= github.com/jpillora/backoff v1.0.0 h1:uvFg412JmmHBHw7iwprIxkPMI+sGQ4kzOWsMeHnm2EA= github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4= -github.com/jsimonetti/rtnetlink v0.0.0-20190606172950-9527aa82566a/go.mod h1:Oz+70psSo5OFh8DBl0Zv2ACw7Esh6pPUphlvZG9x7uw= -github.com/jsimonetti/rtnetlink v0.0.0-20200117123717-f846d4f6c1f4/go.mod h1:WGuG/smIU4J/54PblvSbh+xvCZmpJnFgr3ds6Z55XMQ= -github.com/json-iterator/go v0.0.0-20180612202835-f2b4162afba3/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= github.com/json-iterator/go v1.1.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/json-iterator/go v1.1.8/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= @@ -1701,23 +1528,19 @@ github.com/juju/errors v0.0.0-20181012004132-a4583d0a56ea/go.mod h1:W54LbzXuIE0b github.com/juju/loggo v0.0.0-20190526231331-6e530bcce5d8/go.mod h1:vgyd7OREkbtVEN/8IXZe5Ooef3LQePvuBm9UWj6ZL8U= github.com/juju/testing v0.0.0-20191001232224-ce9dec17d28b/go.mod h1:63prj8cnj0tU0S9OHjGJn+b1h0ZghCndfnbQolrYTwA= github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= -github.com/julienschmidt/httprouter v1.3.0 h1:U0609e9tgbseu3rBINet9P48AI/D3oJs4dN7jwJOQ1U= github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM= github.com/julz/importas v0.0.0-20210226073942-60b4fa260dd0/go.mod h1:oSFU2R4XK/P7kNBrnL/FEQlDGN1/6WoxXEjSSXO0DV0= github.com/jung-kurt/gofpdf v1.0.0/go.mod h1:7Id9E/uU8ce6rXgefFLlgrJj/GYY22cpxn+r32jIOes= github.com/jung-kurt/gofpdf v1.0.3-0.20190309125859-24315acbbda5/go.mod h1:7Id9E/uU8ce6rXgefFLlgrJj/GYY22cpxn+r32jIOes= github.com/k0kubun/pp v3.0.1+incompatible/go.mod h1:GWse8YhT0p8pT4ir3ZgBbfZild3tgzSScAn6HmfYukg= github.com/k0kubun/pp/v3 v3.1.0/go.mod h1:vIrP5CF0n78pKHm2Ku6GVerpZBJvscg48WepUYEk2gw= -github.com/kardianos/service v1.0.0/go.mod h1:8CzDhVuCuugtsHyZoTvsOBuvonN/UDBvl0kH+BUxvbo= github.com/karrick/godirwalk v1.8.0/go.mod h1:H5KPZjojv4lE+QYImBI8xVtrBRgYrIVsaRPx4tDPEn4= github.com/karrick/godirwalk v1.10.3/go.mod h1:RoGL9dQei4vP9ilrpETWE8CLOZ1kiN0LhBygSwrAsHA= -github.com/karrick/godirwalk v1.16.1/go.mod h1:j4mkqPuvaLI8mp1DroR3P6ad7cyYd4c1qeJ3RV7ULlk= github.com/karrick/godirwalk v1.17.0 h1:b4kY7nqDdioR/6qnbHQyDvmA17u5G1cZ6J+CZXwSWoI= github.com/karrick/godirwalk v1.17.0/go.mod h1:j4mkqPuvaLI8mp1DroR3P6ad7cyYd4c1qeJ3RV7ULlk= github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 h1:Z9n2FFNUXsshfwJMBgNA0RU6/i7WVaAegv3PtuIHPMs= github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod h1:CzGEWj7cYgsdH8dAjBGEr58BoE7ScuLd+fwFZ44+/x8= github.com/keybase/go-keychain v0.0.0-20190712205309-48d3d31d256d/go.mod h1:JJNrCn9otv/2QP4D7SMJBgaleKpOf66PnW6F5WGNRIc= -github.com/keybase/go-ps v0.0.0-20190827175125-91aafc93ba19/go.mod h1:hY+WOq6m2FpbvyrI93sMaypsttvaIL5nhVR92dTMUcQ= github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q= github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= @@ -1758,16 +1581,12 @@ github.com/kr/pty v1.1.8/go.mod h1:O1sed60cT9XZ5uDucP5qwvh+TE3NnUj51EiZO/lmSfw= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= -github.com/kubernetes/apimachinery v0.0.0-20190119020841-d41becfba9ee/go.mod h1:Pe/YBTPc3vqoMkbuIWPH8CF9ehINdvNyS0dP3J6HC0s= github.com/kulti/thelper v0.4.0/go.mod h1:vMu2Cizjy/grP+jmsvOFDx1kYP6+PD1lqg4Yu5exl2U= github.com/kunwardeep/paralleltest v1.0.2/go.mod h1:ZPqNm1fVHPllh5LPVujzbVz1JN2GhLxSfY+oqUsvG30= github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc= github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw= github.com/kyoh86/exportloopref v0.1.8/go.mod h1:1tUcJeiioIs7VWe5gcOObrux3lb66+sBqGZrRkMwPgg= -github.com/leesper/go_rng v0.0.0-20171009123644-5344a9259b21/go.mod h1:N0SVk0uhy+E1PZ3C9ctsPRlvOPAFPkCNlcPBDkt0N3U= github.com/leesper/go_rng v0.0.0-20190531154944-a612b043e353 h1:X/79QL0b4YJVO5+OsPH9rF2u428CIrGL/jLmPsoOQQ4= -github.com/leesper/go_rng v0.0.0-20190531154944-a612b043e353/go.mod h1:N0SVk0uhy+E1PZ3C9ctsPRlvOPAFPkCNlcPBDkt0N3U= -github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII= github.com/leodido/ragel-machinery v0.0.0-20181214104525-299bdde78165 h1:bCiVCRCs1Heq84lurVinUPy19keqGEe4jh5vtK37jcg= github.com/leodido/ragel-machinery v0.0.0-20181214104525-299bdde78165/go.mod h1:WZxr2/6a/Ar9bMDc2rN/LJrE/hF6bXE4LPyDSIxwAfg= github.com/leoluk/perflib_exporter v0.2.0 h1:WJU7N3AIHxfc3CjoEJcBgG3i2ltF5Yz1ADVY9T6f1BY= @@ -1775,7 +1594,6 @@ github.com/leoluk/perflib_exporter v0.2.0/go.mod h1:MinSWm88jguXFFrGsP56PtleUb4Q github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= github.com/lib/pq v1.1.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= -github.com/lib/pq v1.3.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= github.com/lib/pq v1.9.0/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= github.com/lib/pq v1.10.2/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= github.com/lib/pq v1.10.7 h1:p7ZhMD+KsSRozJr34udlUrhboJwWAgCg34+/ZZNvZZw= @@ -1789,7 +1607,6 @@ github.com/linkedin/goavro/v2 v2.9.8/go.mod h1:UgQUb2N/pmueQYH9bfqFioWxzYCZXSfF8 github.com/linode/linodego v1.9.3 h1:+lxNZw4avRxhCqGjwfPgQ2PvMT+vOL0OMsTdzixR7hQ= github.com/linode/linodego v1.9.3/go.mod h1:h6AuFR/JpqwwM/vkj7s8KV3iGN8/jxn+zc437F8SZ8w= github.com/logrusorgru/aurora v0.0.0-20181002194514-a7b3b318ed4e/go.mod h1:7rIyQOR62GCctdiQpZ/zOJlFyk6y+94wXzv6RNZgaR4= -github.com/lstoll/grpce v1.7.0/go.mod h1:XiCWl3R+avNCT7KsTjv3qCblgsSqd0SC4ymySrH226g= github.com/lucasb-eyer/go-colorful v1.0.2/go.mod h1:0MS4r+7BZKSJ5mw4/S5MPN+qHFF1fYclkSPilDOKW0s= github.com/lucasb-eyer/go-colorful v1.0.3/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0= github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0/go.mod h1:zJYVVT2jmtg6P3p1VtQj7WsuWi/y4VnjVBn7F8KPB3I= @@ -1804,8 +1621,6 @@ github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czP github.com/magiconair/properties v1.8.5/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60= github.com/magiconair/properties v1.8.6 h1:5ibWZ6iY0NctNGWo87LalDlEZ6R41TqbbDamhfG/Qzo= github.com/magiconair/properties v1.8.6/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60= -github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= -github.com/mailru/easyjson v0.0.0-20180717111219-efc7eb8984d6/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/mailru/easyjson v0.0.0-20180823135443-60711f1a8329/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/mailru/easyjson v0.0.0-20190312143242-1de009706dbe/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= @@ -1845,7 +1660,6 @@ github.com/mattn/go-runewidth v0.0.2/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzp github.com/mattn/go-runewidth v0.0.4/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= github.com/mattn/go-runewidth v0.0.7/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI= github.com/mattn/go-runewidth v0.0.8/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI= -github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI= github.com/mattn/go-sqlite3 v1.9.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc= github.com/mattn/go-sqlite3 v2.0.3+incompatible h1:gXHsfypPkaMZrKbD5209QV9jbUTJKjyR5WD3HYQSd+U= github.com/mattn/go-sqlite3 v2.0.3+incompatible/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc= @@ -1854,14 +1668,8 @@ github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5 github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo= github.com/matttproud/golang_protobuf_extensions v1.0.4/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4= github.com/mbilski/exhaustivestruct v1.2.0/go.mod h1:OeTBVxQWoEmB2J2JCHmXWPJ0aksxSUOUy+nvtVEfzXc= -github.com/mdlayher/apcupsd v0.0.0-20200608131503-2bf01da7bf1b/go.mod h1:WYK/Z/aXq9cbMFIL5ihcA4sX/r/3/WCas/Qvs/2fXcA= -github.com/mdlayher/genetlink v1.0.0/go.mod h1:0rJ0h4itni50A86M2kHcgS85ttZazNt7a8H2a2cw0Gc= -github.com/mdlayher/netlink v0.0.0-20190409211403-11939a169225/go.mod h1:eQB3mZE4aiYnlUsyGGCOpPETfdQq4Jhsgf1fk3cwQaA= -github.com/mdlayher/netlink v1.0.0/go.mod h1:KxeJAFOFLG6AjpyDkQ/iIhxygIUKD+vcwqcnu43w/+M= -github.com/mdlayher/netlink v1.1.0/go.mod h1:H4WCitaheIsdF9yOYu8CFmCgQthAPIWZmcKp9uZHgmY= github.com/mgechev/dots v0.0.0-20190921121421-c36f7dcfbb81/go.mod h1:KQ7+USdGKfpPjXk4Ga+5XxQM4Lm4e3gAogrreFAYpOg= github.com/mgechev/revive v1.0.3/go.mod h1:POGGZagSo/0frdr7VeAifzS5Uka0d0GPiM35MsTO8nE= -github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b/go.mod h1:01TrycV0kFyexm33Z7vhZRXopbI8J3TDReVlkTgMUxE= github.com/microsoft/ApplicationInsights-Go v0.4.4 h1:G4+H9WNs6ygSCe6sUyxRc2U81TI5Es90b2t/MwX5KqY= github.com/microsoft/ApplicationInsights-Go v0.4.4/go.mod h1:fKRUseBqkw6bDiXTs3ESTiU/4YTIHsQS4W3fP2ieF4U= github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= @@ -1870,7 +1678,6 @@ github.com/miekg/dns v1.1.41/go.mod h1:p6aan82bvRIyn+zDIv9xYNUpwa73JcSh9BKwknJys github.com/miekg/dns v1.1.43/go.mod h1:+evo5L0630/F6ca/Z9+GAqzhjGyn8/c+TBaOyfEl0V4= github.com/miekg/dns v1.1.50 h1:DQUfb9uc6smULcREF09Uc+/Gd46YWqJd5DbpPE9xkcA= github.com/miekg/dns v1.1.50/go.mod h1:e3IlAVfNqAllflbibAZEWOXOQ+Ynzk/dDozDxY7XnME= -github.com/mikioh/ipaddr v0.0.0-20190404000644-d465c8ab6721/go.mod h1:Ickgr2WtCLZ2MDGd4Gr0geeCH5HybhRJbonOgQpvSxc= github.com/mindprince/gonvml v0.0.0-20190828220739-9ebdce4bb989 h1:PS1dLCGtD8bb9RPKJrc8bS7qHL6JnW1CZvwzH9dPoUs= github.com/mindprince/gonvml v0.0.0-20190828220739-9ebdce4bb989/go.mod h1:2eu9pRWp8mo84xCg6KswZ+USQHjwgRhNp06sozOdsTY= github.com/minio/highwayhash v1.0.1/go.mod h1:BQskDq+xkJ12lmlUUi7U0M5Swg3EWR+dLTk+kldvVxY= @@ -1920,7 +1727,6 @@ github.com/moby/term v0.0.0-20220808134915-39b0c02b01ae/go.mod h1:E2VnQOmVuvZB6U github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= -github.com/modern-go/reflect2 v0.0.0-20180320133207-05fbef0ca5da/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= @@ -1941,7 +1747,6 @@ github.com/mrunalp/fileutils v0.5.0 h1:NKzVxiH7eSk+OQ4M+ZYW1K6h27RUV3MI6NUTsHhU6 github.com/mrunalp/fileutils v0.5.0/go.mod h1:M1WthSahJixYnrXQl/DFQuteStB1weuxD2QJNHXfbSQ= github.com/mtibben/percent v0.2.1 h1:5gssi8Nqo8QU/r2pynCm+hBQHpkB/uNK7BJCFogWdzs= github.com/mtibben/percent v0.2.1/go.mod h1:KG9uO+SZkUp+VkRHsCdYQV3XSZrrSpR3O9ibNBTZrns= -github.com/multiplay/go-ts3 v1.0.0/go.mod h1:14S6cS3fLNT3xOytrA/DkRyAFNuQLMLEqOYAsf87IbQ= github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= 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= @@ -1950,13 +1755,11 @@ github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f h1:KUppIJq7/+ github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw= github.com/nakabonne/nestif v0.3.0/go.mod h1:dI314BppzXjJ4HsCnbo7XzrJHPszZsjnk5wEBSYHI2c= -github.com/naoina/go-stringutil v0.1.0/go.mod h1:XJ2SJL9jCtBh+P9q5btrd/Ylo8XwT/h1USek5+NqSA0= github.com/nats-io/jwt v0.3.0/go.mod h1:fRYCDE99xlTsqUzISS1Bi75UBJ6ljOJQOAAu5VglpSg= github.com/nats-io/jwt v0.3.2/go.mod h1:/euKqTS1ZD+zzjYrY7pseZrTtWQSjujC7xjPc8wL6eU= github.com/nats-io/jwt v1.2.2/go.mod h1:/xX356yQA6LuXI9xWW7mZNpxgF2mBmGecH+Fj34sP5Q= github.com/nats-io/jwt/v2 v2.0.3/go.mod h1:VRP+deawSXyhNjXmxPCHskrR6Mq50BqpEI5SEcNiGlY= github.com/nats-io/nats-server/v2 v2.1.2/go.mod h1:Afk+wRZqkMQs/p45uXdrVLuab3gwv3Z8C4HTBu8GD/k= -github.com/nats-io/nats-server/v2 v2.1.4/go.mod h1:Jw1Z28soD/QasIA2uWjXyM9El1jly3YwyFOuR8tH1rg= github.com/nats-io/nats-server/v2 v2.5.0/go.mod h1:Kj86UtrXAL6LwYRA6H4RqzkHhK0Vcv2ZnKD5WbQ1t3g= github.com/nats-io/nats.go v1.9.1/go.mod h1:ZjDU1L/7fJ09jvUSRVBR2e7+RnLiiIQyqyzEE/Zbp4w= github.com/nats-io/nats.go v1.12.1/go.mod h1:BPko4oXsySz4aSWeFgOHLZs3G4Jq4ZAyE6/zMCxRT6w= @@ -1967,7 +1770,6 @@ github.com/nats-io/nkeys v0.3.0/go.mod h1:gvUNGjVcM2IPr5rCsRsC6Wb3Hr2CQAm08dsxtV github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c= github.com/nbutton23/zxcvbn-go v0.0.0-20180912185939-ae427f1e4c1d/go.mod h1:o96djdrsSGy3AWPyBgZMAGfxZNfgntdJG+11KU4QvbU= github.com/nbutton23/zxcvbn-go v0.0.0-20201221231540-e56b841a3c88/go.mod h1:KSVJerMDfblTH7p5MZaTt+8zaT2iEk3AkVb9PQdZuE8= -github.com/newrelic/newrelic-telemetry-sdk-go v0.2.0/go.mod h1:G9MqE/cHGv3Hx3qpYhfuyFUsGx2DpVcGi1iJIqTg+JQ= github.com/nginxinc/nginx-plus-go-client v0.6.0/go.mod h1:DBAmdDP71tOhgFPdCMVusegzdKmLVpVL0nVcMX17pbY= github.com/nginxinc/nginx-prometheus-exporter v0.8.1-0.20201110005315-f5a5f8086c19 h1:jR4KbeVA+KYmPq+amRe6AdB4mIfEaSOZGY2zCpqt/p8= github.com/nginxinc/nginx-prometheus-exporter v0.8.1-0.20201110005315-f5a5f8086c19/go.mod h1:L58Se1nwn3cEyHWlcfdlXgiGbHe/efvDbkbi+psz3lA= @@ -1975,7 +1777,6 @@ github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLA github.com/nishanths/exhaustive v0.1.0/go.mod h1:S1j9110vxV1ECdCudXRkeMnFQ/DQk9ajLT0Uf2MYZQQ= github.com/nishanths/predeclared v0.2.1/go.mod h1:HvkGJcA3naj4lOwnFXFDkFxVtSqQMB9sbB1usJ+xjQE= github.com/npillmayer/nestext v0.1.3/go.mod h1:h2lrijH8jpicr25dFY+oAJLyzlya6jhnuG+zWp9L0Uk= -github.com/nsqio/go-nsq v1.0.7/go.mod h1:XP5zaUs3pqf+Q71EqUJs3HYfBIqfK6G83WQMdNN+Ito= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE= github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU= @@ -1989,7 +1790,6 @@ github.com/oklog/ulid v1.3.1 h1:EGfNDEx6MqHz8B3uNV6QAib1UR2Lm97sHi3ocA6ESJ4= github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U= github.com/olekukonko/tablewriter v0.0.0-20170122224234-a0225b3f23b5/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo= github.com/olekukonko/tablewriter v0.0.4/go.mod h1:zq6QwlOf5SlnkVbMSr5EoBv3636FWnp+qbPhuoO21uA= -github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY= github.com/olivere/elastic v6.2.35+incompatible/go.mod h1:J+q1zQJTgAz9woqsbVRqGeB5G1iqDKVBWLNSYW8yfJ8= github.com/olivere/elastic v6.2.37+incompatible/go.mod h1:J+q1zQJTgAz9woqsbVRqGeB5G1iqDKVBWLNSYW8yfJ8= github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= @@ -2021,11 +1821,8 @@ github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAl github.com/onsi/gomega v1.18.1/go.mod h1:0q+aL8jAiMXy9hbwj2mr5GziHiwhAIQpFmmtT5hitRs= github.com/onsi/gomega v1.20.1 h1:PA/3qinGoukvymdIDV8pii6tiZgC8kbmJO6Z5+b002Q= github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk= -github.com/openconfig/gnmi v0.0.0-20180912164834-33a1865c3029/go.mod h1:t+O9It+LKzfOAhKTT5O0ehDix+MTqbtT0T9t+7zzOvc= -github.com/opencontainers/go-digest v1.0.0-rc1/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s= 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.1/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0= github.com/opencontainers/image-spec v1.0.2/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0= github.com/opencontainers/image-spec v1.0.3-0.20211202183452-c5a74bcca799 h1:rc3tiVYb5z54aKaDfakKn0dDjIyPpTtszkjuMzyt7ec= github.com/opencontainers/image-spec v1.0.3-0.20211202183452-c5a74bcca799/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0= @@ -2043,13 +1840,9 @@ github.com/openshift/api v0.0.0-20210521075222-e273a339932a/go.mod h1:izBmoXbUu3 github.com/openshift/build-machinery-go v0.0.0-20210423112049-9415d7ebd33e/go.mod h1:b1BuldmJlbA/xYtdZvKi+7j5YGB44qJUJDZ9zwiNCfE= github.com/openshift/client-go v0.0.0-20210521082421-73d9475a9142 h1:ZHRIMCFIJN1p9LsJt4HQ+akDrys4PrYnXzOWI5LK03I= github.com/openshift/client-go v0.0.0-20210521082421-73d9475a9142/go.mod h1:fjS8r9mqDVsPb5td3NehsNOAWa4uiFkYEfVZioQ2gH0= -github.com/opentracing-contrib/go-grpc v0.0.0-20180928155321-4b5a12d3ff02/go.mod h1:JNdpVEzCpXBgIiv4ds+TzhN1hrtxq6ClLrTlT9OQRSc= github.com/opentracing-contrib/go-grpc v0.0.0-20191001143057-db30781987df/go.mod h1:DYR5Eij8rJl8h7gblRrOZ8g0kW1umSpKqYIBTgeDtLo= -github.com/opentracing-contrib/go-grpc v0.0.0-20210225150812-73cb765af46e h1:4cPxUYdgaGzZIT5/j0IfqOrrXmq6bG8AwvwisMXpdrg= -github.com/opentracing-contrib/go-grpc v0.0.0-20210225150812-73cb765af46e/go.mod h1:DYR5Eij8rJl8h7gblRrOZ8g0kW1umSpKqYIBTgeDtLo= github.com/opentracing-contrib/go-observer v0.0.0-20170622124052-a52f23424492/go.mod h1:Ngi6UdF0k5OKD5t5wlmGhe/EDKPoUM3BXZSSfIuJbis= github.com/opentracing-contrib/go-stdlib v0.0.0-20190519235532-cf7a6c988dc9/go.mod h1:PLldrQSroqzH70Xl+1DQcGnefIbqsKR7UDaiux3zV+w= -github.com/opentracing-contrib/go-stdlib v1.0.0 h1:TBS7YuVotp8myLon4Pv7BtCBzOTo1DeZCld0Z63mW2w= github.com/opentracing-contrib/go-stdlib v1.0.0/go.mod h1:qtI1ogk+2JhVPIXVc6q+NHziSmy2W5GbdQZFUHADCBU= github.com/opentracing/basictracer-go v1.0.0/go.mod h1:QfBfYuafItcjQuMwinw9GhYKwFXS9KnPs5lxoYwgW74= github.com/opentracing/opentracing-go v1.0.2/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= @@ -2063,7 +1856,6 @@ github.com/openzipkin/zipkin-go v0.2.2/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnh github.com/openzipkin/zipkin-go v0.2.5/go.mod h1:KpXfKdgRDnnhsxw4pNIH9Md5lyFqKUa4YDFlwRYAMyE= github.com/openzipkin/zipkin-go v0.4.1 h1:kNd/ST2yLLWhaWrkgchya40TJabe8Hioj9udfPcEO5A= github.com/openzipkin/zipkin-go v0.4.1/go.mod h1:qY0VqDSN1pOBN94dBc6w2GJlWLiovAyg7Qt6/I9HecM= -github.com/openzipkin/zipkin-go-opentracing v0.3.4/go.mod h1:js2AbwmHW0YD9DwIw2JhQWmbfFi/UnWyYwdVhqbCDOE= github.com/ory/go-acc v0.2.6/go.mod h1:4Kb/UnPcT8qRAk3IAxta+hvVapdxTLWtrr7bFLlEgpw= github.com/ory/viper v1.7.5/go.mod h1:ypOuyJmEUb3oENywQZRgeAMwqgOyDqwboO1tj3DjTaM= github.com/ovh/go-ovh v1.3.0 h1:mvZaddk4E4kLcXhzb+cxBsMPYp2pHqiQpWYkInsuZPQ= @@ -2102,7 +1894,6 @@ github.com/pierrec/lz4 v0.0.0-20190327172049-315a67e90e41/go.mod h1:3/3N9NVKO0je github.com/pierrec/lz4 v1.0.2-0.20190131084431-473cd7ce01a1/go.mod h1:3/3N9NVKO0jef7pBehbT1qWhCMrIgbYNnFAZCqQ5LRc= github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= github.com/pierrec/lz4 v2.4.1+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= -github.com/pierrec/lz4 v2.5.2+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= github.com/pierrec/lz4 v2.6.0+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= 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= @@ -2117,7 +1908,6 @@ github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8/go.mod h1:HKlIX3XHQyzL github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA= 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.8.2-0.20190227000051-27936f6d90f9/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/pkg/profile v1.2.1/go.mod h1:hJw3o1OdXxsrSjjVksARp5W95eeEaEfptyVZyv6JUPA= @@ -2136,10 +1926,7 @@ github.com/power-devops/perfstat v0.0.0-20220216144756-c35f1ee13d7c/go.mod h1:Om github.com/pquerna/cachecontrol v0.1.0 h1:yJMy84ti9h/+OEWa752kBTKv4XC30OtVVHYv/8cTqKc= github.com/pquerna/cachecontrol v0.1.0/go.mod h1:NrUG3Z7Rdu85UNR3vm7SOsl1nFIeSiQnrHV5K9mBcUI= github.com/prashantv/gostub v1.1.0/go.mod h1:A5zLQHz7ieHGG7is6LLXLz7I8+3LZzsrV0P1IAHhP5U= -github.com/prometheus/alertmanager v0.24.0 h1:HBWR3lk4uy3ys+naDZthDdV7yEsxpaNeZuUS+hJgrOw= -github.com/prometheus/alertmanager v0.24.0/go.mod h1:r6fy/D7FRuZh5YbnX6J3MBY0eI4Pb5yPYS7/bPSXXqI= github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= -github.com/prometheus/client_golang v0.9.2/go.mod h1:OsXs2jCmiKlQ1lTBmv21f2mNfw4xf/QclQDMrYNZzcM= github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829/go.mod h1:p2iRAGwDERtqlqzRXnrOVns+ignqQo//hLXqYxZYVNs= github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDft0ttaMvbicHlPoso= github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= @@ -2165,7 +1952,6 @@ github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6T github.com/prometheus/client_model v0.3.0 h1:UBgGFHqYdG/TPFD1B1ogZywDqEkwp3fBMvqdiQ7Xew4= github.com/prometheus/client_model v0.3.0/go.mod h1:LDGWKZIo7rky3hgvBe+caln+Dr3dPggB5dvjtD7w9+w= github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= -github.com/prometheus/common v0.0.0-20181126121408-4724e9255275/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= github.com/prometheus/common v0.2.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= github.com/prometheus/common v0.4.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= @@ -2183,11 +1969,7 @@ github.com/prometheus/common v0.37.0 h1:ccBbHCgIiT9uSoFY0vX8H3zsNR5eLt17/RQLUvn8 github.com/prometheus/common v0.37.0/go.mod h1:phzohg0JFMnBEFGxTDbfu3QyL5GI8gTQJFhYO5B3mfA= github.com/prometheus/common/sigv4 v0.1.0 h1:qoVebwtwwEhS85Czm2dSROY5fTo2PAPEVdDeppTwGX4= github.com/prometheus/common/sigv4 v0.1.0/go.mod h1:2Jkxxk9yYvCkE5G1sQT7GuEXm57JrvHu9k5YwTjsNtI= -github.com/prometheus/exporter-toolkit v0.7.1/go.mod h1:ZUBIj498ePooX9t/2xtDjeQYwvRpiPP2lh5u4iblj2g= -github.com/prometheus/exporter-toolkit v0.8.2 h1:sbJAfBXQFkG6sUkbwBun8MNdzW9+wd5YfPYofbmj0YM= -github.com/prometheus/exporter-toolkit v0.8.2/go.mod h1:00shzmJL7KxcsabLWcONwpyNEuWhREOnFqZW7vadFS0= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= -github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= @@ -2210,16 +1992,12 @@ github.com/quasilyte/go-ruleguard/dsl v0.0.0-20210106184943-e47d54850b18/go.mod github.com/quasilyte/go-ruleguard/dsl v0.0.0-20210115110123-c73ee1cbff1f/go.mod h1:KeCP03KrjuSO0H1kTuZQCWlQPulDV6YMIXmpQss17rU= github.com/quasilyte/go-ruleguard/rules v0.0.0-20201231183845-9e62ed36efe1/go.mod h1:7JTjp89EGyU1d6XfBiXihJNG37wB2VRkd125Q1u7Plc= github.com/quasilyte/regex/syntax v0.0.0-20200407221936-30656e2c4a95/go.mod h1:rlzQ04UMyJXu/aOvhd8qT+hvDrFpiwqp8MRXDY9szc0= -github.com/rafaeljusto/redigomock v0.0.0-20190202135759-257e089e14a1/go.mod h1:JaY6n2sDr+z2WTsXkOmNRUfDy6FN0L6Nk7x06ndm4tY= -github.com/rcrowley/go-metrics v0.0.0-20160613154715-cfa5a85e9f0a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= github.com/rcrowley/go-metrics v0.0.0-20190826022208-cac0b30c2563/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= -github.com/rcrowley/go-metrics v0.0.0-20200313005456-10cdbea86bc0/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 h1:N/ElC8H3+5XpJzTSTfLsJV/mx9Q9g7kxmchpfZyxgzM= github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= github.com/relvacode/iso8601 v1.1.0 h1:2nV8sp0eOjpoKQ2vD3xSDygsjAx37NHG2UlZiCkDH4I= github.com/relvacode/iso8601 v1.1.0/go.mod h1:FlNp+jz+TXpyRqgmM7tnzHHzBnz776kmAH2h3sZCn0I= -github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo= github.com/rhnvrm/simples3 v0.6.1/go.mod h1:Y+3vYm2V7Y4VijFoJHHTrja6OgPrJ2cBti8dPGkC3sA= github.com/rivo/tview v0.0.0-20200219210816-cd38d7432498/go.mod h1:6lkG1x+13OShEf0EaOCaTQYyB7d5nSbb181KtjlS+84= github.com/rivo/uniseg v0.1.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= @@ -2232,8 +2010,6 @@ 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.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8= github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs= -github.com/rollbar/rollbar-go v1.0.2/go.mod h1:AcFs5f0I+c71bpHlXNNDbOWJiKwjFDtISeXco0L5PKQ= -github.com/rollbar/rollbar-go v1.2.0/go.mod h1:czC86b8U4xdUH7W2C6gomi2jutLm8qK0OtrF5WMvpcc= github.com/rs/cors v1.7.0/go.mod h1:gFx+x8UowdsKA9AchylcLynDq+nNFfI8FkUZdN/jGCU= github.com/rs/cors v1.8.2 h1:KCooALfAYGs415Cwu5ABvv9n9509fSiG5SQJn/AQo4U= github.com/rs/cors v1.8.2/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU= @@ -2249,15 +2025,12 @@ github.com/ryanrolds/sqlclosecheck v0.3.0/go.mod h1:1gREqxyTGR3lVtpngyFo3hZAgk0K 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/safchain/ethtool v0.0.0-20200218184317-f459e2d13664/go.mod h1:Z0q5wiBQGYcxhMZ6gUqHn6pYNLypFAvaL3UvgZLR0U4= github.com/sagikazarmark/crypt v0.6.0/go.mod h1:U8+INwJo3nBv1m6A/8OBXAq7Jnpspk5AxSgDyEQcea8= github.com/sagikazarmark/crypt v0.8.0/go.mod h1:TmKwZAo97S4Fy4sfMH/HX/cQP5D+ijra2NyLpNNmttY= -github.com/samuel/go-zookeeper v0.0.0-20180130194729-c4fab1ac1bec/go.mod h1:gi+0XIa01GRL2eRQVjQkKGqKF3SF9vZR/HnPullcV2E= github.com/samuel/go-zookeeper v0.0.0-20190923202752-2cc03de413da/go.mod h1:gi+0XIa01GRL2eRQVjQkKGqKF3SF9vZR/HnPullcV2E= github.com/sanity-io/litter v1.2.0/go.mod h1:JF6pZUFgu2Q0sBZ+HSV35P8TVPI1TTzEwyu9FXAw2W4= github.com/sanposhiho/wastedassign v0.1.3/go.mod h1:LGpq5Hsv74QaqM47WtIsRSF/ik9kqk07kchgv66tLVE= github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0= -github.com/satori/go.uuid v1.2.1-0.20181028125025-b2ce2384e17b/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0= github.com/scaleway/scaleway-sdk-go v1.0.0-beta.9 h1:0roa6gXKgyta64uqh52AQG3wzZXH21unn+ltzQSXML0= github.com/scaleway/scaleway-sdk-go v1.0.0-beta.9/go.mod h1:fCa7OJZ/9DRTnOKmxvT6pn+LPWUptQAmHF/SBJUGEcg= github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529 h1:nn5Wsu0esKSJiIVhscUtVbo7ada43DJhG55ua/hjS5I= @@ -2271,28 +2044,21 @@ github.com/securego/gosec v0.0.0-20200203094520-d13bb6d2420c/go.mod h1:gp0gaHj0W github.com/securego/gosec/v2 v2.6.1/go.mod h1:I76p3NTHBXsGhybUW+cEQ692q2Vp+A0Z6ZLzDIZy+Ao= github.com/segmentio/asm v1.2.0 h1:9BQrFxC+YOHJlTlHGkTrFWf59nbL3XnCoFLTwDCI7ys= github.com/segmentio/asm v1.2.0/go.mod h1:BqMnlJP91P8d+4ibuonYZw9mfnzI9HfxselHZr5aAcs= -github.com/sercand/kuberesolver v2.4.0+incompatible h1:WE2OlRf6wjLxHwNkkFLQGaZcVLEXjMjBPjjEU5vksH8= -github.com/sercand/kuberesolver v2.4.0+incompatible/go.mod h1:lWF3GL0xptCB/vCiJPl/ZshwPsX/n4Y7u0CW9E7aQIQ= github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo= github.com/shazow/go-diff v0.0.0-20160112020656-b6b7b6733b8c/go.mod h1:/PevMnwAxekIXwN8qQyfc5gl2NlkB3CQlkizAbOkeBs= -github.com/shirou/gopsutil v2.20.9+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA= github.com/shirou/gopsutil/v3 v3.21.1/go.mod h1:igHnfak0qnw1biGeI2qKQvu0ZkwvEkUcCLlYhZzdr/4= -github.com/shirou/gopsutil/v3 v3.21.9/go.mod h1:YWp/H8Qs5fVmf17v7JNZzA0mPJ+mS2e9JdiUF9LlKzQ= github.com/shirou/gopsutil/v3 v3.22.2/go.mod h1:WapW1AOOPlHyXr+yOyw3uYx36enocrtSoSBy0L5vUHY= github.com/shirou/gopsutil/v3 v3.22.6/go.mod h1:EdIubSnZhbAvBS1yJ7Xi+AShB/hxwLHOMz4MCYz7yMs= github.com/shirou/gopsutil/v3 v3.22.10 h1:4KMHdfBRYXGF9skjDWiL4RA2N+E8dRdodU/bOZpPoVg= github.com/shirou/gopsutil/v3 v3.22.10/go.mod h1:QNza6r4YQoydyCfo6rH0blGfKahgibh4dQmV5xdFkQk= github.com/shoenig/test v0.4.3 h1:3+CjrpqCwtL08S0wZQilu9WWR/S2CdsLKhHjbJqPj/I= github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24/go.mod h1:M+9NzErvs504Cn4c5DxATwIqPbtswREoFCre64PpcG4= -github.com/shopspring/decimal v0.0.0-20200105231215-408a2507e114/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o= github.com/shopspring/decimal v1.2.0/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o= github.com/shopspring/decimal v1.3.1 h1:2Usl1nmF/WZucqkFZhnfFYxxxu8LG21F6nPQBE5gKV8= github.com/shopspring/decimal v1.3.1/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o= github.com/shurcooL/go v0.0.0-20180423040247-9e1955d9fb6e/go.mod h1:TDJrrUr11Vxrven61rcy3hJMUqaf/CLWYhHNPmT14Lk= github.com/shurcooL/go-goon v0.0.0-20170922171312-37c2f522c041/go.mod h1:N5mDOmsrJOB+vfqUK+7DmDyjhSLIIBnXo9lvZJj3MWQ= -github.com/shurcooL/httpfs v0.0.0-20190707220628-8d4bc4ba7749/go.mod h1:ZY1cvUeJuFPAdZ/B6v7RHavJWZn2YPVFQ1OSXhCGOkg= github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= -github.com/shurcooL/vfsgen v0.0.0-20200824052919-0d455de96546/go.mod h1:TrYk7fJVaAttu97ZZKrO9UbRa8izdowaMIZcxYMbVaw= github.com/signalfx/com_signalfx_metrics_protobuf v0.0.3 h1:32k2QLgsKhcEs55q4REPKyIadvid5FPy2+VMgvbmKJ0= github.com/signalfx/com_signalfx_metrics_protobuf v0.0.3/go.mod h1:gJrXWi7wSGXfiC7+VheQaz+ypdCt5SmZNL+BRxUe7y4= github.com/signalfx/gohistogram v0.0.0-20160107210732-1ccfd2ff5083 h1:WsShHmu12ZztYPfh9b+I+VjYD1o8iOHhB67WZCMEEE8= @@ -2319,7 +2085,6 @@ github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0 github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d h1:zE9ykElWQ6/NYmHa3jpm/yHnI4xSofP+UP6SpjHcSeM= github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= -github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= github.com/smartystreets/goconvey v1.6.4 h1:fv0U8FUIMPNf1L9lnHLvLhgicrIVChEkdzIKYqbNC9s= github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= github.com/snowflakedb/gosnowflake v1.6.15 h1:P8ddNHa+suNqJtjkgx03PUXge5HkxP/aOcGqcPoPv9g= @@ -2328,12 +2093,8 @@ github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4k github.com/soheilhy/cmux v0.1.5 h1:jjzc5WVemNEDTLwv9tlmemhC73tI08BNOIGwBOo10Js= github.com/soheilhy/cmux v0.1.5/go.mod h1:T7TcVDs9LWfQgPlPsdngu6I6QIoyIFZDDC6sNE1GqG0= github.com/sonatard/noctx v0.0.1/go.mod h1:9D2D/EoULe8Yy2joDHJj7bv3sZoq9AaSb8B4lqBjiZI= -github.com/soniah/gosnmp v1.25.0/go.mod h1:8YvfZxH388NIIw2A+X5z2Oh97VcNhtmxDLt5QeUzVuQ= github.com/sony/gobreaker v0.4.1/go.mod h1:ZKptC7FHNvhBz7dN2LGjPVBz2sZJmc0/PkyDJOjmxWY= -github.com/sony/gobreaker v0.5.0 h1:dRCvqm0P490vZPmy7ppEk2qCnCieBooFJ+YoXGYB+yg= -github.com/sony/gobreaker v0.5.0/go.mod h1:ZKptC7FHNvhBz7dN2LGjPVBz2sZJmc0/PkyDJOjmxWY= github.com/sourcegraph/go-diff v0.6.1/go.mod h1:iBszgVvyxdc8SFZ7gm69go2KDdt3ag071iBaWPF6cjs= -github.com/soveran/redisurl v0.0.0-20180322091936-eb325bc7a4b8/go.mod h1:FVJ8jbHu7QrNFs3bZEsv/L5JjearIAY9N0oXh2wk+6Y= github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= github.com/spaolacci/murmur3 v1.1.0 h1:7c1g84S4BPRrfL5Xrdp6fOJ206sU9y293DDHaoy0bLI= github.com/spaolacci/murmur3 v1.1.0/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= @@ -2348,7 +2109,6 @@ github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkU github.com/spf13/cast v1.3.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= github.com/spf13/cast v1.5.0 h1:rj3WzYc11XZaIZMPKmwP96zkFEnnAmV8s6XbB2aY32w= github.com/spf13/cast v1.5.0/go.mod h1:SpXXQ5YoyJw6s3/6cMTQuxvgRl3PCJiyaX9p6b155UU= -github.com/spf13/cobra v0.0.2/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ= github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ= github.com/spf13/cobra v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU= github.com/spf13/cobra v0.0.7/go.mod h1:/6GTrnGXV9HjY+aR4k0oJ5tcvakLuG6EuKReYlHNrgE= @@ -2377,7 +2137,6 @@ github.com/spf13/viper v1.14.0 h1:Rg7d3Lo706X9tHsJMUjdiwMpHB7W8WnSVOssIY+JElU= github.com/spf13/viper v1.14.0/go.mod h1:WT//axPky3FdvXHzGw33dNdXXXfFQqmEalje+egj8As= github.com/ssgreg/nlreturn/v2 v2.1.0/go.mod h1:E/iiPB78hV7Szg2YfRgyIrk1AD6JVMTRkkxBiELzh2I= github.com/stoewer/go-strcase v1.2.0/go.mod h1:IBiWB2sKIp3wVVQ3Y035++gc+knqhUQag1KpM8ahLw8= -github.com/streadway/amqp v0.0.0-20180528204448-e5adc2ada8b8/go.mod h1:1WNBiOZtZQLpVAyu0iTduoJL9hEsMloAK5XWrtW0xdY= github.com/streadway/amqp v0.0.0-20190404075320-75d898a42a94/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= github.com/streadway/amqp v0.0.0-20190827072141-edfb9018d271/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= github.com/streadway/amqp v1.0.0/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= @@ -2389,7 +2148,6 @@ github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoH github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= github.com/stretchr/objx v0.5.0 h1:1zr/of2m5FGMsad5YfcqgdqdWrIhu+EBEJRhR1U7z/c= github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= -github.com/stretchr/testify v0.0.0-20151208002404-e3a8ff8ce365/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v0.0.0-20161117074351-18a02ba4a312/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.1.4/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= @@ -2412,25 +2170,19 @@ github.com/subosito/gotenv v1.4.1/go.mod h1:ayKnFf/c6rvx/2iiLrJUk1e6plDbT3edrFNG github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635 h1:kdXcSzyDtseVEc4yCz2qF8ZrQvIDBJLl4S1c3GCXmoI= github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww= github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7/go.mod h1:q4W45IWZaF22tdD+VEXcAWRA037jwmWEB5VWYORlTpc= -github.com/tbrandon/mbserver v0.0.0-20170611213546-993e1772cc62/go.mod h1:qUzPVlSj2UgxJkVbH0ZwuuiR46U8RBMDT5KLY78Ifpw= 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/tedsuo/ifrit v0.0.0-20191009134036-9a97d0632f00/go.mod h1:eyZnKCc955uh98WQvzOm0dgAeLnf2O0Rz0LPoC5ze+0= github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.553 h1:RB8GWKSifv5QdBQUUWfzCo06FU4mmqH1VG7dTWMm5nQ= github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.553/go.mod h1:7sCQWVkxcsR38nffDW057DRGk8mUjK1Ing/EFOK8s8Y= github.com/testcontainers/testcontainers-go v0.15.0 h1:3Ex7PUGFv0b2bBsdOv6R42+SK2qoZnWBd21LvZYhUtQ= github.com/tetafro/godot v1.4.4/go.mod h1:FVDd4JuKliW3UgjswZfJfHq4vAx0bD/Jd5brJjGeaz4= github.com/tg123/go-htpasswd v1.2.0 h1:UKp34m9H467/xklxUxU15wKRru7fwXoTojtxg25ITF0= github.com/tg123/go-htpasswd v1.2.0/go.mod h1:h7IzlfpvIWnVJhNZ0nQ9HaFxHb7pn5uFJYLlEUJa2sM= -github.com/thanos-io/thanos v0.28.0 h1:g0LByBE0ANA30/t/a2C/mceYhO3VtIPQFoxCsqrYM9I= -github.com/thanos-io/thanos v0.28.0/go.mod h1:pqjpOBxOCME9Yn1QztV8bP9C4rkhWvWtyyavdBZ8lDk= github.com/theupdateframework/go-tuf v0.3.0 h1:od2sc5+BSkKZhmUG2o2rmruy0BGSmhrbDhCnpxh87X8= github.com/theupdateframework/go-tuf v0.3.0/go.mod h1:E5XP0wXitrFUHe4b8cUcAAdxBW4LbfnqF4WXXGLgWNo= -github.com/tidwall/gjson v1.6.0/go.mod h1:P256ACg0Mn+j1RXIDXoss50DeIABTYK1PULOJHhxOls= github.com/tidwall/gjson v1.10.2/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk= github.com/tidwall/gjson v1.14.3 h1:9jvXn7olKEHU1S9vwoMGliaT8jq1vJ7IH/n9zD9Dnlw= github.com/tidwall/gjson v1.14.3/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk= -github.com/tidwall/match v1.0.1/go.mod h1:LujAq0jyVjBy028G1WhWfIzbpQfMO8bBZ6Tyb0+pL9E= github.com/tidwall/match v1.1.1 h1:+Ho715JplO36QYgwN9PGYNhgZvoUSc9X2c80KVTi+GA= github.com/tidwall/match v1.1.1/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM= github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk= @@ -2459,10 +2211,8 @@ github.com/tomarrell/wrapcheck v0.0.0-20201130113247-1683564d9756/go.mod h1:yiFB github.com/tommy-muehle/go-mnd/v2 v2.3.1/go.mod h1:WsUAkMJMYww6l/ufffCD3m+P7LEvr8TnZn9lwVDlgzw= github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM= github.com/uber/jaeger-client-go v2.25.0+incompatible/go.mod h1:WVhlPFC8FDjOFMMWRy2pZqQJSXxYSwNYOkTr/Z6d3Kk= -github.com/uber/jaeger-client-go v2.28.0+incompatible/go.mod h1:WVhlPFC8FDjOFMMWRy2pZqQJSXxYSwNYOkTr/Z6d3Kk= github.com/uber/jaeger-client-go v2.30.0+incompatible h1:D6wyKGCecFaSRUpo8lCVbaOOb6ThwMmTEbhRwtKR97o= github.com/uber/jaeger-client-go v2.30.0+incompatible/go.mod h1:WVhlPFC8FDjOFMMWRy2pZqQJSXxYSwNYOkTr/Z6d3Kk= -github.com/uber/jaeger-lib v2.2.0+incompatible/go.mod h1:ComeNDZlWwrWnDv8aPp0Ba6+uUTzImX/AauajbLI56U= github.com/uber/jaeger-lib v2.4.0+incompatible/go.mod h1:ComeNDZlWwrWnDv8aPp0Ba6+uUTzImX/AauajbLI56U= github.com/uber/jaeger-lib v2.4.1+incompatible h1:td4jdvLcExb4cBISKIpHuGoVXh+dVKhn2Um6rjCsSsg= github.com/uber/jaeger-lib v2.4.1+incompatible/go.mod h1:ComeNDZlWwrWnDv8aPp0Ba6+uUTzImX/AauajbLI56U= @@ -2470,11 +2220,8 @@ github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGr github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0= github.com/ultraware/funlen v0.0.3/go.mod h1:Dp4UiAus7Wdb9KUZsYWZEWiRzGuM2kXM1lPbfaF6xhA= github.com/ultraware/whitespace v0.0.4/go.mod h1:aVMh/gQve5Maj9hQ/hg+F75lr/X5A89uZnzAmWSineA= -github.com/unrolled/secure v1.0.1/go.mod h1:R6rugAuzh4TQpbFAq69oqZggyBQxFRFQIewtz5z7Jsc= github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA= -github.com/urfave/cli v1.21.0/go.mod h1:lxDj6qX9Q6lWQxIrbrT0nwecwUtRnhVZAJjJZrVUZZQ= github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= -github.com/urfave/cli/v2 v2.2.0/go.mod h1:SE9GqnLQmjVa0iPEY0f1w3ygNIYcIJ0OKPMoW2caLfQ= github.com/urfave/cli/v2 v2.3.0/go.mod h1:LJmUH05zAU44vOAcrfzZQKsZbVcdbOG8rtL3/XcUArI= github.com/uudashr/gocognit v1.0.1/go.mod h1:j44Ayx2KW4+oB6SWMv8KsmHzZrOInQav7D3cQMJ5JUM= github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= @@ -2486,37 +2233,24 @@ github.com/vektah/gqlparser v1.1.2/go.mod h1:1ycwN7Ij5njmMkPPAOaRFY4rET2Enx7IkVv github.com/vektra/mockery v0.0.0-20181123154057-e78b021dcbb5/go.mod h1:ppEjwdhyy7Y31EnHRDm1JkChoC7LXIJ7Ex0VYLWtZtQ= github.com/vincent-petithory/dataurl v1.0.0 h1:cXw+kPto8NLuJtlMsI152irrVw9fRDX8AbShPRpg2CI= github.com/vincent-petithory/dataurl v1.0.0/go.mod h1:FHafX5vmDzyP+1CQATJn7WFKc9CvnvxyvZy6I1MrG/U= -github.com/vishvananda/netlink v0.0.0-20171020171820-b2de5d10e38e/go.mod h1:+SR5DhBJrl6ZM7CoCKvpw5BKroDKQ+PJqOg65H/2ktk= github.com/vishvananda/netlink v1.1.0/go.mod h1:cTgwzPIzzgDAYoQrMm0EdrjRUBkTqKYppBueQtXaqoE= github.com/vishvananda/netlink v1.1.1-0.20210330154013-f5de75959ad5 h1:+UB2BJA852UkGH42H+Oee69djmxS3ANzl2b/JtT1YiA= github.com/vishvananda/netlink v1.1.1-0.20210330154013-f5de75959ad5/go.mod h1:twkDnbuQxJYemMlGd4JFIcuhgX83tXhKS2B/PRMpOho= -github.com/vishvananda/netns v0.0.0-20180720170159-13995c7128cc/go.mod h1:ZjcWmFBXmLKZu9Nxj3WKYEafiSqer2rnvPr0en9UNpI= github.com/vishvananda/netns v0.0.0-20191106174202-0a2b9b5464df/go.mod h1:JP3t17pCcGlemwknint6hfoeCVQrEMVwxRLRjXpq+BU= github.com/vishvananda/netns v0.0.0-20200728191858-db3c7e526aae/go.mod h1:DD4vA1DwXk04H54A1oHXtwZmA0grkVMdPxx/VGLCah0= github.com/vishvananda/netns v0.0.0-20210104183010-2eb08e3e575f h1:p4VB7kIXpOQvVn1ZaTIVp+3vuYAXFe3OJEvjbUYJLaA= github.com/vishvananda/netns v0.0.0-20210104183010-2eb08e3e575f/go.mod h1:DD4vA1DwXk04H54A1oHXtwZmA0grkVMdPxx/VGLCah0= -github.com/vjeantet/grok v1.0.0/go.mod h1:/FWYEVYekkm+2VjcFmO9PufDU5FgXHUz9oy2EGqmQBo= github.com/vmihailenco/msgpack/v4 v4.3.12 h1:07s4sz9IReOgdikxLTKNbBdqDMLsjPKXwvCazn8G65U= github.com/vmihailenco/tagparser v0.1.2 h1:gnjoVuB/kljJ5wICEEOpx98oXMWPLj22G67Vbd1qPqc= github.com/vmware/go-vmware-nsxt v0.0.0-20220328155605-f49a14c1ef5f h1:NbC9yOr5At92seXK+kOr2TzU3mIWzcJOVzZasGSuwoU= github.com/vmware/go-vmware-nsxt v0.0.0-20220328155605-f49a14c1ef5f/go.mod h1:VEqcmf4Sp7gPB7z05QGyKVmn6xWppr7Nz8cVNvyC80o= -github.com/vmware/govmomi v0.19.0/go.mod h1:URlwyTFZX72RmxtxuaFL2Uj3fD1JTvZdx59bHWk6aFU= github.com/vmware/govmomi v0.29.0 h1:SHJQ7DUc4fltFZv16znJNGHR1/XhiDK5iKxm2OqwkuU= github.com/vmware/govmomi v0.29.0/go.mod h1:F7adsVewLNHsW/IIm7ziFURaXDaHEwcc+ym4r3INMdY= github.com/vultr/govultr/v2 v2.17.2 h1:gej/rwr91Puc/tgh+j33p/BLR16UrIPnSr+AIwYWZQs= github.com/vultr/govultr/v2 v2.17.2/go.mod h1:ZFOKGWmgjytfyjeyAdhQlSWwTjh2ig+X49cAp50dzXI= github.com/wadey/gocovmerge v0.0.0-20160331181800-b5bfa59ec0ad/go.mod h1:Hy8o65+MXnS6EwGElrSRjUzQDLXreJlzYLlWiHtt8hM= -github.com/wavefronthq/wavefront-sdk-go v0.9.2/go.mod h1:hQI6y8M9OtTCtc0xdwh+dCER4osxXdEAeCpacjpDZEU= github.com/wavefronthq/wavefront-sdk-go v0.11.0 h1:U9iJ4KFKebf4FB87z182DGiu1OXsRexv8DYCEj48HTA= github.com/wavefronthq/wavefront-sdk-go v0.11.0/go.mod h1:oKJ9Y0y36n+szFm2NiivXI+UubZe3lwfWnN1p+mFNDw= -github.com/weaveworks/common v0.0.0-20221201103051-7c2720a9024d h1:9Z/HiqeGN+LOnmotAMpFEQjuXZ4AGAVFG0rC1laP5Go= -github.com/weaveworks/common v0.0.0-20221201103051-7c2720a9024d/go.mod h1:Fnq3+U51tMkPRMC6Wr7zKGUeFFYX4YjNrNK50iU0fcE= -github.com/weaveworks/promrus v1.2.0 h1:jOLf6pe6/vss4qGHjXmGz4oDJQA+AOCqEL3FvvZGz7M= -github.com/weaveworks/promrus v1.2.0/go.mod h1:SaE82+OJ91yqjrE1rsvBWVzNZKcHYFtMUyS1+Ogs/KA= -github.com/willf/bitset v1.1.11 h1:N7Z7E9UvjW+sGsEl7k/SJrvY2reP1A07MrGuCjIOjRE= -github.com/willf/bloom v2.0.3+incompatible h1:QDacWdqcAUI1MPOwIQZRy9kOR7yxfyEmxX8Wdm2/JPA= -github.com/wvanbergen/kafka v0.0.0-20171203153745-e2edea948ddf/go.mod h1:nxx7XRXbR9ykhnC8lXqQyJS0rfvJGxKyKw/sT1YOttg= -github.com/wvanbergen/kazoo-go v0.0.0-20180202103751-f72d8611297a/go.mod h1:vQQATAGxVK20DC1rRubTJbZDDhhpA4QfU02pMdPxGO4= github.com/xdg-go/pbkdf2 v1.0.0 h1:Su7DPu48wXMwC3bs7MCNG+z4FhcyEuz5dlvchbq0B0c= github.com/xdg-go/pbkdf2 v1.0.0/go.mod h1:jrpuAogTd400dnrH08LKmI/xc1MbPOebTwRqcT5RDeI= github.com/xdg-go/scram v1.0.2/go.mod h1:1WAq6h33pAW+iRreB34OORO2Nf7qel3VV3fjBj+hCSs= @@ -2530,7 +2264,6 @@ github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c/go.mod h1:lB8K/P019DLNhe github.com/xdg/stringprep v0.0.0-20180714160509-73f8eece6fdc/go.mod h1:Jhud4/sHMO4oL310DaZAKk9ZaJ08SJfe+sJh0HrGL1Y= github.com/xdg/stringprep v1.0.0/go.mod h1:Jhud4/sHMO4oL310DaZAKk9ZaJ08SJfe+sJh0HrGL1Y= github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= -github.com/xlab/treeprint v1.1.0/go.mod h1:gj5Gd3gPdKtR1ikdDK6fnFLdmIS0X30kTTuNd/WEJu0= github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q= github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d h1:splanxYIlg+5LfHAM6xpdFEAYOk8iySO56hMFq6uLyA= github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d/go.mod h1:rHwXgn7JulP+udvsHwJoVG1YGAP6VLg4y9I5dyZdqmA= @@ -2539,9 +2272,7 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= -github.com/yuin/goldmark v1.4.1/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= -github.com/yuin/gopher-lua v0.0.0-20180630135845-46796da1b0b4/go.mod h1:aEV29XrmTYFr3CiRxZeGHpkvbwq+prZduBqMaascyCU= github.com/yuin/gopher-lua v0.0.0-20200816102855-ee81675732da/go.mod h1:E1AXubJBdNmFERAOucpDIxNzeGfLzg0mYh+UfMWdChA= github.com/yuin/gopher-lua v0.0.0-20220504180219-658193537a64 h1:5mLPGnFdSsevFRFc9q3yYbBkB6tsm4aCwwQV/j1JQAQ= github.com/yuin/gopher-lua v0.0.0-20220504180219-658193537a64/go.mod h1:GBR0iDaNXjAgGg9zfCvksxSRnQx76gclCIb7kdAd1Pw= @@ -2556,18 +2287,15 @@ go.etcd.io/bbolt v1.3.6/go.mod h1:qXsaaIqmgQH0T+OPdb99Bf+PKfBBQVAdyD6TY9G8XM4= go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738/go.mod h1:dnLIgRNXwCJa5e+c6mIZCrds/GIG4ncV9HhK5PX7jPg= go.etcd.io/etcd/api/v3 v3.5.0/go.mod h1:cbVKeC6lCfl7j/8jBhAK6aIYO9XOjdptoxU/nLQcPvs= go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A= -go.etcd.io/etcd/api/v3 v3.5.5 h1:BX4JIbQ7hl7+jL+g+2j5UAr0o1bctCm6/Ct+ArBGkf0= go.etcd.io/etcd/api/v3 v3.5.5/go.mod h1:KFtNaxGDw4Yx/BA4iPPwevUTAuqcsPxzyX8PHydchN8= go.etcd.io/etcd/client/pkg/v3 v3.5.0/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= -go.etcd.io/etcd/client/pkg/v3 v3.5.5 h1:9S0JUVvmrVl7wCF39iTQthdaaNIiAaQbmK75ogO6GU8= go.etcd.io/etcd/client/pkg/v3 v3.5.5/go.mod h1:ggrwbk069qxpKPq8/FKkQ3Xq9y39kbFR4LnKszpRXeQ= go.etcd.io/etcd/client/v2 v2.305.0/go.mod h1:h9puh54ZTgAKtEbut2oe9P4L/oqKCVB6xsXlzd7alYQ= go.etcd.io/etcd/client/v2 v2.305.4/go.mod h1:Ud+VUwIi9/uQHOMA+4ekToJ12lTxlv0zB/+DHwTGEbU= go.etcd.io/etcd/client/v2 v2.305.5/go.mod h1:zQjKllfqfBVyVStbt4FaosoX2iYd8fV/GRy/PbowgP4= go.etcd.io/etcd/client/v3 v3.5.0/go.mod h1:AIKXXVX/DQXtfTEqBryiLTUXwON+GuvO6Z7lLS/oTh0= go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= -go.etcd.io/etcd/client/v3 v3.5.5 h1:q++2WTJbUgpQu4B6hCuT7VkdwaTP7Qz6Daak3WzbrlI= go.etcd.io/etcd/client/v3 v3.5.5/go.mod h1:aApjR4WGlSumpnJ2kloS75h6aHUmAyaPLjHMxpc7E7c= go.mongodb.org/atlas v0.19.0 h1:gvezG9d0KsSDaExEdTtcGqZHRvvVazzuEcBUpBXxmlg= go.mongodb.org/atlas v0.19.0/go.mod h1:PFk1IGhiGjFXHGVspOK7i1U2nnPjK8wAjYwQf6FoVf4= @@ -2586,7 +2314,6 @@ go.opencensus.io v0.20.1/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk= go.opencensus.io v0.20.2/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk= go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= -go.opencensus.io v0.22.1/go.mod h1:Ap50jQcDJrx6rB6VgeeFPtuPIf3wMRvRfrfYDO6+BmA= 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= @@ -2596,60 +2323,45 @@ go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= go.opentelemetry.io/collector v0.57.2/go.mod h1:9TwWyMRhbFNzaaGLtm/6poWNDJw+etvQMS6Fy+8/8Xs= go.opentelemetry.io/collector v0.64.1/go.mod h1:RxdEKzwxTEhBAgzC4wzyJEwSFgjWU73CHnLjKUKQDyo= -go.opentelemetry.io/collector v0.65.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/component v0.65.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/consumer v0.65.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/exporter/loggingexporter v0.66.1-0.20221202005155-1c54042beb70 h1:/C637mgJY6I0l/KFLXmL9I1foefM53aob20WF2Yh/0Y= -go.opentelemetry.io/collector/exporter/loggingexporter v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:xxkHO5NrxffTV22dhCy3K8XZThGJ1ak7LZ1ctoiJp5k= -go.opentelemetry.io/collector/exporter/otlpexporter v0.66.1-0.20221202005155-1c54042beb70 h1:m9GPfziw/079Xt7/Pfby/5obJhtqR19WKkgQQ/VxNZo= -go.opentelemetry.io/collector/exporter/otlpexporter v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:bCD3trc7OqeEVCgyQdO3kwGgogZMjcMu2tX49SFv1lU= -go.opentelemetry.io/collector/exporter/otlphttpexporter v0.66.1-0.20221202005155-1c54042beb70 h1:7rDNCZS1qfqZxnCLaBWItnX/TweYKC6NyULpelzXl4g= -go.opentelemetry.io/collector/exporter/otlphttpexporter v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:vkFlRP0DDfDfSDVl96Gvy5Ah8L8sMcVAxMZn+0af2ew= -go.opentelemetry.io/collector/extension/ballastextension v0.66.1-0.20221202005155-1c54042beb70 h1:pSGZDMMURLRp7iSxeNlDNDxDgFQJqCYt+Fv7bZxC0JU= -go.opentelemetry.io/collector/extension/ballastextension v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:+YdyZisEXLDE8rhZE7Ce4wli0ZVE164SFN0qg2mPjDU= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/component v0.67.0 h1:GCBRZAqk4yNaT4L1uwlbbwophFHrxYccLZ4Uj1Ifs/M= +go.opentelemetry.io/collector/component v0.67.0/go.mod h1:Txa2lm9oe7xsGQN8u7GdUIrRpAHFIKsTO4Qi3/CSmKk= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/exporter/loggingexporter v0.67.0 h1:09dH5PKxcqKuvxzCVf/j+oEgDYC2LBTgDhaDxujdEO8= +go.opentelemetry.io/collector/exporter/loggingexporter v0.67.0/go.mod h1:8sHgDw0tYsBQTunEBZojJ/L43CyaKVPAvT6eqGlo7xo= +go.opentelemetry.io/collector/exporter/otlpexporter v0.67.0 h1:AxejzV7pxCQjdIsIBLQPbeub2SqbyAsu09TA1BG0jcs= +go.opentelemetry.io/collector/exporter/otlpexporter v0.67.0/go.mod h1:urludZR9ya0gUNf7JXzKL06gX2Anu4BDa6UfCvI61Hw= +go.opentelemetry.io/collector/exporter/otlphttpexporter v0.67.0 h1:B91LfbKa0Khqc8SX2aVd5D2g9aDpeCEJ+jDjNb894mA= +go.opentelemetry.io/collector/exporter/otlphttpexporter v0.67.0/go.mod h1:o7HgN765fAq2cuATsQF2BLhbXiFJ+fK0NIbfcmw2Pa8= +go.opentelemetry.io/collector/extension/ballastextension v0.67.0 h1:fqwrpnAZ/4B5Ghs3vkAZiBnW5b9ro8dbhNa1kw61IXA= +go.opentelemetry.io/collector/extension/ballastextension v0.67.0/go.mod h1:aLm/LXcYAfRW+VWPczi5DKgCcajYPve0Z+fcPLw0w3U= go.opentelemetry.io/collector/extension/zpagesextension v0.64.1/go.mod h1:XenhQAUbOHgqNq5YQ/vQIcDHRcPUaDgZQxDC2qoI4Bc= -go.opentelemetry.io/collector/extension/zpagesextension v0.65.0/go.mod h1:+IPas7AeffG0GMIXhZr8IzpTNhH1Ri/6S/9YFqbLsmQ= -go.opentelemetry.io/collector/extension/zpagesextension v0.66.0/go.mod h1:+IPas7AeffG0GMIXhZr8IzpTNhH1Ri/6S/9YFqbLsmQ= -go.opentelemetry.io/collector/extension/zpagesextension v0.66.1-0.20221202005155-1c54042beb70 h1:+vq59gRJpiAcUshBVxhqhc9aXOc/8Z5wuWlyng5Hfm4= -go.opentelemetry.io/collector/extension/zpagesextension v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tejEMB1pDXsmEeyg7UHB+S++4Lvgtki7N5CVWk5rI4A= -go.opentelemetry.io/collector/featuregate v0.65.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/extension/zpagesextension v0.67.0 h1:TRW8vZwE+/h2vJqqMDmyQO9X0sxcYCSXf5MyXozSLas= +go.opentelemetry.io/collector/extension/zpagesextension v0.67.0/go.mod h1:let/Bt3vTou1cVKhfv+z6FTSk3JaYV11z9C4O/PDPrA= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= go.opentelemetry.io/collector/pdata v0.56.0/go.mod h1:mYcCREWiIJyHss0dbU+GSiz2tmGZ6u09vtfkKTciog4= go.opentelemetry.io/collector/pdata v0.57.2/go.mod h1:RU9I8lwBUxucwOsSYzHEcHi15M9QaX78hgQ2PRdSxV0= go.opentelemetry.io/collector/pdata v0.64.1/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= -go.opentelemetry.io/collector/pdata v0.65.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= go.opentelemetry.io/collector/processor/batchprocessor v0.64.1/go.mod h1:qVl0+aYokPfiq5y+JVAvlII2rrUFBDEqqiDbTSnax78= -go.opentelemetry.io/collector/processor/batchprocessor v0.65.0/go.mod h1:XhGTsC1B/bq4gpg8IZ/QYBLXkzE4Gw3r7Xu2+ik8A1Q= -go.opentelemetry.io/collector/processor/batchprocessor v0.66.0/go.mod h1:XhGTsC1B/bq4gpg8IZ/QYBLXkzE4Gw3r7Xu2+ik8A1Q= -go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221202005155-1c54042beb70 h1:Y4e8NnVevonnAgmjX9Z7QIMA32yMqHAOnAlh8SzTS8c= -go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:Pi1CsKDQFoDrUP1i3+VdE6s2Xuji7bOGFBgqHK0J32E= -go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.66.1-0.20221202005155-1c54042beb70 h1:l0005D1ERsXKno9Ax5Gr2A8FaysF7n40yer6r5qAMHQ= -go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:9CBysimj8fH0weF6Wu8S8nW7cG/XRanrMU1BWlIXeN4= +go.opentelemetry.io/collector/processor/batchprocessor v0.67.0 h1:Qn4Ytth3q1trwTSAYYTzIRs4SBh9rz0xBou1nZB+Dko= +go.opentelemetry.io/collector/processor/batchprocessor v0.67.0/go.mod h1:+ZXCkUG9tlwbbVLi+PT9DjQ7vz+lfFSQqvW45snLYno= +go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.67.0 h1:m3GK5/lZIznGFzzvSPuQo5jxvEn43efv4VkvPtZwDI8= +go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.67.0/go.mod h1:YYjx8ouKYP6AZJ4f4PQPo8cuzcE8n4atn7gOoB890FQ= go.opentelemetry.io/collector/receiver/otlpreceiver v0.64.1/go.mod h1:4rwNi9SeCKBP9XGLWNRFKPsWUV5NK4iqMvdj2WRMksQ= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.66.1-0.20221202005155-1c54042beb70 h1:KBbbPVDV7o5w857g6ePphdu4MV87jrcQevFYDA1okUk= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:0Py8RNjNiFRH6/F+vM2uptdaw9hMj1FBdv0ySntM2gE= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.67.0 h1:pMluLYSSAH7n8zkPWYkWGY/pALrVxG9rHX8J/WDrcx0= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.67.0/go.mod h1:GIJc0eu4N2oJB420N3NhSFJ1IhAgCwvlTCMGWxKhXgg= go.opentelemetry.io/collector/semconv v0.56.0/go.mod h1:EH1wbDvTyqKpKBBpoMIe0KQk2plCcFS66Mo17WtR7CQ= go.opentelemetry.io/collector/semconv v0.57.2/go.mod h1:84YnUjmm+nhGu4YTDLnHCbxnL74ooWpismPG79tFD7w= go.opentelemetry.io/collector/semconv v0.64.1/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= -go.opentelemetry.io/collector/semconv v0.65.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= -go.opentelemetry.io/collector/semconv v0.66.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 h1:Q5L9Urod3c8as6ZYaoaqBjarx/HXxsxy34DFZIU2fO4= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector/semconv v0.67.0 h1:zLAvcQa6Kgow52FFLrmk7/9ZVtEYyA73+xDtCcFG78Q= +go.opentelemetry.io/collector/semconv v0.67.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.33.0/go.mod h1:y/SlJpJQPd2UzfBCj0E9Flk9FDCtTyqUmaCB41qFrWI= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4 h1:PRXhsszxTt5bbPriTjmaweWUsAnJYeWBhUMLRetUgBU= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4/go.mod h1:05eWWy6ZWzmpeImD3UowLTB3VjDMU1yxQ+ENuVWDM3c= @@ -2661,53 +2373,31 @@ go.opentelemetry.io/contrib/propagators/b3 v1.11.1/go.mod h1:ECIveyMXgnl4gorxFcA go.opentelemetry.io/contrib/zpages v0.33.0/go.mod h1:ddmD63NkBVE29GucaBBCR8/b/TRlY+PkpIbF3m2JF7Y= go.opentelemetry.io/contrib/zpages v0.36.4 h1:Z2VK5WsDhWs9VwZ1p0TM5RyusTOgAQfdMMDDQPRnlmY= go.opentelemetry.io/contrib/zpages v0.36.4/go.mod h1:h1gnOu0cOfDGEncNgLsjQ5H/9eAzt9LXsa1WvH7I5KU= -go.opentelemetry.io/otel v1.0.0-RC1/go.mod h1:x9tRa9HK4hSSq7jf2TKbqFbtt58/TGk0f9XiEYISI1I= -go.opentelemetry.io/otel v1.0.0-RC3/go.mod h1:Ka5j3ua8tZs4Rkq4Ex3hwgBgOchyPVq5S6P2lz//nKQ= go.opentelemetry.io/otel v1.8.0/go.mod h1:2pkj+iMj0o03Y+cW6/m8Y4WkRdYN3AvCXCnzRMp9yvM= go.opentelemetry.io/otel v1.9.0/go.mod h1:np4EoPGzoPs3O67xUVNoPPcmSvsfOxNlNA4F4AC+0Eo= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= -go.opentelemetry.io/otel/exporters/otlp/otlpmetric v0.22.0/go.mod h1:gIp6+vQxqmh6Vd/mucqnsaFpOuVycQAS/BBXMKzJk0w= -go.opentelemetry.io/otel/exporters/otlp/otlpmetric v0.23.0/go.mod h1:pe9oOWRaZyapdajWCn64fnl76v3cmTEmNBgh7MkKvwE= -go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v0.23.0/go.mod h1:aSP5oMNaAfOYq+sRydHANZ0vBYLyZR/3lR9pru9aPLk= -go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v0.22.0/go.mod h1:FX3Hvv/Hwb4WtlrAvco4QCsfxsaqg/UoYA6WFCnT1Ro= go.opentelemetry.io/otel/exporters/prometheus v0.31.0/go.mod h1:QarXIB8L79IwIPoNgG3A6zNvBgVmcppeFogV1d8612s= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= go.opentelemetry.io/otel/exporters/prometheus v0.33.0/go.mod h1:ZSmYfKdYWEdSDBB4njLBIwTf4AU2JNsH3n2quVQDebI= -go.opentelemetry.io/otel/internal/metric v0.22.0/go.mod h1:7qVuMihW/ktMonEfOvBXuh6tfMvvEyoIDgeJNRloYbQ= -go.opentelemetry.io/otel/internal/metric v0.23.0/go.mod h1:z+RPiDJe30YnCrOhFGivwBS+DU1JU/PiLKkk4re2DNY= -go.opentelemetry.io/otel/metric v0.22.0/go.mod h1:KcsUkBiYGW003DJ+ugd2aqIRIfjabD9jeOUXqsAtrq0= -go.opentelemetry.io/otel/metric v0.23.0/go.mod h1:G/Nn9InyNnIv7J6YVkQfpc0JCfKBNJaERBGw08nqmVQ= go.opentelemetry.io/otel/metric v0.31.0/go.mod h1:ohmwj9KTSIeBnDBm/ZwH2PSZxZzoOaG2xZeekTRzL5A= go.opentelemetry.io/otel/metric v0.33.0 h1:xQAyl7uGEYvrLAiV/09iTJlp1pZnQ9Wl793qbVvED1E= go.opentelemetry.io/otel/metric v0.33.0/go.mod h1:QlTYc+EnYNq/M2mNk1qDDMRLpqCOj2f/r5c7Fd5FYaI= -go.opentelemetry.io/otel/oteltest v1.0.0-RC1/go.mod h1:+eoIG0gdEOaPNftuy1YScLr1Gb4mL/9lpDkZ0JjMRq4= -go.opentelemetry.io/otel/sdk v1.0.0-RC1/go.mod h1:kj6yPn7Pgt5ByRuwesbaWcRLA+V7BSDg3Hf8xRvsvf8= -go.opentelemetry.io/otel/sdk v1.0.0-RC3/go.mod h1:78H6hyg2fka0NYT9fqGuFLvly2yCxiBXDJAgLKo/2Us= go.opentelemetry.io/otel/sdk v1.8.0/go.mod h1:uPSfc+yfDH2StDM/Rm35WE8gXSNdvCg023J6HeGNO0c= go.opentelemetry.io/otel/sdk v1.11.1 h1:F7KmQgoHljhUuJyA+9BiU+EkJfyX5nVVF4wyzWZpKxs= go.opentelemetry.io/otel/sdk v1.11.1/go.mod h1:/l3FE4SupHJ12TduVjUkZtlfFqDCQJlOlithYrdktys= -go.opentelemetry.io/otel/sdk/export/metric v0.22.0/go.mod h1:a14rf2CiHSn9xjB6cHuv0HoZGl5C4w2PAgl+Lja1VzU= -go.opentelemetry.io/otel/sdk/export/metric v0.23.0/go.mod h1:SuMiREmKVRIwFKq73zvGTvwFpxb/ZAYkMfyqMoOtDqs= -go.opentelemetry.io/otel/sdk/metric v0.22.0/go.mod h1:LzkI0G0z6KhEagqmzgk3bw/dglE2Tk2OXs455UMcI0s= -go.opentelemetry.io/otel/sdk/metric v0.23.0/go.mod h1:wa0sKK13eeIFW+0OFjcC3S1i7FTRRiLAXe1kjBVbhwg= go.opentelemetry.io/otel/sdk/metric v0.31.0/go.mod h1:fl0SmNnX9mN9xgU6OLYLMBMrNAsaZQi7qBwprwO3abk= go.opentelemetry.io/otel/sdk/metric v0.33.0 h1:oTqyWfksgKoJmbrs2q7O7ahkJzt+Ipekihf8vhpa9qo= go.opentelemetry.io/otel/sdk/metric v0.33.0/go.mod h1:xdypMeA21JBOvjjzDUtD0kzIcHO/SPez+a8HOzJPGp0= -go.opentelemetry.io/otel/trace v1.0.0-RC1/go.mod h1:86UHmyHWFEtWjfWPSbu0+d0Pf9Q6e1U+3ViBOc+NXAg= -go.opentelemetry.io/otel/trace v1.0.0-RC3/go.mod h1:VUt2TUYd8S2/ZRX09ZDFZQwn2RqfMB5MzO17jBojGxo= go.opentelemetry.io/otel/trace v1.8.0/go.mod h1:0Bt3PXY8w+3pheS3hQUt+wow8b1ojPaTBoTCh2zIFI4= go.opentelemetry.io/otel/trace v1.9.0/go.mod h1:2737Q0MuG8q1uILYm2YYVkAyLtOofiTNGg6VODnOiPo= go.opentelemetry.io/otel/trace v1.11.1 h1:ofxdnzsNrGBYXbP7t7zpUK281+go5rF7dvdIZXF8gdQ= go.opentelemetry.io/otel/trace v1.11.1/go.mod h1:f/Q9G7vzk5u91PhbmKbg1Qn0rzH1LJ4vbPHFGkTPtOk= 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.15.0/go.mod h1:H7XAot3MsfNsj7EXtrA2q5xSNQ10UqI405h3+duxN4U= -go.starlark.net v0.0.0-20200901195727-6e684ef5eeee/go.mod h1:f0znQkUKRrkk36XxWbGjMqQM8wGv/xHBVE2qc3B5oFU= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= -go.uber.org/atomic v1.5.1/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= @@ -2739,18 +2429,12 @@ go.uber.org/zap v1.22.0/go.mod h1:H4siCOZOrAolnUPJEkfaSjDqyP+BDS0DdDWzwcgt3+U= go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= -go4.org/intern v0.0.0-20211027215823-ae77deb06f29 h1:UXLjNohABv4S58tHmeuIZDO6e3mHpW2Dx33gaNt03LE= -go4.org/intern v0.0.0-20211027215823-ae77deb06f29/go.mod h1:cS2ma+47FKrLPdXFpr7CuxiTW3eyJbWew4qx0qtQWDA= -go4.org/unsafe/assume-no-moving-gc v0.0.0-20211027215541-db492cf91b37/go.mod h1:FftLjUGFEDu5k8lt0ddY+HcrH/qU/0qk+H8j9/nTl3E= -go4.org/unsafe/assume-no-moving-gc v0.0.0-20220617031537-928513b29760 h1:FyBZqvoA/jbNzuAWLQE2kG820zMAkcilx6BMjGbL/E4= -go4.org/unsafe/assume-no-moving-gc v0.0.0-20220617031537-928513b29760/go.mod h1:FftLjUGFEDu5k8lt0ddY+HcrH/qU/0qk+H8j9/nTl3E= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190228161510-8dd112bcdc25/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190320223903-b7391e95e576/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190404164418-38d8ce5564a5/go.mod h1:WFFai1msRO1wXaEeE5yQxYXgSfI8pQAWXbQop6sCtWE= golang.org/x/crypto v0.0.0-20190411191339-88737f569e3a/go.mod h1:WFFai1msRO1wXaEeE5yQxYXgSfI8pQAWXbQop6sCtWE= golang.org/x/crypto v0.0.0-20190422162423-af44ce270edf/go.mod h1:WFFai1msRO1wXaEeE5yQxYXgSfI8pQAWXbQop6sCtWE= @@ -2762,16 +2446,12 @@ golang.org/x/crypto v0.0.0-20190617133340-57b3e21c3d56/go.mod h1:yigFU9vqHzYiE8U golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/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-20191002192127-34f69633bfdc/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20200204104054-c9f3fb736b72/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200323165209-0ec3e9974c59/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20200414173820-0848c9571904/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200510223506-06a226fb4e37/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20201112155050-0c6587e931a9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= @@ -2793,7 +2473,6 @@ golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4/go.mod h1:IxCIyHEi3zRg3s0 golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= -golang.org/x/crypto v0.0.0-20221012134737-56aed061732a/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.3.0 h1:a06MkbcxBrEFc0w0QIZWXrH/9cCX6KJyWbBOIwAn+7A= golang.org/x/crypto v0.3.0/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4= golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= @@ -2822,7 +2501,6 @@ golang.org/x/image v0.0.0-20200430140353-33d19683fad8/go.mod h1:FeLwcggjj3mMvU+o golang.org/x/image v0.0.0-20200618115811-c13761719519/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= golang.org/x/image v0.0.0-20201208152932-35266b937fa6/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= golang.org/x/image v0.0.0-20210216034530-4410531fe030/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= -golang.org/x/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= 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= @@ -2849,18 +2527,15 @@ golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.5.0/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro= -golang.org/x/mod v0.5.1/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= golang.org/x/mod v0.7.0 h1:LapD9S96VoQRhi/GrNTqeBJFrUjs5UHCAtTlgwA5oZA= golang.org/x/mod v0.7.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= -golang.org/x/net v0.0.0-20170114055629-f2499483f923/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180530234432-1e491301e022/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181005035420-146acd28ed58/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20181106065722-10aee1819953/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -2883,9 +2558,6 @@ golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLL golang.org/x/net v0.0.0-20190921015927-1a5e07d1ff72/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20191002035440-2ec189313ef0/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20191003171128-d98b1b443823/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20191004110552-13f9640d40b9/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20191007182048-72f939374954/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20191112182307-2180aed22343/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= @@ -2905,7 +2577,6 @@ golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81R golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20200813134508-3edf25e44fcc/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= -golang.org/x/net v0.0.0-20200904194848-62affa334b73/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20201010224723-4f7140c49acb/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= @@ -2922,7 +2593,6 @@ golang.org/x/net v0.0.0-20210410081132-afb366fc7cd1/go.mod h1:9tjilg8BloeKEkVJvy golang.org/x/net v0.0.0-20210421230115-4e50805a0758/go.mod h1:72T/g9IO56b78aLF+1Kcs5dz7/ng1VjMUvfKvpfy+jM= golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk= golang.org/x/net v0.0.0-20210503060351-7fd8e65b6420/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20210510120150-4163338589ed/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= 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= @@ -2930,7 +2600,6 @@ golang.org/x/net v0.0.0-20210726213435-c6fcb2dbf985/go.mod h1:9nx3DQGgdP8bBQD5qx 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-20210917221730-978cfadd31cf/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20211216030914-fe4d6282115f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= @@ -2998,7 +2667,6 @@ golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20220929204114-8fcdb60fdcc0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o= golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sys v0.0.0-20170830134202-bb24a47a89ea/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= 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= @@ -3016,7 +2684,6 @@ golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5h golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190321052220-f7bb7a8bee54/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190411185658-b44545bcd369/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190419153524-e8e3143a4f4a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -3031,7 +2698,6 @@ golang.org/x/sys v0.0.0-20190626150813-e07cf5db2756/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20190626221950-04f50cda93cb/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190712062909-fae7ac547cb7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190804053845-51ab0e2deafa/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -3039,7 +2705,6 @@ golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7w 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-20191003212358-c178f38b412c/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-20191010194322-b09406accb47/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -3075,7 +2740,6 @@ golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200728102440-3e129f6d46b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200814200057-3d37ad5750ed/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200826173525-f9321e4c35a6/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200923182605-d9f96fdee20d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -3112,15 +2776,12 @@ golang.org/x/sys v0.0.0-20210816074244-15123e1e1f71/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20210816183151-1e6c022a8912/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210819135213-f52c844e1c1c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210902050250-f475640dd07b/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-20210908233432-aa78b53d3365/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210917161153-d61c044b1678/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/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-20211102061401-a2f17f7b995c/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-20211124211545-fe61309f8881/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211210111614-af8b64212486/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -3158,7 +2819,6 @@ golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuX golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.3.0 h1:qoo4akIqOcDME5bhc/NgxUdovd6BSS2uMsVjB56q1xI= golang.org/x/term v0.3.0/go.mod h1:q750SLmJuPmVoN1blW3UFBPREJfb1KmY3vwxfr+nFDA= -golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= 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= @@ -3178,7 +2838,6 @@ golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxb 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.0.0-20200416051211-89c76fbcd5d1/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/time v0.0.0-20201208040808-7e3f01d25324/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20220609170525-579cf78fd858/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= @@ -3188,7 +2847,6 @@ golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGm golang.org/x/tools v0.0.0-20180525024113-a5b4c53f6e8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20181011042414-1f849cf54d09/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20181112210238-4b1f3b6b1646/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190110163146-51295c7ec13a/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= @@ -3250,7 +2908,6 @@ golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod h1:TB2adYChydJhpapK 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-20200317043434-63da46f3035e/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8= golang.org/x/tools v0.0.0-20200324003944-a576cf524670/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8= golang.org/x/tools v0.0.0-20200329025819-fd4102a86c65/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8= golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8= @@ -3300,7 +2957,6 @@ 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.6-0.20210726203631-07bc1bf47fb2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= -golang.org/x/tools v0.1.9/go.mod h1:nABZi5QlRsZVlzPpHl034qft6wpY4eDcsTt5AaioBiU= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= golang.org/x/tools v0.2.0 h1:G6AHpWxTMGY1KyEYoAQ5WTtIekUUvDNjan3ugu60JvE= golang.org/x/tools v0.2.0/go.mod h1:y4OqIKeOV/fWJetJ8bXPU1sEVniLMIyDAZWeHdV+NTA= @@ -3315,11 +2971,7 @@ golang.org/x/xerrors v0.0.0-20220517211312-f3a8303e98df/go.mod h1:K8+ghG5WaK9qNq golang.org/x/xerrors v0.0.0-20220609144429-65e65417b02f/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8= golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 h1:H2TDz8ibqkAF6YGhCdN3jS9O0/s90v0rJh3X/OLHEUk= golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8= -golang.zx2c4.com/wireguard v0.0.20200121/go.mod h1:P2HsVp8SKwZEufsnezXZA4GRX/T49/HlU7DGuelXsU4= -golang.zx2c4.com/wireguard/wgctrl v0.0.0-20200205215550-e35592f146e4/go.mod h1:UdS9frhv65KTfwxME1xE8+rHYoFpbm36gOud1GhBe9c= gonum.org/v1/gonum v0.0.0-20180816165407-929014505bf4/go.mod h1:Y+Yx5eoAFn32cQvJDxZx5Dpnq+c3wtXuadVZAcxbbBo= -gonum.org/v1/gonum v0.0.0-20190502212712-4a2eb0188cbc/go.mod h1:2ltnJ7xHfj0zHS40VVPYEAAMTa3ZGguvHGBSJeRWqE0= -gonum.org/v1/gonum v0.6.2/go.mod h1:9mxDZsDKxgMAuccQkewq682L+0eCu4dCN2yonUJTCLU= 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.12.0 h1:xKuo6hzt+gMav00meVPUlXwSdoEJP46BR+wdxQEFK2o= @@ -3393,16 +3045,13 @@ google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCID 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-20170818010345-ee236bd376b0/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= -google.golang.org/genproto v0.0.0-20180518175338-11a468237815/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= -google.golang.org/genproto v0.0.0-20181221175505-bd9b4fb69e2f/go.mod h1:7Ep/1NZk928CDR8SjdVbjWNpdIf6nzjE3BTgJDr2Atg= 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-20190530194941-fb225487d101/go.mod h1:z3L6/3dTEVtUr6QSP8miRzeRqwQOioJ9I66odjN4I7s= -google.golang.org/genproto v0.0.0-20190716160619-c506a9f90610/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= 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= @@ -3419,7 +3068,6 @@ google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63/go.mod h1:55QSHmfG 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-20200317114155-1f3552e48f24/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= @@ -3430,7 +3078,6 @@ google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEY 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-20200806141610-86f49bd18e98/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= @@ -3517,9 +3164,7 @@ google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c/go.mod h1:CGI5F/G+ google.golang.org/genproto v0.0.0-20221206210731-b1a01be3a5f6 h1:AGXp12e/9rItf6/4QymU7WsAUwCf+ICW75cuR91nJIc= google.golang.org/genproto v0.0.0-20221206210731-b1a01be3a5f6/go.mod h1:1dOng4TWOomJrDGhpXjfCD35wQC6jnC7HpRmOFRqEV0= google.golang.org/grpc v1.8.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= -google.golang.org/grpc v1.12.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= google.golang.org/grpc v1.14.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= -google.golang.org/grpc v1.16.0/go.mod h1:0JHn/cJsOMiMfNA9+DeHDlAU7KAAB5GDlYFpa9MZMio= google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.0/go.mod h1:chYK+tFQF0nDUGJgXMSgLCQk3phJEuONr2DCgLDdAQM= @@ -3567,7 +3212,6 @@ google.golang.org/grpc v1.50.1/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCD google.golang.org/grpc v1.51.0 h1:E1eGv1FTqoLIdnBCZufiSHgKjlqG6fKFf6pPWtMTh8U= google.golang.org/grpc v1.51.0/go.mod h1:wgNDFcnuBGmxLKI/qn4T+m5BtEBYXJPvibbUPsAIPww= google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw= -google.golang.org/grpc/examples v0.0.0-20210916203835-567da6b86340/go.mod h1:gID3PKrg7pWKntu9Ss6zTLJ0ttC0X9IHgREOCZwbCVU= 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= @@ -3586,7 +3230,6 @@ google.golang.org/protobuf v1.28.1 h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175 google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d/go.mod h1:cuepJuh7vyXfUyUwEgHQXw849cJrilpS5NeIjOWESAw= -gopkg.in/caio/go-tdigest.v2 v2.3.0/go.mod h1:HPfh/CLN8UWDMOC76lqxVeKa5E24ypoVuTj4BLMb9cU= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= @@ -3597,18 +3240,13 @@ gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntN gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= gopkg.in/cheggaaa/pb.v1 v1.0.25/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qStrOgw= gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= -gopkg.in/fatih/pool.v2 v2.0.0/go.mod h1:8xVGeu1/2jr2wm5V9SPuMht2H5AEmf5aFMGSQixtjTY= gopkg.in/fsnotify.v1 v1.2.1/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= -gopkg.in/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4= gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= -gopkg.in/fsnotify/fsnotify.v1 v1.4.7 h1:XNNYLJHt73EyYiCZi6+xjupS9CpvmiDgjPTAjrBlQbo= gopkg.in/fsnotify/fsnotify.v1 v1.4.7/go.mod h1:Fyux9zXlo4rWoMSIzpn9fDAYjalPqJ/K1qJ27s+7ltE= gopkg.in/gcfg.v1 v1.2.3/go.mod h1:yesOnuUOFQAhST5vPY4nbZsb/huCgGGXlipJsBn0b3o= -gopkg.in/gorethink/gorethink.v3 v3.0.5/go.mod h1:+3yIIHJUGMBK+wyPH+iN5TP+88ikFDfZdqTlK3Y9q8I= gopkg.in/inconshreveable/log15.v2 v2.0.0-20180818164646-67afb5ed74ec/go.mod h1:aPpfJ7XW+gOuirDoZ8gHhLh3kZ1B08FtV2bbmy7Jv3s= gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc= gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= -gopkg.in/ini.v1 v1.42.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/ini.v1 v1.51.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/ini.v1 v1.52.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/ini.v1 v1.57.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= @@ -3620,20 +3258,15 @@ gopkg.in/jcmturner/aescts.v1 v1.0.1/go.mod h1:nsR8qBOg+OucoIW+WMhB3GspUQXq9XorLn gopkg.in/jcmturner/dnsutils.v1 v1.0.1/go.mod h1:m3v+5svpVOhtFAP/wSz+yzh4Mc0Fg7eRhxkJMWSIz9Q= gopkg.in/jcmturner/goidentity.v3 v3.0.0/go.mod h1:oG2kH0IvSYNIu80dVAyu/yoefjq1mNfM5bm88whjWx4= gopkg.in/jcmturner/gokrb5.v7 v7.2.3/go.mod h1:l8VISx+WGYp+Fp7KRbsiUuXTTOnxIc3Tuvyavf11/WM= -gopkg.in/jcmturner/gokrb5.v7 v7.5.0/go.mod h1:l8VISx+WGYp+Fp7KRbsiUuXTTOnxIc3Tuvyavf11/WM= gopkg.in/jcmturner/rpc.v1 v1.1.0/go.mod h1:YIdkC4XfD6GXbzje11McwsDuOlZQSb9W4vfLvuNnlv8= -gopkg.in/ldap.v3 v3.1.0/go.mod h1:dQjCc0R0kfyFjIlWNMH1DORwUASZyDxo2Ry1B51dXaQ= -gopkg.in/mgo.v2 v2.0.0-20180705113604-9856a29383ce/go.mod h1:yeKp02qBN3iKW1OzL3MGk2IdtZzaj7SFntXj72NppTA= gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22/go.mod h1:yeKp02qBN3iKW1OzL3MGk2IdtZzaj7SFntXj72NppTA= gopkg.in/natefinch/lumberjack.v2 v2.0.0 h1:1Lc07Kr7qY4U2YPouBjpCLxpiyxIVoxqXgkXLknAOE8= gopkg.in/natefinch/lumberjack.v2 v2.0.0/go.mod h1:l0ndWWf7gzL7RNwBG7wST/UCcT4T24xpD6X8LsfU/+k= -gopkg.in/olivere/elastic.v5 v5.0.70/go.mod h1:FylZT6jQWtfHsicejzOm3jIMVPOAksa80i3o+6qtQRk= gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= gopkg.in/square/go-jose.v2 v2.3.1/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI= gopkg.in/square/go-jose.v2 v2.4.1/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI= gopkg.in/square/go-jose.v2 v2.5.1 h1:7odma5RETjNHWJnR32wx8t+Io4djHE1PqxCFx3iiZ2w= gopkg.in/square/go-jose.v2 v2.5.1/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI= -gopkg.in/telebot.v3 v3.0.0/go.mod h1:7rExV8/0mDDNu9epSrDm/8j22KLaActH1Tbee6YjzWg= gopkg.in/tomb.v1 v1.0.0-20140529071818-c131134a1947/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= @@ -3657,11 +3290,8 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/zorkian/go-datadog-api.v2 v2.30.0 h1:umQdVO0Ytx+kYadhuJNjFtDgIsIEBnKrOTvNuu8ClKI= gopkg.in/zorkian/go-datadog-api.v2 v2.30.0/go.mod h1:kx0CSMRpzEZfx/nFH62GLU4stZjparh/BRpM89t4XCQ= -gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo= -gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw= gotest.tools/v3 v3.0.2/go.mod h1:3SzNCllyD9/Y+b5r9JIKQ474KzkZyqLqEfYqMsX94Bk= gotest.tools/v3 v3.2.0 h1:I0DwBVMGAx26dttAj1BtJLAkVGncrkkUXfJLC4Flt/I= -honnef.co/go/netdb v0.0.0-20150201073656-a416d700ae39/go.mod h1:rbNo0ST5hSazCG4rGfpHrwnwvzP1QX62WbhzD+ghGzs= honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= 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= @@ -3672,12 +3302,9 @@ honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9 honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= honnef.co/go/tools v0.1.1/go.mod h1:NgwopIslSNH47DimFoV78dnkksY2EFtX0ajyb3K/las= honnef.co/go/tools v0.1.2/go.mod h1:NgwopIslSNH47DimFoV78dnkksY2EFtX0ajyb3K/las= -inet.af/netaddr v0.0.0-20211027220019-c74959edd3b6 h1:acCzuUSQ79tGsM/O50VRFySfMm19IoMKL+sZztZkCxw= -inet.af/netaddr v0.0.0-20211027220019-c74959edd3b6/go.mod h1:y3MGhcFMlh0KZPMuXXow8mpjxxAk3yoDNsp4cQz54i8= k8s.io/api v0.21.1/go.mod h1:FstGROTmsSHBarKc8bylzXih8BLNYTiS3TZcsoEDg2s= k8s.io/api v0.25.4 h1:3YO8J4RtmG7elEgaWMb4HgmpS2CfY1QlaOz9nwB+ZSs= k8s.io/api v0.25.4/go.mod h1:IG2+RzyPQLllQxnhzD8KQNEu4c4YvyDTpSMztf4A0OQ= -k8s.io/apimachinery v0.17.1/go.mod h1:b9qmWdKlLuU9EBh+06BtLcSf/Mu89rWL33naRxs1uZg= k8s.io/apimachinery v0.21.1/go.mod h1:jbreFvJo3ov9rj7eWT7+sYiRx+qZuCYXwWT1bcDswPY= k8s.io/apimachinery v0.25.4 h1:CtXsuaitMESSu339tfhVXhQrPET+EiWnIY1rcurKnAc= k8s.io/apimachinery v0.25.4/go.mod h1:jaF9C/iPNM1FuLl7Zuy5b9v+n35HGSh6AQ4HYRkCqwo= @@ -3685,10 +3312,8 @@ k8s.io/client-go v0.21.1/go.mod h1:/kEw4RgW+3xnBGzvp9IWxKSNA+lXn3A7AuH3gdOAzLs= k8s.io/client-go v0.25.4 h1:3RNRDffAkNU56M/a7gUfXaEzdhZlYhoW8dgViGy5fn8= k8s.io/client-go v0.25.4/go.mod h1:8trHCAC83XKY0wsBIpbirZU4NTUpbuhc2JnI7OruGZw= k8s.io/code-generator v0.21.1/go.mod h1:hUlps5+9QaTrKx+jiM4rmq7YmH8wPOIko64uZCHDh6Q= -k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= 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 v0.0.0-20181102134211-b9b56d5dfc92/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk= k8s.io/klog v1.0.0 h1:Pt+yjF5aB1xDSVbau4VsWe+dQNzA0qv1LlXdC2dF6Q8= k8s.io/klog v1.0.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I= k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE= @@ -3696,7 +3321,6 @@ 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 h1:atnLQ121W371wYYFawwYx1aEY2eUfs4l3J72wtgAwV4= k8s.io/klog/v2 v2.80.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= -k8s.io/kube-openapi v0.0.0-20191107075043-30be4d16710a/go.mod h1:1TqjTSzOxsLGIKfj0lK8EeCP7K1iUG65v09OM0/WG5E= k8s.io/kube-openapi v0.0.0-20210305001622-591a79e4bda7/go.mod h1:wXW5VT87nVfh/iLV8FpR2uDvrFyomxbtb1KivDbvPTE= k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1 h1:MQ8BAZPZlWk3S9K4a9NCkIFQtZShWqoha7snGixVgEA= k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1/go.mod h1:C/N6wCaBHeBHkHUesQOQy2/MZqGgMAFPqGsGQLdbZBU= @@ -3706,24 +3330,16 @@ k8s.io/utils v0.0.0-20201110183641-67b214c5f920/go.mod h1:jPW/WVKK9YHAvNhRxK0md/ k8s.io/utils v0.0.0-20211116205334-6203023598ed/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed h1:jAne/RjBTyawwAy0utX5eqigAwz/lQhTmy+Hr/Cpue4= k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= -modernc.org/httpfs v1.0.0/go.mod h1:BSkfoMUcahSijQD5J/Vu4UMOxzmEf5SNRwyXC4PJBEw= -modernc.org/libc v1.3.1/go.mod h1:f8sp9GAfEyGYh3lsRIKtBh/XwACdFvGznxm6GJmQvXk= -modernc.org/mathutil v1.1.1/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E= -modernc.org/memory v1.0.1/go.mod h1:NSjvC08+g3MLOpcAxQbdctcThAEX4YlJ20WWHYEhvRg= -modernc.org/sqlite v1.7.4/go.mod h1:xse4RHCm8Fzw0COf5SJqAyiDrVeDwAQthAS1V/woNIA= -modernc.org/tcl v1.4.1/go.mod h1:8YCvzidU9SIwkz7RZwlCWK61mhV8X9UwfkRDRp7y5e0= mvdan.cc/gofumpt v0.1.0/go.mod h1:yXG1r1WqZVKWbVRtBWKWX9+CxGYfA51nSomhM0woR48= mvdan.cc/interfacer v0.0.0-20180901003855-c20040233aed/go.mod h1:Xkxe497xwlCKkIaQYRfC7CSLworTXY9RMqwhhCm+8Nc= mvdan.cc/lint v0.0.0-20170908181259-adc824a0674b/go.mod h1:2odslEg/xrtNQqCYg2/jCoyKnw3vv5biOc3JnIcYfL4= mvdan.cc/unparam v0.0.0-20210104141923-aac4ce9116a7/go.mod h1:hBpJkZE8H/sb+VRFvw2+rBpHNsTBcvSpk61hr8mzXZE= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= -rsc.io/goversion v1.2.0/go.mod h1:Eih9y/uIBS3ulggl7KNJ09xGSLcuNaLgmvvqa07sgfo= rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4= 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/json v0.0.0-20220713155537-f223a00ba0e2 h1:iXTIw73aPyC+oRdyqqvVJuloN1p0AC/kzH07hu3NE+k= sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0= -sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e/go.mod h1:wWxsB5ozmmv/SG7nM11ayaAW51xMvak/t1r0CSlcokI= sigs.k8s.io/structured-merge-diff/v4 v4.0.2/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw= sigs.k8s.io/structured-merge-diff/v4 v4.1.0/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw= sigs.k8s.io/structured-merge-diff/v4 v4.2.3 h1:PRbqxJClWWYMNV1dhaG4NsibJbArud9kFxnAMREiWFE= diff --git a/cmd/oteltestbedcol/go.mod b/cmd/oteltestbedcol/go.mod index dbae29d86198b..68fdc36e2374a 100644 --- a/cmd/oteltestbedcol/go.mod +++ b/cmd/oteltestbedcol/go.mod @@ -3,43 +3,43 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/cmd/oteltestbed go 1.18 require ( - github.com/open-telemetry/opentelemetry-collector-contrib v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/carbonexporter v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/jaegerexporter v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/opencensusexporter v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusexporter v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/sapmexporter v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/signalfxexporter v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/splunkhecexporter v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/zipkinexporter v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/extension/fluentbitextension v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/extension/pprofextension v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourceprocessor v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/carbonreceiver v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/filelogreceiver v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/fluentforwardreceiver v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/opencensusreceiver v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/sapmreceiver v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/signalfxreceiver v0.0.0-00010101000000-000000000000 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/splunkhecreceiver v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/syslogreceiver v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/tcplogreceiver v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/udplogreceiver v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver v0.66.0 - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/exporter/loggingexporter v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/exporter/otlpexporter v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/exporter/otlphttpexporter v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/extension/ballastextension v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/extension/zpagesextension v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/receiver/otlpreceiver v0.66.1-0.20221202005155-1c54042beb70 + github.com/open-telemetry/opentelemetry-collector-contrib v0.0.0-00010101000000-000000000000 + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/carbonexporter v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/jaegerexporter v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/opencensusexporter v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusexporter v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/sapmexporter v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/signalfxexporter v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/splunkhecexporter v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/zipkinexporter v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/extension/fluentbitextension v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/extension/pprofextension v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourceprocessor v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/carbonreceiver v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/filelogreceiver v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/fluentforwardreceiver v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/opencensusreceiver v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/sapmreceiver v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/signalfxreceiver v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/splunkhecreceiver v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/syslogreceiver v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/tcplogreceiver v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/udplogreceiver v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver v0.67.0 + go.opentelemetry.io/collector v0.67.0 + go.opentelemetry.io/collector/component v0.67.0 + go.opentelemetry.io/collector/exporter/loggingexporter v0.67.0 + go.opentelemetry.io/collector/exporter/otlpexporter v0.67.0 + go.opentelemetry.io/collector/exporter/otlphttpexporter v0.67.0 + go.opentelemetry.io/collector/extension/ballastextension v0.67.0 + go.opentelemetry.io/collector/extension/zpagesextension v0.67.0 + go.opentelemetry.io/collector/processor/batchprocessor v0.67.0 + go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.67.0 + go.opentelemetry.io/collector/receiver/otlpreceiver v0.67.0 go.uber.org/multierr v1.8.0 ) @@ -154,21 +154,21 @@ require ( github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f // indirect github.com/observiq/ctimefmt v1.0.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/internal/filter v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/internal/splunk v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchperresourceattr v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/experimentalmetricmetadata v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheus v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/signalfx v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/zipkin v0.66.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/internal/filter v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/internal/splunk v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchperresourceattr v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/experimentalmetricmetadata v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheus v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/signalfx v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/zipkin v0.67.0 // indirect github.com/opencontainers/go-digest v1.0.0 // indirect github.com/opencontainers/image-spec v1.0.3-0.20211202183452-c5a74bcca799 // indirect github.com/opentracing/opentracing-go v1.2.0 // indirect @@ -207,11 +207,11 @@ require ( github.com/yusufpapurcu/wmi v1.2.2 // indirect go.etcd.io/bbolt v1.3.6 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a // indirect - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 // indirect - go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/confmap v0.67.0 // indirect + go.opentelemetry.io/collector/consumer v0.67.0 // indirect + go.opentelemetry.io/collector/featuregate v0.67.0 // indirect + go.opentelemetry.io/collector/pdata v1.0.0-rc1 // indirect + go.opentelemetry.io/collector/semconv v0.67.0 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 // indirect go.opentelemetry.io/contrib/propagators/b3 v1.11.1 // indirect diff --git a/cmd/oteltestbedcol/go.sum b/cmd/oteltestbedcol/go.sum index 5ab18b5c15d35..a6795c2ead351 100644 --- a/cmd/oteltestbedcol/go.sum +++ b/cmd/oteltestbedcol/go.sum @@ -1689,60 +1689,45 @@ go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= go.opentelemetry.io/collector v0.57.2/go.mod h1:9TwWyMRhbFNzaaGLtm/6poWNDJw+etvQMS6Fy+8/8Xs= go.opentelemetry.io/collector v0.64.1/go.mod h1:RxdEKzwxTEhBAgzC4wzyJEwSFgjWU73CHnLjKUKQDyo= -go.opentelemetry.io/collector v0.65.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/component v0.65.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/consumer v0.65.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/exporter/loggingexporter v0.66.1-0.20221202005155-1c54042beb70 h1:/C637mgJY6I0l/KFLXmL9I1foefM53aob20WF2Yh/0Y= -go.opentelemetry.io/collector/exporter/loggingexporter v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:xxkHO5NrxffTV22dhCy3K8XZThGJ1ak7LZ1ctoiJp5k= -go.opentelemetry.io/collector/exporter/otlpexporter v0.66.1-0.20221202005155-1c54042beb70 h1:m9GPfziw/079Xt7/Pfby/5obJhtqR19WKkgQQ/VxNZo= -go.opentelemetry.io/collector/exporter/otlpexporter v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:bCD3trc7OqeEVCgyQdO3kwGgogZMjcMu2tX49SFv1lU= -go.opentelemetry.io/collector/exporter/otlphttpexporter v0.66.1-0.20221202005155-1c54042beb70 h1:7rDNCZS1qfqZxnCLaBWItnX/TweYKC6NyULpelzXl4g= -go.opentelemetry.io/collector/exporter/otlphttpexporter v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:vkFlRP0DDfDfSDVl96Gvy5Ah8L8sMcVAxMZn+0af2ew= -go.opentelemetry.io/collector/extension/ballastextension v0.66.1-0.20221202005155-1c54042beb70 h1:pSGZDMMURLRp7iSxeNlDNDxDgFQJqCYt+Fv7bZxC0JU= -go.opentelemetry.io/collector/extension/ballastextension v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:+YdyZisEXLDE8rhZE7Ce4wli0ZVE164SFN0qg2mPjDU= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/component v0.67.0 h1:GCBRZAqk4yNaT4L1uwlbbwophFHrxYccLZ4Uj1Ifs/M= +go.opentelemetry.io/collector/component v0.67.0/go.mod h1:Txa2lm9oe7xsGQN8u7GdUIrRpAHFIKsTO4Qi3/CSmKk= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/exporter/loggingexporter v0.67.0 h1:09dH5PKxcqKuvxzCVf/j+oEgDYC2LBTgDhaDxujdEO8= +go.opentelemetry.io/collector/exporter/loggingexporter v0.67.0/go.mod h1:8sHgDw0tYsBQTunEBZojJ/L43CyaKVPAvT6eqGlo7xo= +go.opentelemetry.io/collector/exporter/otlpexporter v0.67.0 h1:AxejzV7pxCQjdIsIBLQPbeub2SqbyAsu09TA1BG0jcs= +go.opentelemetry.io/collector/exporter/otlpexporter v0.67.0/go.mod h1:urludZR9ya0gUNf7JXzKL06gX2Anu4BDa6UfCvI61Hw= +go.opentelemetry.io/collector/exporter/otlphttpexporter v0.67.0 h1:B91LfbKa0Khqc8SX2aVd5D2g9aDpeCEJ+jDjNb894mA= +go.opentelemetry.io/collector/exporter/otlphttpexporter v0.67.0/go.mod h1:o7HgN765fAq2cuATsQF2BLhbXiFJ+fK0NIbfcmw2Pa8= +go.opentelemetry.io/collector/extension/ballastextension v0.67.0 h1:fqwrpnAZ/4B5Ghs3vkAZiBnW5b9ro8dbhNa1kw61IXA= +go.opentelemetry.io/collector/extension/ballastextension v0.67.0/go.mod h1:aLm/LXcYAfRW+VWPczi5DKgCcajYPve0Z+fcPLw0w3U= go.opentelemetry.io/collector/extension/zpagesextension v0.64.1/go.mod h1:XenhQAUbOHgqNq5YQ/vQIcDHRcPUaDgZQxDC2qoI4Bc= -go.opentelemetry.io/collector/extension/zpagesextension v0.65.0/go.mod h1:+IPas7AeffG0GMIXhZr8IzpTNhH1Ri/6S/9YFqbLsmQ= -go.opentelemetry.io/collector/extension/zpagesextension v0.66.0/go.mod h1:+IPas7AeffG0GMIXhZr8IzpTNhH1Ri/6S/9YFqbLsmQ= -go.opentelemetry.io/collector/extension/zpagesextension v0.66.1-0.20221202005155-1c54042beb70 h1:+vq59gRJpiAcUshBVxhqhc9aXOc/8Z5wuWlyng5Hfm4= -go.opentelemetry.io/collector/extension/zpagesextension v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tejEMB1pDXsmEeyg7UHB+S++4Lvgtki7N5CVWk5rI4A= -go.opentelemetry.io/collector/featuregate v0.65.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/extension/zpagesextension v0.67.0 h1:TRW8vZwE+/h2vJqqMDmyQO9X0sxcYCSXf5MyXozSLas= +go.opentelemetry.io/collector/extension/zpagesextension v0.67.0/go.mod h1:let/Bt3vTou1cVKhfv+z6FTSk3JaYV11z9C4O/PDPrA= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= go.opentelemetry.io/collector/pdata v0.56.0/go.mod h1:mYcCREWiIJyHss0dbU+GSiz2tmGZ6u09vtfkKTciog4= go.opentelemetry.io/collector/pdata v0.57.2/go.mod h1:RU9I8lwBUxucwOsSYzHEcHi15M9QaX78hgQ2PRdSxV0= go.opentelemetry.io/collector/pdata v0.64.1/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= -go.opentelemetry.io/collector/pdata v0.65.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= go.opentelemetry.io/collector/processor/batchprocessor v0.64.1/go.mod h1:qVl0+aYokPfiq5y+JVAvlII2rrUFBDEqqiDbTSnax78= -go.opentelemetry.io/collector/processor/batchprocessor v0.65.0/go.mod h1:XhGTsC1B/bq4gpg8IZ/QYBLXkzE4Gw3r7Xu2+ik8A1Q= -go.opentelemetry.io/collector/processor/batchprocessor v0.66.0/go.mod h1:XhGTsC1B/bq4gpg8IZ/QYBLXkzE4Gw3r7Xu2+ik8A1Q= -go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221202005155-1c54042beb70 h1:Y4e8NnVevonnAgmjX9Z7QIMA32yMqHAOnAlh8SzTS8c= -go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:Pi1CsKDQFoDrUP1i3+VdE6s2Xuji7bOGFBgqHK0J32E= -go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.66.1-0.20221202005155-1c54042beb70 h1:l0005D1ERsXKno9Ax5Gr2A8FaysF7n40yer6r5qAMHQ= -go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:9CBysimj8fH0weF6Wu8S8nW7cG/XRanrMU1BWlIXeN4= +go.opentelemetry.io/collector/processor/batchprocessor v0.67.0 h1:Qn4Ytth3q1trwTSAYYTzIRs4SBh9rz0xBou1nZB+Dko= +go.opentelemetry.io/collector/processor/batchprocessor v0.67.0/go.mod h1:+ZXCkUG9tlwbbVLi+PT9DjQ7vz+lfFSQqvW45snLYno= +go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.67.0 h1:m3GK5/lZIznGFzzvSPuQo5jxvEn43efv4VkvPtZwDI8= +go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.67.0/go.mod h1:YYjx8ouKYP6AZJ4f4PQPo8cuzcE8n4atn7gOoB890FQ= go.opentelemetry.io/collector/receiver/otlpreceiver v0.64.1/go.mod h1:4rwNi9SeCKBP9XGLWNRFKPsWUV5NK4iqMvdj2WRMksQ= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.66.1-0.20221202005155-1c54042beb70 h1:KBbbPVDV7o5w857g6ePphdu4MV87jrcQevFYDA1okUk= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:0Py8RNjNiFRH6/F+vM2uptdaw9hMj1FBdv0ySntM2gE= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.67.0 h1:pMluLYSSAH7n8zkPWYkWGY/pALrVxG9rHX8J/WDrcx0= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.67.0/go.mod h1:GIJc0eu4N2oJB420N3NhSFJ1IhAgCwvlTCMGWxKhXgg= go.opentelemetry.io/collector/semconv v0.56.0/go.mod h1:EH1wbDvTyqKpKBBpoMIe0KQk2plCcFS66Mo17WtR7CQ= go.opentelemetry.io/collector/semconv v0.57.2/go.mod h1:84YnUjmm+nhGu4YTDLnHCbxnL74ooWpismPG79tFD7w= go.opentelemetry.io/collector/semconv v0.64.1/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= -go.opentelemetry.io/collector/semconv v0.65.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= -go.opentelemetry.io/collector/semconv v0.66.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 h1:Q5L9Urod3c8as6ZYaoaqBjarx/HXxsxy34DFZIU2fO4= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector/semconv v0.67.0 h1:zLAvcQa6Kgow52FFLrmk7/9ZVtEYyA73+xDtCcFG78Q= +go.opentelemetry.io/collector/semconv v0.67.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.33.0/go.mod h1:y/SlJpJQPd2UzfBCj0E9Flk9FDCtTyqUmaCB41qFrWI= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4 h1:PRXhsszxTt5bbPriTjmaweWUsAnJYeWBhUMLRetUgBU= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4/go.mod h1:05eWWy6ZWzmpeImD3UowLTB3VjDMU1yxQ+ENuVWDM3c= diff --git a/cmd/oteltestbedcol/main.go b/cmd/oteltestbedcol/main.go index e61143e503ece..87a4c275105ab 100644 --- a/cmd/oteltestbedcol/main.go +++ b/cmd/oteltestbedcol/main.go @@ -20,6 +20,7 @@ package main import ( "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/exporter" "go.opentelemetry.io/collector/exporter/loggingexporter" "go.opentelemetry.io/collector/exporter/otlpexporter" "go.opentelemetry.io/collector/exporter/otlphttpexporter" @@ -28,6 +29,7 @@ import ( "go.opentelemetry.io/collector/extension/zpagesextension" "go.opentelemetry.io/collector/processor/batchprocessor" "go.opentelemetry.io/collector/processor/memorylimiterprocessor" + "go.opentelemetry.io/collector/receiver" "go.opentelemetry.io/collector/receiver/otlpreceiver" "go.uber.org/multierr" @@ -80,7 +82,7 @@ func Components() ( ) errs = multierr.Append(errs, err) - receivers, err := component.MakeReceiverFactoryMap( + receivers, err := receiver.MakeFactoryMap( carbonreceiver.NewFactory(), filelogreceiver.NewFactory(), fluentforwardreceiver.NewFactory(), @@ -98,7 +100,7 @@ func Components() ( ) errs = multierr.Append(errs, err) - exporters, err := component.MakeExporterFactoryMap( + exporters, err := exporter.MakeFactoryMap( carbonexporter.NewFactory(), jaegerexporter.NewFactory(), loggingexporter.NewFactory(), diff --git a/confmap/provider/s3provider/go.mod b/confmap/provider/s3provider/go.mod index f19f8ac98b030..bce5bfe44f3ed 100644 --- a/confmap/provider/s3provider/go.mod +++ b/confmap/provider/s3provider/go.mod @@ -7,7 +7,7 @@ require ( github.com/aws/aws-sdk-go-v2/config v1.18.4 github.com/aws/aws-sdk-go-v2/service/s3 v1.19.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a + go.opentelemetry.io/collector/confmap v0.67.0 gopkg.in/yaml.v2 v2.4.0 ) @@ -31,7 +31,7 @@ require ( github.com/mitchellh/mapstructure v1.5.0 // indirect github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/featuregate v0.67.0 // indirect go.uber.org/atomic v1.10.0 // indirect go.uber.org/multierr v1.8.0 // indirect golang.org/x/sys v0.3.0 // indirect diff --git a/confmap/provider/s3provider/go.sum b/confmap/provider/s3provider/go.sum index 67fce5e736601..2db1c81af428d 100644 --- a/confmap/provider/s3provider/go.sum +++ b/confmap/provider/s3provider/go.sum @@ -280,10 +280,10 @@ github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1 go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A= go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ= go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= diff --git a/exporter/alibabacloudlogserviceexporter/factory.go b/exporter/alibabacloudlogserviceexporter/factory.go index bec53fe216705..9661f068328dd 100644 --- a/exporter/alibabacloudlogserviceexporter/factory.go +++ b/exporter/alibabacloudlogserviceexporter/factory.go @@ -19,6 +19,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" + "go.opentelemetry.io/collector/exporter" ) const ( @@ -29,13 +30,13 @@ const ( ) // NewFactory creates a factory for AlibabaCloud LogService exporter. -func NewFactory() component.ExporterFactory { - return component.NewExporterFactory( +func NewFactory() exporter.Factory { + return exporter.NewFactory( typeStr, createDefaultConfig, - component.WithTracesExporter(createTracesExporter, stability), - component.WithMetricsExporter(createMetricsExporter, stability), - component.WithLogsExporter(createLogsExporter, stability)) + exporter.WithTraces(createTracesExporter, stability), + exporter.WithMetrics(createMetricsExporter, stability), + exporter.WithLogs(createLogsExporter, stability)) } // CreateDefaultConfig creates the default configuration for exporter. @@ -47,24 +48,24 @@ func createDefaultConfig() component.Config { func createTracesExporter( _ context.Context, - set component.ExporterCreateSettings, + set exporter.CreateSettings, cfg component.Config, -) (component.TracesExporter, error) { +) (exporter.Traces, error) { return newTracesExporter(set, cfg) } func createMetricsExporter( _ context.Context, - set component.ExporterCreateSettings, + set exporter.CreateSettings, cfg component.Config, -) (exp component.MetricsExporter, err error) { +) (exp exporter.Metrics, err error) { return newMetricsExporter(set, cfg) } func createLogsExporter( _ context.Context, - set component.ExporterCreateSettings, + set exporter.CreateSettings, cfg component.Config, -) (exp component.LogsExporter, err error) { +) (exp exporter.Logs, err error) { return newLogsExporter(set, cfg) } diff --git a/exporter/alibabacloudlogserviceexporter/go.mod b/exporter/alibabacloudlogserviceexporter/go.mod index a0a8d6a80e91f..7d25f28def65d 100644 --- a/exporter/alibabacloudlogserviceexporter/go.mod +++ b/exporter/alibabacloudlogserviceexporter/go.mod @@ -5,13 +5,13 @@ go 1.18 require ( github.com/aliyun/aliyun-log-go-sdk v0.1.41 github.com/gogo/protobuf v1.3.2 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.66.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.67.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector v0.67.0 + go.opentelemetry.io/collector/component v0.67.0 + go.opentelemetry.io/collector/confmap v0.67.0 + go.opentelemetry.io/collector/pdata v1.0.0-rc1 + go.opentelemetry.io/collector/semconv v0.67.0 go.uber.org/zap v1.24.0 ) @@ -34,8 +34,8 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rogpeppe/go-internal v1.9.0 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/consumer v0.67.0 // indirect + go.opentelemetry.io/collector/featuregate v0.67.0 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/exporter/alibabacloudlogserviceexporter/go.sum b/exporter/alibabacloudlogserviceexporter/go.sum index b480a634ba4be..9319864652b00 100644 --- a/exporter/alibabacloudlogserviceexporter/go.sum +++ b/exporter/alibabacloudlogserviceexporter/go.sum @@ -422,20 +422,20 @@ go.opencensus.io v0.20.2/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk= go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 h1:Q5L9Urod3c8as6ZYaoaqBjarx/HXxsxy34DFZIU2fO4= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/component v0.67.0 h1:GCBRZAqk4yNaT4L1uwlbbwophFHrxYccLZ4Uj1Ifs/M= +go.opentelemetry.io/collector/component v0.67.0/go.mod h1:Txa2lm9oe7xsGQN8u7GdUIrRpAHFIKsTO4Qi3/CSmKk= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= +go.opentelemetry.io/collector/semconv v0.67.0 h1:zLAvcQa6Kgow52FFLrmk7/9ZVtEYyA73+xDtCcFG78Q= +go.opentelemetry.io/collector/semconv v0.67.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/exporter/alibabacloudlogserviceexporter/logs_exporter.go b/exporter/alibabacloudlogserviceexporter/logs_exporter.go index 9b7e17af25ec1..32f90933963d5 100644 --- a/exporter/alibabacloudlogserviceexporter/logs_exporter.go +++ b/exporter/alibabacloudlogserviceexporter/logs_exporter.go @@ -18,13 +18,14 @@ import ( "context" "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/exporter" "go.opentelemetry.io/collector/exporter/exporterhelper" "go.opentelemetry.io/collector/pdata/plog" "go.uber.org/zap" ) // newLogsExporter return a new LogService logs exporter. -func newLogsExporter(set component.ExporterCreateSettings, cfg component.Config) (component.LogsExporter, error) { +func newLogsExporter(set exporter.CreateSettings, cfg component.Config) (exporter.Logs, error) { l := &logServiceLogsSender{ logger: set.Logger, diff --git a/exporter/alibabacloudlogserviceexporter/logs_exporter_test.go b/exporter/alibabacloudlogserviceexporter/logs_exporter_test.go index 1cb7f0e52b898..6a70b036c1cdc 100644 --- a/exporter/alibabacloudlogserviceexporter/logs_exporter_test.go +++ b/exporter/alibabacloudlogserviceexporter/logs_exporter_test.go @@ -23,8 +23,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" + "go.opentelemetry.io/collector/exporter/exportertest" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/plog" conventions "go.opentelemetry.io/collector/semconv/v1.6.1" @@ -53,7 +53,7 @@ func createSimpleLogData(numberOfLogs int) plog.Logs { } func TestNewLogsExporter(t *testing.T) { - got, err := newLogsExporter(componenttest.NewNopExporterCreateSettings(), &Config{ + got, err := newLogsExporter(exportertest.NewNopCreateSettings(), &Config{ ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), Endpoint: "us-west-1.log.aliyuncs.com", Project: "demo-project", @@ -69,7 +69,7 @@ func TestNewLogsExporter(t *testing.T) { } func TestSTSTokenExporter(t *testing.T) { - got, err := newLogsExporter(componenttest.NewNopExporterCreateSettings(), &Config{ + got, err := newLogsExporter(exportertest.NewNopCreateSettings(), &Config{ ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), Endpoint: "us-west-1.log.aliyuncs.com", Project: "demo-project", @@ -81,7 +81,7 @@ func TestSTSTokenExporter(t *testing.T) { } func TestNewFailsWithEmptyLogsExporterName(t *testing.T) { - got, err := newLogsExporter(componenttest.NewNopExporterCreateSettings(), &Config{}) + got, err := newLogsExporter(exportertest.NewNopCreateSettings(), &Config{}) assert.Error(t, err) require.Nil(t, got) } diff --git a/exporter/alibabacloudlogserviceexporter/metrics_exporter.go b/exporter/alibabacloudlogserviceexporter/metrics_exporter.go index f9ade5535b81b..5b32e610f32c3 100644 --- a/exporter/alibabacloudlogserviceexporter/metrics_exporter.go +++ b/exporter/alibabacloudlogserviceexporter/metrics_exporter.go @@ -18,13 +18,14 @@ import ( "context" "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/exporter" "go.opentelemetry.io/collector/exporter/exporterhelper" "go.opentelemetry.io/collector/pdata/pmetric" "go.uber.org/zap" ) // newMetricsExporter return a new LogSerice metrics exporter. -func newMetricsExporter(set component.ExporterCreateSettings, cfg component.Config) (component.MetricsExporter, error) { +func newMetricsExporter(set exporter.CreateSettings, cfg component.Config) (exporter.Metrics, error) { l := &logServiceMetricsSender{ logger: set.Logger, diff --git a/exporter/alibabacloudlogserviceexporter/metrics_exporter_test.go b/exporter/alibabacloudlogserviceexporter/metrics_exporter_test.go index 26e2508f88d58..64cdf39126e60 100644 --- a/exporter/alibabacloudlogserviceexporter/metrics_exporter_test.go +++ b/exporter/alibabacloudlogserviceexporter/metrics_exporter_test.go @@ -21,14 +21,14 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" + "go.opentelemetry.io/collector/exporter/exportertest" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal/testdata" ) func TestNewMetricsExporter(t *testing.T) { - got, err := newMetricsExporter(componenttest.NewNopExporterCreateSettings(), &Config{ + got, err := newMetricsExporter(exportertest.NewNopCreateSettings(), &Config{ ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), Endpoint: "us-west-1.log.aliyuncs.com", Project: "demo-project", @@ -43,7 +43,7 @@ func TestNewMetricsExporter(t *testing.T) { } func TestNewFailsWithEmptyMetricsExporterName(t *testing.T) { - got, err := newMetricsExporter(componenttest.NewNopExporterCreateSettings(), &Config{}) + got, err := newMetricsExporter(exportertest.NewNopCreateSettings(), &Config{}) assert.Error(t, err) require.Nil(t, got) } diff --git a/exporter/alibabacloudlogserviceexporter/trace_exporter.go b/exporter/alibabacloudlogserviceexporter/trace_exporter.go index 45f778d55c6dc..b21ab65794394 100644 --- a/exporter/alibabacloudlogserviceexporter/trace_exporter.go +++ b/exporter/alibabacloudlogserviceexporter/trace_exporter.go @@ -18,13 +18,14 @@ import ( "context" "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/exporter" "go.opentelemetry.io/collector/exporter/exporterhelper" "go.opentelemetry.io/collector/pdata/ptrace" "go.uber.org/zap" ) // newTracesExporter return a new LogSerice trace exporter. -func newTracesExporter(set component.ExporterCreateSettings, cfg component.Config) (component.TracesExporter, error) { +func newTracesExporter(set exporter.CreateSettings, cfg component.Config) (exporter.Traces, error) { l := &logServiceTraceSender{ logger: set.Logger, diff --git a/exporter/alibabacloudlogserviceexporter/trace_exporter_test.go b/exporter/alibabacloudlogserviceexporter/trace_exporter_test.go index ae6a18dc4306e..9baded214296d 100644 --- a/exporter/alibabacloudlogserviceexporter/trace_exporter_test.go +++ b/exporter/alibabacloudlogserviceexporter/trace_exporter_test.go @@ -21,14 +21,14 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" + "go.opentelemetry.io/collector/exporter/exportertest" "go.opentelemetry.io/collector/pdata/ptrace" ) func TestNewTracesExporter(t *testing.T) { - got, err := newTracesExporter(componenttest.NewNopExporterCreateSettings(), &Config{ + got, err := newTracesExporter(exportertest.NewNopCreateSettings(), &Config{ ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), Endpoint: "cn-hangzhou.log.aliyuncs.com", Project: "demo-project", @@ -50,7 +50,7 @@ func TestNewTracesExporter(t *testing.T) { func TestNewFailsWithEmptyTracesExporterName(t *testing.T) { - got, err := newTracesExporter(componenttest.NewNopExporterCreateSettings(), &Config{}) + got, err := newTracesExporter(exportertest.NewNopCreateSettings(), &Config{}) assert.Error(t, err) require.Nil(t, got) } diff --git a/exporter/awscloudwatchlogsexporter/exporter.go b/exporter/awscloudwatchlogsexporter/exporter.go index 50a100d44964e..b569b6108c520 100644 --- a/exporter/awscloudwatchlogsexporter/exporter.go +++ b/exporter/awscloudwatchlogsexporter/exporter.go @@ -26,6 +26,7 @@ import ( "github.com/google/uuid" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/consumer" + exp "go.opentelemetry.io/collector/exporter" "go.opentelemetry.io/collector/exporter/exporterhelper" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/plog" @@ -44,7 +45,7 @@ type exporter struct { pusher cwlogs.Pusher } -func newCwLogsPusher(expConfig *Config, params component.ExporterCreateSettings) (component.LogsExporter, error) { +func newCwLogsPusher(expConfig *Config, params exp.CreateSettings) (exp.Logs, error) { if expConfig == nil { return nil, errors.New("awscloudwatchlogs exporter config is nil") } @@ -78,7 +79,7 @@ func newCwLogsPusher(expConfig *Config, params component.ExporterCreateSettings) return logsExporter, nil } -func newCwLogsExporter(config component.Config, params component.ExporterCreateSettings) (component.LogsExporter, error) { +func newCwLogsExporter(config component.Config, params exp.CreateSettings) (exp.Logs, error) { expConfig := config.(*Config) logsExporter, err := newCwLogsPusher(expConfig, params) if err != nil { diff --git a/exporter/awscloudwatchlogsexporter/exporter_test.go b/exporter/awscloudwatchlogsexporter/exporter_test.go index 420a3fa8beeb5..4f0607b26d685 100644 --- a/exporter/awscloudwatchlogsexporter/exporter_test.go +++ b/exporter/awscloudwatchlogsexporter/exporter_test.go @@ -24,7 +24,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - "go.opentelemetry.io/collector/component/componenttest" + "go.opentelemetry.io/collector/exporter/exportertest" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/plog" @@ -234,7 +234,7 @@ func TestConsumeLogs(t *testing.T) { expCfg.LogGroupName = "testGroup" expCfg.LogStreamName = "testStream" expCfg.MaxRetries = 0 - exp, err := newCwLogsPusher(expCfg, componenttest.NewNopExporterCreateSettings()) + exp, err := newCwLogsPusher(expCfg, exportertest.NewNopCreateSettings()) assert.Nil(t, err) assert.NotNil(t, exp) ld := plog.NewLogs() @@ -257,7 +257,7 @@ func TestNewExporterWithoutRegionErr(t *testing.T) { factory := NewFactory() expCfg := factory.CreateDefaultConfig().(*Config) expCfg.MaxRetries = 0 - exp, err := newCwLogsExporter(expCfg, componenttest.NewNopExporterCreateSettings()) + exp, err := newCwLogsExporter(expCfg, exportertest.NewNopCreateSettings()) assert.Nil(t, exp) assert.NotNil(t, err) } diff --git a/exporter/awscloudwatchlogsexporter/factory.go b/exporter/awscloudwatchlogsexporter/factory.go index bb3e7f7e4a62a..5585118d91391 100644 --- a/exporter/awscloudwatchlogsexporter/factory.go +++ b/exporter/awscloudwatchlogsexporter/factory.go @@ -22,6 +22,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" + exp "go.opentelemetry.io/collector/exporter" "go.opentelemetry.io/collector/exporter/exporterhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil" @@ -33,11 +34,11 @@ const ( stability = component.StabilityLevelBeta ) -func NewFactory() component.ExporterFactory { - return component.NewExporterFactory( +func NewFactory() exp.Factory { + return exp.NewFactory( typeStr, createDefaultConfig, - component.WithLogsExporter(createLogsExporter, stability)) + exp.WithLogs(createLogsExporter, stability)) } func createDefaultConfig() component.Config { @@ -51,7 +52,7 @@ func createDefaultConfig() component.Config { } } -func createLogsExporter(_ context.Context, params component.ExporterCreateSettings, config component.Config) (component.LogsExporter, error) { +func createLogsExporter(_ context.Context, params exp.CreateSettings, config component.Config) (exp.Logs, error) { expConfig, ok := config.(*Config) if !ok { return nil, errors.New("invalid configuration type; can't cast to awscloudwatchlogsexporter.Config") diff --git a/exporter/awscloudwatchlogsexporter/go.mod b/exporter/awscloudwatchlogsexporter/go.mod index 6852b74479697..79b02c84b683d 100644 --- a/exporter/awscloudwatchlogsexporter/go.mod +++ b/exporter/awscloudwatchlogsexporter/go.mod @@ -5,14 +5,14 @@ go 1.18 require ( github.com/aws/aws-sdk-go v1.44.155 github.com/google/uuid v1.3.0 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/cwlogs v0.66.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/cwlogs v0.67.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector v0.67.0 + go.opentelemetry.io/collector/component v0.67.0 + go.opentelemetry.io/collector/confmap v0.67.0 + go.opentelemetry.io/collector/consumer v0.67.0 + go.opentelemetry.io/collector/pdata v1.0.0-rc1 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.24.0 ) @@ -34,7 +34,7 @@ require ( github.com/rogpeppe/go-internal v1.8.1 // indirect github.com/stretchr/objx v0.5.0 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/featuregate v0.67.0 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/exporter/awscloudwatchlogsexporter/go.sum b/exporter/awscloudwatchlogsexporter/go.sum index 5052401590842..c20f29f672663 100644 --- a/exporter/awscloudwatchlogsexporter/go.sum +++ b/exporter/awscloudwatchlogsexporter/go.sum @@ -289,18 +289,18 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/component v0.67.0 h1:GCBRZAqk4yNaT4L1uwlbbwophFHrxYccLZ4Uj1Ifs/M= +go.opentelemetry.io/collector/component v0.67.0/go.mod h1:Txa2lm9oe7xsGQN8u7GdUIrRpAHFIKsTO4Qi3/CSmKk= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/exporter/awsemfexporter/emf_exporter.go b/exporter/awsemfexporter/emf_exporter.go index 3e526e6841221..ae4605e2135ea 100644 --- a/exporter/awsemfexporter/emf_exporter.go +++ b/exporter/awsemfexporter/emf_exporter.go @@ -27,6 +27,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/consumer/consumererror" + "go.opentelemetry.io/collector/exporter" "go.opentelemetry.io/collector/exporter/exporterhelper" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" @@ -60,8 +61,8 @@ type emfExporter struct { // newEmfPusher func creates an EMF Exporter instance with data push callback func func newEmfPusher( config component.Config, - params component.ExporterCreateSettings, -) (component.MetricsExporter, error) { + params exporter.CreateSettings, +) (exporter.Metrics, error) { if config == nil { return nil, errors.New("emf exporter config is nil") } @@ -96,8 +97,8 @@ func newEmfPusher( // newEmfExporter creates a new exporter using exporterhelper func newEmfExporter( config component.Config, - set component.ExporterCreateSettings, -) (component.MetricsExporter, error) { + set exporter.CreateSettings, +) (exporter.Metrics, error) { exp, err := newEmfPusher(config, set) if err != nil { return nil, err diff --git a/exporter/awsemfexporter/emf_exporter_test.go b/exporter/awsemfexporter/emf_exporter_test.go index cc720473d76b1..c1ae4d0d30bdf 100644 --- a/exporter/awsemfexporter/emf_exporter_test.go +++ b/exporter/awsemfexporter/emf_exporter_test.go @@ -29,8 +29,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/consumer/consumererror" + "go.opentelemetry.io/collector/exporter/exportertest" "go.uber.org/zap" "go.uber.org/zap/zapcore" "go.uber.org/zap/zaptest/observer" @@ -75,7 +75,7 @@ func TestConsumeMetrics(t *testing.T) { expCfg := factory.CreateDefaultConfig().(*Config) expCfg.Region = "us-west-2" expCfg.MaxRetries = 0 - exp, err := newEmfPusher(expCfg, componenttest.NewNopExporterCreateSettings()) + exp, err := newEmfPusher(expCfg, exportertest.NewNopCreateSettings()) assert.Nil(t, err) assert.NotNil(t, exp) @@ -137,7 +137,7 @@ func TestConsumeMetricsWithOutputDestination(t *testing.T) { expCfg.Region = "us-west-2" expCfg.MaxRetries = 0 expCfg.OutputDestination = "stdout" - exp, err := newEmfPusher(expCfg, componenttest.NewNopExporterCreateSettings()) + exp, err := newEmfPusher(expCfg, exportertest.NewNopCreateSettings()) assert.Nil(t, err) assert.NotNil(t, exp) @@ -198,7 +198,7 @@ func TestConsumeMetricsWithLogGroupStreamConfig(t *testing.T) { expCfg.MaxRetries = defaultRetryCount expCfg.LogGroupName = "test-logGroupName" expCfg.LogStreamName = "test-logStreamName" - exp, err := newEmfPusher(expCfg, componenttest.NewNopExporterCreateSettings()) + exp, err := newEmfPusher(expCfg, exportertest.NewNopCreateSettings()) assert.Nil(t, err) assert.NotNil(t, exp) @@ -268,7 +268,7 @@ func TestConsumeMetricsWithLogGroupStreamValidPlaceholder(t *testing.T) { expCfg.MaxRetries = defaultRetryCount expCfg.LogGroupName = "/aws/ecs/containerinsights/{ClusterName}/performance" expCfg.LogStreamName = "{TaskId}" - exp, err := newEmfPusher(expCfg, componenttest.NewNopExporterCreateSettings()) + exp, err := newEmfPusher(expCfg, exportertest.NewNopCreateSettings()) assert.Nil(t, err) assert.NotNil(t, exp) @@ -338,7 +338,7 @@ func TestConsumeMetricsWithOnlyLogStreamPlaceholder(t *testing.T) { expCfg.MaxRetries = defaultRetryCount expCfg.LogGroupName = "test-logGroupName" expCfg.LogStreamName = "{TaskId}" - exp, err := newEmfPusher(expCfg, componenttest.NewNopExporterCreateSettings()) + exp, err := newEmfPusher(expCfg, exportertest.NewNopCreateSettings()) assert.Nil(t, err) assert.NotNil(t, exp) @@ -408,7 +408,7 @@ func TestConsumeMetricsWithWrongPlaceholder(t *testing.T) { expCfg.MaxRetries = defaultRetryCount expCfg.LogGroupName = "test-logGroupName" expCfg.LogStreamName = "{WrongKey}" - exp, err := newEmfPusher(expCfg, componenttest.NewNopExporterCreateSettings()) + exp, err := newEmfPusher(expCfg, exportertest.NewNopCreateSettings()) assert.Nil(t, err) assert.NotNil(t, exp) @@ -478,7 +478,7 @@ func TestPushMetricsDataWithErr(t *testing.T) { expCfg.MaxRetries = 0 expCfg.LogGroupName = "test-logGroupName" expCfg.LogStreamName = "test-logStreamName" - exp, err := newEmfPusher(expCfg, componenttest.NewNopExporterCreateSettings()) + exp, err := newEmfPusher(expCfg, exportertest.NewNopCreateSettings()) assert.Nil(t, err) assert.NotNil(t, exp) @@ -548,7 +548,7 @@ func TestNewExporterWithoutConfig(t *testing.T) { t.Setenv("AWS_STS_REGIONAL_ENDPOINTS", "fake") assert.Nil(t, expCfg.logger) - exp, err := newEmfPusher(expCfg, componenttest.NewNopExporterCreateSettings()) + exp, err := newEmfPusher(expCfg, exportertest.NewNopCreateSettings()) assert.NotNil(t, err) assert.Nil(t, exp) assert.NotNil(t, expCfg.logger) @@ -582,7 +582,7 @@ func TestNewExporterWithMetricDeclarations(t *testing.T) { expCfg.MetricDeclarations = mds obs, logs := observer.New(zap.WarnLevel) - params := componenttest.NewNopExporterCreateSettings() + params := exportertest.NewNopCreateSettings() params.Logger = zap.New(obs) exp, err := newEmfPusher(expCfg, params) @@ -614,7 +614,7 @@ func TestNewExporterWithMetricDeclarations(t *testing.T) { } func TestNewExporterWithoutSession(t *testing.T) { - exp, err := newEmfPusher(nil, componenttest.NewNopExporterCreateSettings()) + exp, err := newEmfPusher(nil, exportertest.NewNopCreateSettings()) assert.NotNil(t, err) assert.Nil(t, exp) } @@ -636,7 +636,7 @@ func TestNewEmfExporterWithoutConfig(t *testing.T) { t.Setenv("AWS_STS_REGIONAL_ENDPOINTS", "fake") assert.Nil(t, expCfg.logger) - exp, err := newEmfExporter(expCfg, componenttest.NewNopExporterCreateSettings()) + exp, err := newEmfExporter(expCfg, exportertest.NewNopCreateSettings()) assert.NotNil(t, err) assert.Nil(t, exp) assert.NotNil(t, expCfg.logger) diff --git a/exporter/awsemfexporter/factory.go b/exporter/awsemfexporter/factory.go index f7551f19daf5c..035a70cbf5d86 100644 --- a/exporter/awsemfexporter/factory.go +++ b/exporter/awsemfexporter/factory.go @@ -19,6 +19,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" + "go.opentelemetry.io/collector/exporter" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil" ) @@ -31,11 +32,11 @@ const ( ) // NewFactory creates a factory for AWS EMF exporter. -func NewFactory() component.ExporterFactory { - return component.NewExporterFactory( +func NewFactory() exporter.Factory { + return exporter.NewFactory( typeStr, createDefaultConfig, - component.WithMetricsExporter(createMetricsExporter, stability)) + exporter.WithMetrics(createMetricsExporter, stability)) } // CreateDefaultConfig creates the default configuration for exporter. @@ -54,8 +55,8 @@ func createDefaultConfig() component.Config { // createMetricsExporter creates a metrics exporter based on this config. func createMetricsExporter(_ context.Context, - params component.ExporterCreateSettings, - config component.Config) (component.MetricsExporter, error) { + params exporter.CreateSettings, + config component.Config) (exporter.Metrics, error) { expCfg := config.(*Config) diff --git a/exporter/awsemfexporter/factory_test.go b/exporter/awsemfexporter/factory_test.go index 20c6bbfb49636..e6aa9219ca916 100644 --- a/exporter/awsemfexporter/factory_test.go +++ b/exporter/awsemfexporter/factory_test.go @@ -24,6 +24,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/confmap/confmaptest" + "go.opentelemetry.io/collector/exporter/exportertest" ) func TestCreateDefaultConfig(t *testing.T) { @@ -44,7 +45,7 @@ func TestCreateTracesExporter(t *testing.T) { require.NoError(t, component.UnmarshalConfig(sub, cfg)) ctx := context.Background() - exporter, err := factory.CreateTracesExporter(ctx, componenttest.NewNopExporterCreateSettings(), cfg) + exporter, err := factory.CreateTracesExporter(ctx, exportertest.NewNopCreateSettings(), cfg) assert.NotNil(t, err) assert.Nil(t, exporter) } @@ -60,7 +61,7 @@ func TestCreateMetricsExporter(t *testing.T) { require.NoError(t, component.UnmarshalConfig(sub, cfg)) ctx := context.Background() - exporter, err := factory.CreateMetricsExporter(ctx, componenttest.NewNopExporterCreateSettings(), cfg) + exporter, err := factory.CreateMetricsExporter(ctx, exportertest.NewNopCreateSettings(), cfg) assert.Nil(t, err) assert.NotNil(t, exporter) } diff --git a/exporter/awsemfexporter/go.mod b/exporter/awsemfexporter/go.mod index 72c27efb8182c..451e0ccac9150 100644 --- a/exporter/awsemfexporter/go.mod +++ b/exporter/awsemfexporter/go.mod @@ -7,18 +7,18 @@ require ( github.com/census-instrumentation/opencensus-proto v0.4.1 github.com/golang/protobuf v1.5.2 github.com/google/uuid v1.3.0 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/cwlogs v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/metrics v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.66.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/cwlogs v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/metrics v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.67.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector v0.67.0 + go.opentelemetry.io/collector/component v0.67.0 + go.opentelemetry.io/collector/confmap v0.67.0 + go.opentelemetry.io/collector/consumer v0.67.0 + go.opentelemetry.io/collector/pdata v1.0.0-rc1 + go.opentelemetry.io/collector/semconv v0.67.0 go.uber.org/zap v1.24.0 google.golang.org/protobuf v1.28.1 ) @@ -37,11 +37,11 @@ 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/internal/coreinternal v0.66.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.67.0 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/stretchr/objx v0.5.0 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/featuregate v0.67.0 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/exporter/awsemfexporter/go.sum b/exporter/awsemfexporter/go.sum index 6ea1ff18865bd..fce746b98511a 100644 --- a/exporter/awsemfexporter/go.sum +++ b/exporter/awsemfexporter/go.sum @@ -286,20 +286,20 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 h1:Q5L9Urod3c8as6ZYaoaqBjarx/HXxsxy34DFZIU2fO4= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/component v0.67.0 h1:GCBRZAqk4yNaT4L1uwlbbwophFHrxYccLZ4Uj1Ifs/M= +go.opentelemetry.io/collector/component v0.67.0/go.mod h1:Txa2lm9oe7xsGQN8u7GdUIrRpAHFIKsTO4Qi3/CSmKk= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= +go.opentelemetry.io/collector/semconv v0.67.0 h1:zLAvcQa6Kgow52FFLrmk7/9ZVtEYyA73+xDtCcFG78Q= +go.opentelemetry.io/collector/semconv v0.67.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/exporter/awskinesisexporter/exporter.go b/exporter/awskinesisexporter/exporter.go index 65ee84a3a4c91..ded880ecd51a4 100644 --- a/exporter/awskinesisexporter/exporter.go +++ b/exporter/awskinesisexporter/exporter.go @@ -25,6 +25,7 @@ import ( "github.com/aws/aws-sdk-go-v2/service/sts" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/consumer" + "go.opentelemetry.io/collector/exporter" "go.opentelemetry.io/collector/pdata/plog" "go.opentelemetry.io/collector/pdata/pmetric" "go.opentelemetry.io/collector/pdata/ptrace" @@ -48,9 +49,9 @@ type options struct { } var ( - _ component.TracesExporter = (*Exporter)(nil) - _ component.MetricsExporter = (*Exporter)(nil) - _ component.LogsExporter = (*Exporter)(nil) + _ exporter.Traces = (*Exporter)(nil) + _ exporter.Metrics = (*Exporter)(nil) + _ exporter.Logs = (*Exporter)(nil) ) func createExporter(ctx context.Context, c component.Config, log *zap.Logger, opts ...func(opt *options)) (*Exporter, error) { diff --git a/exporter/awskinesisexporter/factory.go b/exporter/awskinesisexporter/factory.go index 153f9214b8af3..6b8958a35a3d8 100644 --- a/exporter/awskinesisexporter/factory.go +++ b/exporter/awskinesisexporter/factory.go @@ -19,6 +19,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" + "go.opentelemetry.io/collector/exporter" "go.opentelemetry.io/collector/exporter/exporterhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awskinesisexporter/internal/batch" @@ -35,13 +36,13 @@ const ( ) // NewFactory creates a factory for Kinesis exporter. -func NewFactory() component.ExporterFactory { - return component.NewExporterFactory( +func NewFactory() exporter.Factory { + return exporter.NewFactory( typeStr, createDefaultConfig, - component.WithTracesExporter(NewTracesExporter, stability), - component.WithMetricsExporter(NewMetricsExporter, stability), - component.WithLogsExporter(NewLogsExporter, stability), + exporter.WithTraces(NewTracesExporter, stability), + exporter.WithMetrics(NewMetricsExporter, stability), + exporter.WithLogs(NewLogsExporter, stability), ) } @@ -63,7 +64,7 @@ func createDefaultConfig() component.Config { } } -func NewTracesExporter(ctx context.Context, params component.ExporterCreateSettings, conf component.Config) (component.TracesExporter, error) { +func NewTracesExporter(ctx context.Context, params exporter.CreateSettings, conf component.Config) (exporter.Traces, error) { exp, err := createExporter(ctx, conf, params.Logger) if err != nil { return nil, err @@ -80,7 +81,7 @@ func NewTracesExporter(ctx context.Context, params component.ExporterCreateSetti ) } -func NewMetricsExporter(ctx context.Context, params component.ExporterCreateSettings, conf component.Config) (component.MetricsExporter, error) { +func NewMetricsExporter(ctx context.Context, params exporter.CreateSettings, conf component.Config) (exporter.Metrics, error) { exp, err := createExporter(ctx, conf, params.Logger) if err != nil { return nil, err @@ -97,7 +98,7 @@ func NewMetricsExporter(ctx context.Context, params component.ExporterCreateSett ) } -func NewLogsExporter(ctx context.Context, params component.ExporterCreateSettings, conf component.Config) (component.LogsExporter, error) { +func NewLogsExporter(ctx context.Context, params exporter.CreateSettings, conf component.Config) (exporter.Logs, error) { exp, err := createExporter(ctx, conf, params.Logger) if err != nil { return nil, err diff --git a/exporter/awskinesisexporter/go.mod b/exporter/awskinesisexporter/go.mod index 7d7af9af31fc2..b7ffc2f402c1a 100644 --- a/exporter/awskinesisexporter/go.mod +++ b/exporter/awskinesisexporter/go.mod @@ -11,14 +11,14 @@ require ( github.com/gogo/protobuf v1.3.2 github.com/google/uuid v1.3.0 github.com/jaegertracing/jaeger v1.39.1-0.20221110195127-14c11365a856 - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/zipkin v0.66.0 + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/zipkin v0.67.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector v0.67.0 + go.opentelemetry.io/collector/component v0.67.0 + go.opentelemetry.io/collector/confmap v0.67.0 + go.opentelemetry.io/collector/consumer v0.67.0 + go.opentelemetry.io/collector/pdata v1.0.0-rc1 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.24.0 ) @@ -46,15 +46,15 @@ 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/internal/coreinternal v0.66.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.67.0 // indirect github.com/opentracing/opentracing-go v1.2.0 // indirect github.com/openzipkin/zipkin-go v0.4.1 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/uber/jaeger-client-go v2.30.0+incompatible // indirect github.com/uber/jaeger-lib v2.4.1+incompatible // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect - go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/featuregate v0.67.0 // indirect + go.opentelemetry.io/collector/semconv v0.67.0 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/exporter/awskinesisexporter/go.sum b/exporter/awskinesisexporter/go.sum index 0d608eb0eb4e2..451f7d04e9c96 100644 --- a/exporter/awskinesisexporter/go.sum +++ b/exporter/awskinesisexporter/go.sum @@ -321,20 +321,20 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 h1:Q5L9Urod3c8as6ZYaoaqBjarx/HXxsxy34DFZIU2fO4= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/component v0.67.0 h1:GCBRZAqk4yNaT4L1uwlbbwophFHrxYccLZ4Uj1Ifs/M= +go.opentelemetry.io/collector/component v0.67.0/go.mod h1:Txa2lm9oe7xsGQN8u7GdUIrRpAHFIKsTO4Qi3/CSmKk= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= +go.opentelemetry.io/collector/semconv v0.67.0 h1:zLAvcQa6Kgow52FFLrmk7/9ZVtEYyA73+xDtCcFG78Q= +go.opentelemetry.io/collector/semconv v0.67.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/exporter/awsxrayexporter/awsxray.go b/exporter/awsxrayexporter/awsxray.go index 6e19dba82e9bc..caa4c2e5137ff 100644 --- a/exporter/awsxrayexporter/awsxray.go +++ b/exporter/awsxrayexporter/awsxray.go @@ -22,6 +22,7 @@ import ( "github.com/aws/aws-sdk-go/service/xray" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/consumer/consumererror" + "go.opentelemetry.io/collector/exporter" "go.opentelemetry.io/collector/exporter/exporterhelper" "go.opentelemetry.io/collector/pdata/ptrace" "go.uber.org/zap" @@ -34,10 +35,10 @@ const ( maxSegmentsPerPut = int(50) // limit imposed by PutTraceSegments API ) -// newTracesExporter creates an component.TracesExporter that converts to an X-Ray PutTraceSegments +// newTracesExporter creates an exporter.Traces that converts to an X-Ray PutTraceSegments // request and then posts the request to the configured region's X-Ray endpoint. func newTracesExporter( - config component.Config, set component.ExporterCreateSettings, cn awsutil.ConnAttr) (component.TracesExporter, error) { + config component.Config, set exporter.CreateSettings, cn awsutil.ConnAttr) (exporter.Traces, error) { typeLog := zap.String("type", string(set.ID.Type())) nameLog := zap.String("name", set.ID.String()) logger := set.Logger diff --git a/exporter/awsxrayexporter/awsxray_test.go b/exporter/awsxrayexporter/awsxray_test.go index 200798e55aaed..fcdbbea700b60 100644 --- a/exporter/awsxrayexporter/awsxray_test.go +++ b/exporter/awsxrayexporter/awsxray_test.go @@ -24,7 +24,8 @@ import ( "github.com/stretchr/testify/assert" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/component/componenttest" + "go.opentelemetry.io/collector/exporter" + "go.opentelemetry.io/collector/exporter/exportertest" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/ptrace" conventions "go.opentelemetry.io/collector/semconv/v1.6.1" @@ -84,10 +85,10 @@ func BenchmarkForTracesExporter(b *testing.B) { } } -func initializeTracesExporter(t testing.TB) component.TracesExporter { +func initializeTracesExporter(t testing.TB) exporter.Traces { exporterConfig := generateConfig(t) mconn := new(awsutil.Conn) - traceExporter, err := newTracesExporter(exporterConfig, componenttest.NewNopExporterCreateSettings(), mconn) + traceExporter, err := newTracesExporter(exporterConfig, exportertest.NewNopCreateSettings(), mconn) if err != nil { panic(err) } diff --git a/exporter/awsxrayexporter/factory.go b/exporter/awsxrayexporter/factory.go index aa3826a98b517..274f8fcc00fe2 100644 --- a/exporter/awsxrayexporter/factory.go +++ b/exporter/awsxrayexporter/factory.go @@ -19,6 +19,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" + "go.opentelemetry.io/collector/exporter" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil" ) @@ -31,11 +32,11 @@ const ( ) // NewFactory creates a factory for AWS-Xray exporter. -func NewFactory() component.ExporterFactory { - return component.NewExporterFactory( +func NewFactory() exporter.Factory { + return exporter.NewFactory( typeStr, createDefaultConfig, - component.WithTracesExporter(createTracesExporter, stability)) + exporter.WithTraces(createTracesExporter, stability)) } func createDefaultConfig() component.Config { @@ -47,9 +48,9 @@ func createDefaultConfig() component.Config { func createTracesExporter( _ context.Context, - params component.ExporterCreateSettings, + params exporter.CreateSettings, cfg component.Config, -) (component.TracesExporter, error) { +) (exporter.Traces, error) { eCfg := cfg.(*Config) return newTracesExporter(eCfg, params, &awsutil.Conn{}) } diff --git a/exporter/awsxrayexporter/factory_test.go b/exporter/awsxrayexporter/factory_test.go index 70274e7820dbf..6c960da4814a5 100644 --- a/exporter/awsxrayexporter/factory_test.go +++ b/exporter/awsxrayexporter/factory_test.go @@ -25,6 +25,7 @@ import ( "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/confmap/confmaptest" + "go.opentelemetry.io/collector/exporter/exportertest" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil" ) @@ -61,7 +62,7 @@ func TestCreateTracesExporter(t *testing.T) { require.NoError(t, component.UnmarshalConfig(sub, cfg)) ctx := context.Background() - exporter, err := factory.CreateTracesExporter(ctx, componenttest.NewNopExporterCreateSettings(), cfg) + exporter, err := factory.CreateTracesExporter(ctx, exportertest.NewNopCreateSettings(), cfg) assert.Nil(t, err) assert.NotNil(t, exporter) } @@ -77,7 +78,7 @@ func TestCreateMetricsExporter(t *testing.T) { require.NoError(t, component.UnmarshalConfig(sub, cfg)) ctx := context.Background() - exporter, err := factory.CreateMetricsExporter(ctx, componenttest.NewNopExporterCreateSettings(), cfg) + exporter, err := factory.CreateMetricsExporter(ctx, exportertest.NewNopCreateSettings(), cfg) assert.NotNil(t, err) assert.Nil(t, exporter) } diff --git a/exporter/awsxrayexporter/go.mod b/exporter/awsxrayexporter/go.mod index dcd0461f44044..af3d0f0cc0eb1 100644 --- a/exporter/awsxrayexporter/go.mod +++ b/exporter/awsxrayexporter/go.mod @@ -4,16 +4,16 @@ go 1.18 require ( github.com/aws/aws-sdk-go v1.44.155 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.66.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.67.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector v0.67.0 + go.opentelemetry.io/collector/component v0.67.0 + go.opentelemetry.io/collector/confmap v0.67.0 + go.opentelemetry.io/collector/consumer v0.67.0 + go.opentelemetry.io/collector/pdata v1.0.0-rc1 + go.opentelemetry.io/collector/semconv v0.67.0 go.uber.org/zap v1.24.0 ) @@ -34,7 +34,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rogpeppe/go-internal v1.6.1 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/featuregate v0.67.0 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/exporter/awsxrayexporter/go.sum b/exporter/awsxrayexporter/go.sum index 3c4b59b85a2d1..28a0df59062ea 100644 --- a/exporter/awsxrayexporter/go.sum +++ b/exporter/awsxrayexporter/go.sum @@ -281,20 +281,20 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 h1:Q5L9Urod3c8as6ZYaoaqBjarx/HXxsxy34DFZIU2fO4= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/component v0.67.0 h1:GCBRZAqk4yNaT4L1uwlbbwophFHrxYccLZ4Uj1Ifs/M= +go.opentelemetry.io/collector/component v0.67.0/go.mod h1:Txa2lm9oe7xsGQN8u7GdUIrRpAHFIKsTO4Qi3/CSmKk= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= +go.opentelemetry.io/collector/semconv v0.67.0 h1:zLAvcQa6Kgow52FFLrmk7/9ZVtEYyA73+xDtCcFG78Q= +go.opentelemetry.io/collector/semconv v0.67.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/exporter/azuredataexplorerexporter/factory.go b/exporter/azuredataexplorerexporter/factory.go index 7d702b9a96516..53077262a8f80 100644 --- a/exporter/azuredataexplorerexporter/factory.go +++ b/exporter/azuredataexplorerexporter/factory.go @@ -20,6 +20,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" + "go.opentelemetry.io/collector/exporter" "go.opentelemetry.io/collector/exporter/exporterhelper" "go.uber.org/zap" ) @@ -41,13 +42,13 @@ const ( ) // Creates a factory for the ADX Exporter -func NewFactory() component.ExporterFactory { - return component.NewExporterFactory( +func NewFactory() exporter.Factory { + return exporter.NewFactory( typeStr, createDefaultConfig, - component.WithTracesExporter(createTracesExporter, stability), - component.WithMetricsExporter(createMetricsExporter, stability), - component.WithLogsExporter(createLogsExporter, stability), + exporter.WithTraces(createTracesExporter, stability), + exporter.WithMetrics(createMetricsExporter, stability), + exporter.WithLogs(createLogsExporter, stability), ) } @@ -65,9 +66,9 @@ func createDefaultConfig() component.Config { func createMetricsExporter( ctx context.Context, - set component.ExporterCreateSettings, + set exporter.CreateSettings, config component.Config, -) (component.MetricsExporter, error) { +) (exporter.Metrics, error) { if config == nil { return nil, errors.New("nil config") } @@ -98,9 +99,9 @@ func createMetricsExporter( func createTracesExporter( ctx context.Context, - set component.ExporterCreateSettings, + set exporter.CreateSettings, config component.Config, -) (component.TracesExporter, error) { +) (exporter.Traces, error) { adxCfg := config.(*Config) setDefaultIngestionType(adxCfg, set.Logger) @@ -128,9 +129,9 @@ func createTracesExporter( func createLogsExporter( ctx context.Context, - set component.ExporterCreateSettings, + set exporter.CreateSettings, config component.Config, -) (exp component.LogsExporter, err error) { +) (exp exporter.Logs, err error) { adxCfg := config.(*Config) setDefaultIngestionType(adxCfg, set.Logger) diff --git a/exporter/azuredataexplorerexporter/factory_test.go b/exporter/azuredataexplorerexporter/factory_test.go index 7b3c5d6e962b8..68cea31b2473f 100644 --- a/exporter/azuredataexplorerexporter/factory_test.go +++ b/exporter/azuredataexplorerexporter/factory_test.go @@ -24,6 +24,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/confmap/confmaptest" + "go.opentelemetry.io/collector/exporter/exportertest" ) // Given a new factory and no-op exporter , the NewMetric exporter should work. @@ -38,7 +39,7 @@ func TestCreateMetricsExporter(t *testing.T) { require.NoError(t, err) require.NoError(t, component.UnmarshalConfig(sub, cfg)) - params := componenttest.NewNopExporterCreateSettings() + params := exportertest.NewNopCreateSettings() exporter, err := factory.CreateMetricsExporter(context.Background(), params, cfg) assert.NotNil(t, err) assert.Nil(t, exporter) @@ -56,7 +57,7 @@ func TestCreateMetricsExporterWhenIngestEmpty(t *testing.T) { require.NoError(t, err) require.NoError(t, component.UnmarshalConfig(sub, cfg)) - params := componenttest.NewNopExporterCreateSettings() + params := exportertest.NewNopCreateSettings() // Load the #3 which has empty exporter, err := factory.CreateMetricsExporter(context.Background(), params, cfg) assert.NotNil(t, err) @@ -85,7 +86,7 @@ func TestCreateLogsExporter(t *testing.T) { require.NoError(t, err) require.NoError(t, component.UnmarshalConfig(sub, cfg)) - params := componenttest.NewNopExporterCreateSettings() + params := exportertest.NewNopCreateSettings() exporter, err := factory.CreateLogsExporter(context.Background(), params, cfg) assert.NotNil(t, err) assert.Nil(t, exporter) @@ -103,7 +104,7 @@ func TestCreateLogsExporterWhenIngestEmpty(t *testing.T) { require.NoError(t, err) require.NoError(t, component.UnmarshalConfig(sub, cfg)) - params := componenttest.NewNopExporterCreateSettings() + params := exportertest.NewNopCreateSettings() // Load the #3 which has empty exporter, err := factory.CreateLogsExporter(context.Background(), params, cfg) assert.NotNil(t, err) @@ -124,7 +125,7 @@ func TestCreateTracesExporter(t *testing.T) { require.NoError(t, err) require.NoError(t, component.UnmarshalConfig(sub, cfg)) - params := componenttest.NewNopExporterCreateSettings() + params := exportertest.NewNopCreateSettings() exporter, err := factory.CreateTracesExporter(context.Background(), params, cfg) assert.NotNil(t, err) assert.Nil(t, exporter) @@ -142,7 +143,7 @@ func TestCreateTracesExporterWhenIngestEmpty(t *testing.T) { require.NoError(t, err) require.NoError(t, component.UnmarshalConfig(sub, cfg)) - params := componenttest.NewNopExporterCreateSettings() + params := exportertest.NewNopCreateSettings() // Load the #3 which has empty exporter, err := factory.CreateTracesExporter(context.Background(), params, cfg) assert.NotNil(t, err) diff --git a/exporter/azuredataexplorerexporter/go.mod b/exporter/azuredataexplorerexporter/go.mod index d0eb9f7678262..a61f716e2a051 100644 --- a/exporter/azuredataexplorerexporter/go.mod +++ b/exporter/azuredataexplorerexporter/go.mod @@ -6,12 +6,12 @@ require ( github.com/Azure/azure-kusto-go v0.9.2 github.com/Azure/go-autorest/autorest/azure/auth v0.5.11 github.com/json-iterator/go v1.1.12 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.66.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.67.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector v0.67.0 + go.opentelemetry.io/collector/component v0.67.0 + go.opentelemetry.io/collector/confmap v0.67.0 + go.opentelemetry.io/collector/pdata v1.0.0-rc1 go.uber.org/zap v1.24.0 ) @@ -50,8 +50,8 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rogpeppe/go-internal v1.9.0 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/consumer v0.67.0 // indirect + go.opentelemetry.io/collector/featuregate v0.67.0 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/exporter/azuredataexplorerexporter/go.sum b/exporter/azuredataexplorerexporter/go.sum index ac3f83cfdb81b..2a4b31abf16d6 100644 --- a/exporter/azuredataexplorerexporter/go.sum +++ b/exporter/azuredataexplorerexporter/go.sum @@ -330,18 +330,18 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/component v0.67.0 h1:GCBRZAqk4yNaT4L1uwlbbwophFHrxYccLZ4Uj1Ifs/M= +go.opentelemetry.io/collector/component v0.67.0/go.mod h1:Txa2lm9oe7xsGQN8u7GdUIrRpAHFIKsTO4Qi3/CSmKk= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/exporter/azuremonitorexporter/factory.go b/exporter/azuremonitorexporter/factory.go index 09ab5ce79ddce..259f4c932eadb 100644 --- a/exporter/azuremonitorexporter/factory.go +++ b/exporter/azuremonitorexporter/factory.go @@ -22,6 +22,7 @@ import ( "github.com/microsoft/ApplicationInsights-Go/appinsights" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" + "go.opentelemetry.io/collector/exporter" "go.uber.org/zap" ) @@ -38,13 +39,13 @@ var ( ) // NewFactory returns a factory for Azure Monitor exporter. -func NewFactory() component.ExporterFactory { +func NewFactory() exporter.Factory { f := &factory{} - return component.NewExporterFactory( + return exporter.NewFactory( typeStr, createDefaultConfig, - component.WithTracesExporter(f.createTracesExporter, stability), - component.WithLogsExporter(f.createLogsExporter, stability)) + exporter.WithTraces(f.createTracesExporter, stability), + exporter.WithLogs(f.createLogsExporter, stability)) } // Implements the interface from go.opentelemetry.io/collector/exporter/factory.go @@ -64,9 +65,9 @@ func createDefaultConfig() component.Config { func (f *factory) createTracesExporter( ctx context.Context, - set component.ExporterCreateSettings, + set exporter.CreateSettings, cfg component.Config, -) (component.TracesExporter, error) { +) (exporter.Traces, error) { exporterConfig, ok := cfg.(*Config) if !ok { @@ -79,9 +80,9 @@ func (f *factory) createTracesExporter( func (f *factory) createLogsExporter( ctx context.Context, - set component.ExporterCreateSettings, + set exporter.CreateSettings, cfg component.Config, -) (component.LogsExporter, error) { +) (exporter.Logs, error) { exporterConfig, ok := cfg.(*Config) if !ok { diff --git a/exporter/azuremonitorexporter/factory_test.go b/exporter/azuremonitorexporter/factory_test.go index df4a1da579bab..0b44f2e1945c7 100644 --- a/exporter/azuremonitorexporter/factory_test.go +++ b/exporter/azuremonitorexporter/factory_test.go @@ -19,8 +19,8 @@ import ( "testing" "github.com/stretchr/testify/assert" - "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" + "go.opentelemetry.io/collector/exporter/exportertest" ) // An inappropriate config @@ -32,7 +32,7 @@ func TestCreateTracesExporterUsingSpecificTransportChannel(t *testing.T) { // mock transport channel creation f := factory{tChannel: &mockTransportChannel{}} ctx := context.Background() - params := componenttest.NewNopExporterCreateSettings() + params := exportertest.NewNopCreateSettings() exporter, err := f.createTracesExporter(ctx, params, createDefaultConfig()) assert.NotNil(t, exporter) assert.Nil(t, err) @@ -43,7 +43,7 @@ func TestCreateTracesExporterUsingDefaultTransportChannel(t *testing.T) { f := factory{} assert.Nil(t, f.tChannel) ctx := context.Background() - exporter, err := f.createTracesExporter(ctx, componenttest.NewNopExporterCreateSettings(), createDefaultConfig()) + exporter, err := f.createTracesExporter(ctx, exportertest.NewNopCreateSettings(), createDefaultConfig()) assert.NotNil(t, exporter) assert.Nil(t, err) assert.NotNil(t, f.tChannel) @@ -54,7 +54,7 @@ func TestCreateTracesExporterUsingBadConfig(t *testing.T) { f := factory{} assert.Nil(t, f.tChannel) ctx := context.Background() - params := componenttest.NewNopExporterCreateSettings() + params := exportertest.NewNopCreateSettings() badConfig := &badConfig{} diff --git a/exporter/azuremonitorexporter/go.mod b/exporter/azuremonitorexporter/go.mod index a3b063e1b6e77..3fbe9a62fb283 100644 --- a/exporter/azuremonitorexporter/go.mod +++ b/exporter/azuremonitorexporter/go.mod @@ -4,14 +4,14 @@ go 1.18 require ( github.com/microsoft/ApplicationInsights-Go v0.4.4 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.66.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.67.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector v0.67.0 + go.opentelemetry.io/collector/component v0.67.0 + go.opentelemetry.io/collector/confmap v0.67.0 + go.opentelemetry.io/collector/consumer v0.67.0 + go.opentelemetry.io/collector/pdata v1.0.0-rc1 + go.opentelemetry.io/collector/semconv v0.67.0 go.uber.org/zap v1.24.0 golang.org/x/net v0.3.0 ) @@ -35,7 +35,7 @@ require ( github.com/rogpeppe/go-internal v1.6.1 // indirect github.com/stretchr/objx v0.5.0 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/featuregate v0.67.0 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/exporter/azuremonitorexporter/go.sum b/exporter/azuremonitorexporter/go.sum index a7eaa4af2e1ca..fb4e385dd84f1 100644 --- a/exporter/azuremonitorexporter/go.sum +++ b/exporter/azuremonitorexporter/go.sum @@ -290,20 +290,20 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 h1:Q5L9Urod3c8as6ZYaoaqBjarx/HXxsxy34DFZIU2fO4= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/component v0.67.0 h1:GCBRZAqk4yNaT4L1uwlbbwophFHrxYccLZ4Uj1Ifs/M= +go.opentelemetry.io/collector/component v0.67.0/go.mod h1:Txa2lm9oe7xsGQN8u7GdUIrRpAHFIKsTO4Qi3/CSmKk= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= +go.opentelemetry.io/collector/semconv v0.67.0 h1:zLAvcQa6Kgow52FFLrmk7/9ZVtEYyA73+xDtCcFG78Q= +go.opentelemetry.io/collector/semconv v0.67.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/exporter/azuremonitorexporter/logexporter.go b/exporter/azuremonitorexporter/logexporter.go index d699383b48aef..1f768a61a3308 100644 --- a/exporter/azuremonitorexporter/logexporter.go +++ b/exporter/azuremonitorexporter/logexporter.go @@ -17,7 +17,7 @@ package azuremonitorexporter // import "github.com/open-telemetry/opentelemetry- import ( "context" - "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/exporter" "go.opentelemetry.io/collector/exporter/exporterhelper" "go.opentelemetry.io/collector/pdata/plog" "go.uber.org/zap" @@ -49,7 +49,7 @@ func (exporter *logExporter) onLogData(context context.Context, logData plog.Log } // Returns a new instance of the log exporter -func newLogsExporter(config *Config, transportChannel transportChannel, set component.ExporterCreateSettings) (component.LogsExporter, error) { +func newLogsExporter(config *Config, transportChannel transportChannel, set exporter.CreateSettings) (exporter.Logs, error) { exporter := &logExporter{ config: config, transportChannel: transportChannel, diff --git a/exporter/azuremonitorexporter/traceexporter.go b/exporter/azuremonitorexporter/traceexporter.go index 09eeebd3dbf97..1cb7fecf9dab0 100644 --- a/exporter/azuremonitorexporter/traceexporter.go +++ b/exporter/azuremonitorexporter/traceexporter.go @@ -17,8 +17,8 @@ package azuremonitorexporter // import "github.com/open-telemetry/opentelemetry- import ( "context" - "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/consumer/consumererror" + "go.opentelemetry.io/collector/exporter" "go.opentelemetry.io/collector/exporter/exporterhelper" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/ptrace" @@ -74,7 +74,7 @@ func (exporter *traceExporter) onTraceData(context context.Context, traceData pt } // Returns a new instance of the trace exporter -func newTracesExporter(config *Config, transportChannel transportChannel, set component.ExporterCreateSettings) (component.TracesExporter, error) { +func newTracesExporter(config *Config, transportChannel transportChannel, set exporter.CreateSettings) (exporter.Traces, error) { exporter := &traceExporter{ config: config, transportChannel: transportChannel, diff --git a/exporter/carbonexporter/exporter.go b/exporter/carbonexporter/exporter.go index 2fc5fa3abdfed..5eacab64da49e 100644 --- a/exporter/carbonexporter/exporter.go +++ b/exporter/carbonexporter/exporter.go @@ -20,13 +20,13 @@ import ( "sync" "time" - "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/exporter" "go.opentelemetry.io/collector/exporter/exporterhelper" "go.opentelemetry.io/collector/pdata/pmetric" ) // newCarbonExporter returns a new Carbon exporter. -func newCarbonExporter(cfg *Config, set component.ExporterCreateSettings) (component.MetricsExporter, error) { +func newCarbonExporter(cfg *Config, set exporter.CreateSettings) (exporter.Metrics, error) { sender := carbonSender{ connPool: newTCPConnPool(cfg.Endpoint, cfg.Timeout), } diff --git a/exporter/carbonexporter/exporter_test.go b/exporter/carbonexporter/exporter_test.go index 8aa98be8ac018..84c2d0ca15701 100644 --- a/exporter/carbonexporter/exporter_test.go +++ b/exporter/carbonexporter/exporter_test.go @@ -30,6 +30,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component/componenttest" + "go.opentelemetry.io/collector/exporter/exportertest" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" conventions "go.opentelemetry.io/collector/semconv/v1.9.0" @@ -40,7 +41,7 @@ import ( func TestNew(t *testing.T) { cfg := createDefaultConfig().(*Config) - got, err := newCarbonExporter(cfg, componenttest.NewNopExporterCreateSettings()) + got, err := newCarbonExporter(cfg, exportertest.NewNopCreateSettings()) assert.NotNil(t, got) assert.NoError(t, err) } @@ -109,7 +110,7 @@ func TestConsumeMetricsData(t *testing.T) { } config := &Config{Endpoint: addr, Timeout: 1000 * time.Millisecond} - exp, err := newCarbonExporter(config, componenttest.NewNopExporterCreateSettings()) + exp, err := newCarbonExporter(config, exportertest.NewNopCreateSettings()) require.NoError(t, err) require.NoError(t, exp.Start(context.Background(), componenttest.NewNopHost())) diff --git a/exporter/carbonexporter/factory.go b/exporter/carbonexporter/factory.go index 459a2f6403bd3..5dbd10b3cdb2a 100644 --- a/exporter/carbonexporter/factory.go +++ b/exporter/carbonexporter/factory.go @@ -19,6 +19,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" + "go.opentelemetry.io/collector/exporter" ) const ( @@ -29,11 +30,11 @@ const ( ) // NewFactory creates a factory for Carbon exporter. -func NewFactory() component.ExporterFactory { - return component.NewExporterFactory( +func NewFactory() exporter.Factory { + return exporter.NewFactory( typeStr, createDefaultConfig, - component.WithMetricsExporter(createMetricsExporter, stability)) + exporter.WithMetrics(createMetricsExporter, stability)) } func createDefaultConfig() component.Config { @@ -46,9 +47,9 @@ func createDefaultConfig() component.Config { func createMetricsExporter( _ context.Context, - params component.ExporterCreateSettings, + params exporter.CreateSettings, config component.Config, -) (component.MetricsExporter, error) { +) (exporter.Metrics, error) { exp, err := newCarbonExporter(config.(*Config), params) if err != nil { diff --git a/exporter/carbonexporter/factory_test.go b/exporter/carbonexporter/factory_test.go index b3cd083149c51..653e11905a05a 100644 --- a/exporter/carbonexporter/factory_test.go +++ b/exporter/carbonexporter/factory_test.go @@ -21,6 +21,7 @@ import ( "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) { @@ -31,7 +32,7 @@ func TestCreateDefaultConfig(t *testing.T) { func TestCreateMetricsExporter(t *testing.T) { cfg := createDefaultConfig() - _, err := createMetricsExporter(context.Background(), componenttest.NewNopExporterCreateSettings(), cfg) + _, err := createMetricsExporter(context.Background(), exportertest.NewNopCreateSettings(), cfg) assert.NoError(t, err) } @@ -41,7 +42,7 @@ func TestCreateInstanceViaFactory(t *testing.T) { cfg := factory.CreateDefaultConfig() exp, err := factory.CreateMetricsExporter( context.Background(), - componenttest.NewNopExporterCreateSettings(), + exportertest.NewNopCreateSettings(), cfg) assert.NoError(t, err) assert.NotNil(t, exp) @@ -51,7 +52,7 @@ func TestCreateInstanceViaFactory(t *testing.T) { exp, err = factory.CreateMetricsExporter( context.Background(), - componenttest.NewNopExporterCreateSettings(), + exportertest.NewNopCreateSettings(), cfg) assert.NoError(t, err) require.NotNil(t, exp) diff --git a/exporter/carbonexporter/go.mod b/exporter/carbonexporter/go.mod index 38a4e6c464dad..a3cb40caa0d7d 100644 --- a/exporter/carbonexporter/go.mod +++ b/exporter/carbonexporter/go.mod @@ -3,13 +3,13 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/exporter/carbon go 1.18 require ( - github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.66.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.67.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector v0.67.0 + go.opentelemetry.io/collector/component v0.67.0 + go.opentelemetry.io/collector/confmap v0.67.0 + go.opentelemetry.io/collector/pdata v1.0.0-rc1 + go.opentelemetry.io/collector/semconv v0.67.0 go.uber.org/atomic v1.10.0 ) @@ -29,8 +29,8 @@ require ( github.com/pelletier/go-toml v1.9.4 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/consumer v0.67.0 // indirect + go.opentelemetry.io/collector/featuregate v0.67.0 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/exporter/carbonexporter/go.sum b/exporter/carbonexporter/go.sum index dd4dcb86294ef..34344743a64b0 100644 --- a/exporter/carbonexporter/go.sum +++ b/exporter/carbonexporter/go.sum @@ -273,20 +273,20 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 h1:Q5L9Urod3c8as6ZYaoaqBjarx/HXxsxy34DFZIU2fO4= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/component v0.67.0 h1:GCBRZAqk4yNaT4L1uwlbbwophFHrxYccLZ4Uj1Ifs/M= +go.opentelemetry.io/collector/component v0.67.0/go.mod h1:Txa2lm9oe7xsGQN8u7GdUIrRpAHFIKsTO4Qi3/CSmKk= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= +go.opentelemetry.io/collector/semconv v0.67.0 h1:zLAvcQa6Kgow52FFLrmk7/9ZVtEYyA73+xDtCcFG78Q= +go.opentelemetry.io/collector/semconv v0.67.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/exporter/clickhouseexporter/factory.go b/exporter/clickhouseexporter/factory.go index 9b9c8c85dae0f..24b73e562a198 100644 --- a/exporter/clickhouseexporter/factory.go +++ b/exporter/clickhouseexporter/factory.go @@ -20,6 +20,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" + "go.opentelemetry.io/collector/exporter" "go.opentelemetry.io/collector/exporter/exporterhelper" ) @@ -31,12 +32,12 @@ const ( ) // NewFactory creates a factory for Elastic exporter. -func NewFactory() component.ExporterFactory { - return component.NewExporterFactory( +func NewFactory() exporter.Factory { + return exporter.NewFactory( typeStr, createDefaultConfig, - component.WithLogsExporter(createLogsExporter, stability), - component.WithTracesExporter(createTracesExporter, stability), + exporter.WithLogs(createLogsExporter, stability), + exporter.WithTraces(createTracesExporter, stability), ) } @@ -56,9 +57,9 @@ func createDefaultConfig() component.Config { // Logs are directly insert into clickhouse. func createLogsExporter( ctx context.Context, - set component.ExporterCreateSettings, + set exporter.CreateSettings, cfg component.Config, -) (component.LogsExporter, error) { +) (exporter.Logs, error) { c := cfg.(*Config) exporter, err := newLogsExporter(set.Logger, c) if err != nil { @@ -81,9 +82,9 @@ func createLogsExporter( // Traces are directly insert into clickhouse. func createTracesExporter( ctx context.Context, - set component.ExporterCreateSettings, + set exporter.CreateSettings, cfg component.Config, -) (component.TracesExporter, error) { +) (exporter.Traces, error) { c := cfg.(*Config) exporter, err := newTracesExporter(set.Logger, c) if err != nil { diff --git a/exporter/clickhouseexporter/factory_test.go b/exporter/clickhouseexporter/factory_test.go index df24df44c8fcd..18ea6f60b9b77 100644 --- a/exporter/clickhouseexporter/factory_test.go +++ b/exporter/clickhouseexporter/factory_test.go @@ -21,6 +21,7 @@ import ( "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) { @@ -35,7 +36,7 @@ func TestFactory_CreateLogsExporter(t *testing.T) { cfg := withDefaultConfig(func(cfg *Config) { cfg.DSN = defaultDSN }) - params := componenttest.NewNopExporterCreateSettings() + params := exportertest.NewNopCreateSettings() exporter, err := factory.CreateLogsExporter(context.Background(), params, cfg) require.NoError(t, err) require.NotNil(t, exporter) @@ -48,7 +49,7 @@ func TestFactory_CreateTracesExporter(t *testing.T) { cfg := withDefaultConfig(func(cfg *Config) { cfg.DSN = defaultDSN }) - params := componenttest.NewNopExporterCreateSettings() + params := exportertest.NewNopCreateSettings() exporter, err := factory.CreateTracesExporter(context.Background(), params, cfg) require.NoError(t, err) require.NotNil(t, exporter) @@ -59,7 +60,7 @@ func TestFactory_CreateTracesExporter(t *testing.T) { func TestFactory_CreateMetricsExporter_Fail(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() - params := componenttest.NewNopExporterCreateSettings() + params := exportertest.NewNopCreateSettings() _, err := factory.CreateMetricsExporter(context.Background(), params, cfg) require.Error(t, err, "expected an error when creating a traces exporter") } diff --git a/exporter/clickhouseexporter/go.mod b/exporter/clickhouseexporter/go.mod index 6b6bd95fa7858..cf1988d4bc4fc 100644 --- a/exporter/clickhouseexporter/go.mod +++ b/exporter/clickhouseexporter/go.mod @@ -4,13 +4,13 @@ go 1.18 require ( github.com/ClickHouse/clickhouse-go/v2 v2.4.3 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.66.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.67.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector v0.67.0 + go.opentelemetry.io/collector/component v0.67.0 + go.opentelemetry.io/collector/confmap v0.67.0 + go.opentelemetry.io/collector/pdata v1.0.0-rc1 + go.opentelemetry.io/collector/semconv v0.67.0 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.24.0 ) @@ -43,8 +43,8 @@ require ( github.com/segmentio/asm v1.2.0 // indirect github.com/shopspring/decimal v1.3.1 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/consumer v0.67.0 // indirect + go.opentelemetry.io/collector/featuregate v0.67.0 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/exporter/clickhouseexporter/go.sum b/exporter/clickhouseexporter/go.sum index 17b9589fa3434..3632f5bf95e25 100644 --- a/exporter/clickhouseexporter/go.sum +++ b/exporter/clickhouseexporter/go.sum @@ -299,20 +299,20 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 h1:Q5L9Urod3c8as6ZYaoaqBjarx/HXxsxy34DFZIU2fO4= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/component v0.67.0 h1:GCBRZAqk4yNaT4L1uwlbbwophFHrxYccLZ4Uj1Ifs/M= +go.opentelemetry.io/collector/component v0.67.0/go.mod h1:Txa2lm9oe7xsGQN8u7GdUIrRpAHFIKsTO4Qi3/CSmKk= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= +go.opentelemetry.io/collector/semconv v0.67.0 h1:zLAvcQa6Kgow52FFLrmk7/9ZVtEYyA73+xDtCcFG78Q= +go.opentelemetry.io/collector/semconv v0.67.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/exporter/coralogixexporter/config_test.go b/exporter/coralogixexporter/config_test.go index abf7f7cc1c559..5fcf9d58f7bbe 100644 --- a/exporter/coralogixexporter/config_test.go +++ b/exporter/coralogixexporter/config_test.go @@ -28,6 +28,7 @@ import ( "go.opentelemetry.io/collector/config/configtls" "go.opentelemetry.io/collector/confmap/confmaptest" "go.opentelemetry.io/collector/exporter/exporterhelper" + "go.opentelemetry.io/collector/exporter/exportertest" ) func TestLoadConfig(t *testing.T) { @@ -181,7 +182,7 @@ func TestTraceExporter(t *testing.T) { require.NoError(t, err) require.NoError(t, component.UnmarshalConfig(sub, cfg)) - params := componenttest.NewNopExporterCreateSettings() + params := exportertest.NewNopCreateSettings() te, err := newTracesExporter(cfg, params) assert.NoError(t, err) assert.NotNil(t, te, "failed to create trace exporter") diff --git a/exporter/coralogixexporter/factory.go b/exporter/coralogixexporter/factory.go index 5844a736e62cf..72f6a91d5e8e4 100644 --- a/exporter/coralogixexporter/factory.go +++ b/exporter/coralogixexporter/factory.go @@ -22,17 +22,18 @@ import ( "go.opentelemetry.io/collector/config/configcompression" "go.opentelemetry.io/collector/config/configgrpc" "go.opentelemetry.io/collector/consumer" + exp "go.opentelemetry.io/collector/exporter" "go.opentelemetry.io/collector/exporter/exporterhelper" ) // NewFactory by Coralogix -func NewFactory() component.ExporterFactory { - return component.NewExporterFactory( +func NewFactory() exp.Factory { + return exp.NewFactory( typeStr, createDefaultConfig, - component.WithTracesExporter(createTraceExporter, stability), - component.WithMetricsExporter(createMetricsExporter, stability), - component.WithLogsExporter(createLogsExporter, component.StabilityLevelAlpha), + exp.WithTraces(createTraceExporter, stability), + exp.WithMetrics(createMetricsExporter, stability), + exp.WithLogs(createLogsExporter, component.StabilityLevelAlpha), ) } @@ -63,7 +64,7 @@ func createDefaultConfig() component.Config { } } -func createTraceExporter(ctx context.Context, set component.ExporterCreateSettings, config component.Config) (component.TracesExporter, error) { +func createTraceExporter(ctx context.Context, set exp.CreateSettings, config component.Config) (exp.Traces, error) { cfg := config.(*Config) exporter, err := newTracesExporter(cfg, set) @@ -87,9 +88,9 @@ func createTraceExporter(ctx context.Context, set component.ExporterCreateSettin func createMetricsExporter( ctx context.Context, - set component.ExporterCreateSettings, + set exp.CreateSettings, cfg component.Config, -) (component.MetricsExporter, error) { +) (exp.Metrics, error) { oce, err := newMetricsExporter(cfg, set) if err != nil { return nil, err @@ -111,9 +112,9 @@ func createMetricsExporter( func createLogsExporter( ctx context.Context, - set component.ExporterCreateSettings, + set exp.CreateSettings, cfg component.Config, -) (component.LogsExporter, error) { +) (exp.Logs, error) { oce, err := newLogsExporter(cfg, set) if err != nil { return nil, err diff --git a/exporter/coralogixexporter/factory_test.go b/exporter/coralogixexporter/factory_test.go index cb84c29d76603..ae3eb7c461bfd 100644 --- a/exporter/coralogixexporter/factory_test.go +++ b/exporter/coralogixexporter/factory_test.go @@ -28,6 +28,7 @@ import ( "go.opentelemetry.io/collector/config/configgrpc" "go.opentelemetry.io/collector/config/configtls" "go.opentelemetry.io/collector/exporter/exporterhelper" + "go.opentelemetry.io/collector/exporter/exportertest" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/common/testutil" ) @@ -49,7 +50,7 @@ func TestCreateMetricsExporter(t *testing.T) { cfg := factory.CreateDefaultConfig().(*Config) cfg.Metrics.Endpoint = testutil.GetAvailableLocalAddress(t) - set := componenttest.NewNopExporterCreateSettings() + set := exportertest.NewNopCreateSettings() oexp, err := factory.CreateMetricsExporter(context.Background(), set, cfg) require.Nil(t, err) require.NotNil(t, oexp) @@ -60,7 +61,7 @@ func TestCreateLogsExporter(t *testing.T) { cfg := factory.CreateDefaultConfig().(*Config) cfg.Logs.Endpoint = testutil.GetAvailableLocalAddress(t) - set := componenttest.NewNopExporterCreateSettings() + set := exportertest.NewNopCreateSettings() oexp, err := factory.CreateLogsExporter(context.Background(), set, cfg) require.Nil(t, err) require.NotNil(t, oexp) @@ -180,7 +181,7 @@ func TestCreateTracesExporter(t *testing.T) { for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { factory := NewFactory() - set := componenttest.NewNopExporterCreateSettings() + set := exportertest.NewNopCreateSettings() consumer, err := factory.CreateTracesExporter(context.Background(), set, &tt.config) if tt.mustFailOnCreate { assert.NotNil(t, err) diff --git a/exporter/coralogixexporter/go.mod b/exporter/coralogixexporter/go.mod index de7bfe4410deb..a258a7bb94eb9 100644 --- a/exporter/coralogixexporter/go.mod +++ b/exporter/coralogixexporter/go.mod @@ -3,13 +3,13 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/exporter/coralo go 1.18 require ( - github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.66.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.67.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector v0.67.0 + go.opentelemetry.io/collector/component v0.67.0 + go.opentelemetry.io/collector/confmap v0.67.0 + go.opentelemetry.io/collector/consumer v0.67.0 + go.opentelemetry.io/collector/pdata v1.0.0-rc1 google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c google.golang.org/grpc v1.51.0 ) @@ -37,7 +37,7 @@ require ( github.com/pelletier/go-toml v1.9.5 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/featuregate v0.67.0 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect diff --git a/exporter/coralogixexporter/go.sum b/exporter/coralogixexporter/go.sum index 830389fa0e50a..e00efcb311fd0 100644 --- a/exporter/coralogixexporter/go.sum +++ b/exporter/coralogixexporter/go.sum @@ -303,18 +303,18 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/component v0.67.0 h1:GCBRZAqk4yNaT4L1uwlbbwophFHrxYccLZ4Uj1Ifs/M= +go.opentelemetry.io/collector/component v0.67.0/go.mod h1:Txa2lm9oe7xsGQN8u7GdUIrRpAHFIKsTO4Qi3/CSmKk= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4 h1:PRXhsszxTt5bbPriTjmaweWUsAnJYeWBhUMLRetUgBU= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4/go.mod h1:05eWWy6ZWzmpeImD3UowLTB3VjDMU1yxQ+ENuVWDM3c= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= diff --git a/exporter/coralogixexporter/logs_client.go b/exporter/coralogixexporter/logs_client.go index 8c15ecdbc1f97..7809e21df7810 100644 --- a/exporter/coralogixexporter/logs_client.go +++ b/exporter/coralogixexporter/logs_client.go @@ -21,13 +21,14 @@ import ( "runtime" "go.opentelemetry.io/collector/component" + exp "go.opentelemetry.io/collector/exporter" "go.opentelemetry.io/collector/pdata/plog" "go.opentelemetry.io/collector/pdata/plog/plogotlp" "google.golang.org/grpc" "google.golang.org/grpc/metadata" ) -func newLogsExporter(cfg component.Config, set component.ExporterCreateSettings) (*logsExporter, error) { +func newLogsExporter(cfg component.Config, set exp.CreateSettings) (*logsExporter, error) { oCfg := cfg.(*Config) if oCfg.Logs.Endpoint == "" || oCfg.Logs.Endpoint == "https://" || oCfg.Logs.Endpoint == "http://" { diff --git a/exporter/coralogixexporter/metrics_client.go b/exporter/coralogixexporter/metrics_client.go index 5ea26da1de66d..ce36f59a0d3af 100644 --- a/exporter/coralogixexporter/metrics_client.go +++ b/exporter/coralogixexporter/metrics_client.go @@ -23,6 +23,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/consumer/consumererror" + exp "go.opentelemetry.io/collector/exporter" "go.opentelemetry.io/collector/exporter/exporterhelper" "go.opentelemetry.io/collector/pdata/pmetric" "go.opentelemetry.io/collector/pdata/pmetric/pmetricotlp" @@ -33,7 +34,7 @@ import ( "google.golang.org/grpc/status" ) -func newMetricsExporter(cfg component.Config, set component.ExporterCreateSettings) (*exporter, error) { +func newMetricsExporter(cfg component.Config, set exp.CreateSettings) (*exporter, error) { oCfg := cfg.(*Config) if oCfg.Metrics.Endpoint == "" || oCfg.Metrics.Endpoint == "https://" || oCfg.Metrics.Endpoint == "http://" { diff --git a/exporter/coralogixexporter/traces_client.go b/exporter/coralogixexporter/traces_client.go index 2ae38680be47c..035d777abb909 100644 --- a/exporter/coralogixexporter/traces_client.go +++ b/exporter/coralogixexporter/traces_client.go @@ -21,6 +21,7 @@ import ( "runtime" "go.opentelemetry.io/collector/component" + exp "go.opentelemetry.io/collector/exporter" "go.opentelemetry.io/collector/pdata/ptrace" "go.opentelemetry.io/collector/pdata/ptrace/ptraceotlp" "google.golang.org/grpc" @@ -41,7 +42,7 @@ type tracesExporter struct { userAgent string } -func newTracesExporter(cfg component.Config, set component.ExporterCreateSettings) (*tracesExporter, error) { +func newTracesExporter(cfg component.Config, set exp.CreateSettings) (*tracesExporter, error) { oCfg, ok := cfg.(*Config) if !ok { return nil, fmt.Errorf("invalid config exporter, expect type: %T, got: %T", &Config{}, cfg) diff --git a/exporter/datadogexporter/examples_test.go b/exporter/datadogexporter/examples_test.go index c580d8612b800..fc11ec4fddd6e 100644 --- a/exporter/datadogexporter/examples_test.go +++ b/exporter/datadogexporter/examples_test.go @@ -22,9 +22,11 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/exporter" + "go.opentelemetry.io/collector/otelcol/otelcoltest" "go.opentelemetry.io/collector/processor/batchprocessor" + "go.opentelemetry.io/collector/receiver" "go.opentelemetry.io/collector/receiver/otlpreceiver" - "go.opentelemetry.io/collector/service/servicetest" "gopkg.in/yaml.v2" "github.com/open-telemetry/opentelemetry-collector-contrib/processor/k8sattributesprocessor" @@ -52,7 +54,7 @@ func TestExamples(t *testing.T) { t.Run(filepath.Base(f.Name()), func(t *testing.T) { t.Setenv("DD_API_KEY", "testvalue") name := filepath.Join(folder, f.Name()) - _, err := servicetest.LoadConfigAndValidate(name, factories) + _, err := otelcoltest.LoadConfigAndValidate(name, factories) require.NoError(t, err, "All yaml config must validate. Please ensure that all necessary component factories are added in newTestComponents()") }) } @@ -81,7 +83,7 @@ func TestExamples(t *testing.T) { require.NoError(t, f.Close()) defer os.RemoveAll(f.Name()) - _, err = servicetest.LoadConfigAndValidate(f.Name(), factories) + _, err = otelcoltest.LoadConfigAndValidate(f.Name(), factories) require.NoError(t, err, "All yaml config must validate. Please ensure that all necessary component factories are added in newTestComponents()") }) } @@ -93,8 +95,8 @@ func newTestComponents(t *testing.T) component.Factories { factories component.Factories err error ) - factories.Receivers, err = component.MakeReceiverFactoryMap( - []component.ReceiverFactory{ + factories.Receivers, err = receiver.MakeFactoryMap( + []receiver.Factory{ otlpreceiver.NewFactory(), hostmetricsreceiver.NewFactory(), filelogreceiver.NewFactory(), @@ -109,8 +111,8 @@ func newTestComponents(t *testing.T) component.Factories { }..., ) require.NoError(t, err) - factories.Exporters, err = component.MakeExporterFactoryMap( - []component.ExporterFactory{ + factories.Exporters, err = exporter.MakeFactoryMap( + []exporter.Factory{ NewFactory(), }..., ) diff --git a/exporter/datadogexporter/factory.go b/exporter/datadogexporter/factory.go index 5d714e7d1ea9d..c50b7da8718e0 100644 --- a/exporter/datadogexporter/factory.go +++ b/exporter/datadogexporter/factory.go @@ -25,6 +25,7 @@ import ( "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confignet" "go.opentelemetry.io/collector/consumer" + "go.opentelemetry.io/collector/exporter" "go.opentelemetry.io/collector/exporter/exporterhelper" "go.opentelemetry.io/collector/featuregate" "go.opentelemetry.io/collector/pdata/pcommon" @@ -58,19 +59,19 @@ func (f *factory) SourceProvider(set component.TelemetrySettings, configHostname return f.sourceProvider, f.providerErr } -func newFactoryWithRegistry(registry *featuregate.Registry) component.ExporterFactory { +func newFactoryWithRegistry(registry *featuregate.Registry) exporter.Factory { f := &factory{registry: registry} - return component.NewExporterFactory( + return exporter.NewFactory( typeStr, f.createDefaultConfig, - component.WithMetricsExporter(f.createMetricsExporter, component.StabilityLevelBeta), - component.WithTracesExporter(f.createTracesExporter, component.StabilityLevelBeta), - component.WithLogsExporter(f.createLogsExporter, component.StabilityLevelAlpha), + exporter.WithMetrics(f.createMetricsExporter, component.StabilityLevelBeta), + exporter.WithTraces(f.createTracesExporter, component.StabilityLevelBeta), + exporter.WithLogs(f.createLogsExporter, component.StabilityLevelAlpha), ) } // NewFactory creates a Datadog exporter factory -func NewFactory() component.ExporterFactory { +func NewFactory() exporter.Factory { return newFactoryWithRegistry(featuregate.GetRegistry()) } @@ -151,9 +152,9 @@ func checkAndCastConfig(c component.Config) *Config { // createMetricsExporter creates a metrics exporter based on this config. func (f *factory) createMetricsExporter( ctx context.Context, - set component.ExporterCreateSettings, + set exporter.CreateSettings, c component.Config, -) (component.MetricsExporter, error) { +) (exporter.Metrics, error) { cfg := checkAndCastConfig(c) hostProvider, err := f.SourceProvider(set.TelemetrySettings, cfg.Hostname) @@ -211,9 +212,9 @@ func (f *factory) createMetricsExporter( // createTracesExporter creates a trace exporter based on this config. func (f *factory) createTracesExporter( ctx context.Context, - set component.ExporterCreateSettings, + set exporter.CreateSettings, c component.Config, -) (component.TracesExporter, error) { +) (exporter.Traces, error) { cfg := checkAndCastConfig(c) var ( @@ -274,9 +275,9 @@ func (f *factory) createTracesExporter( // createLogsExporter creates a logs exporter based on the config. func (f *factory) createLogsExporter( ctx context.Context, - set component.ExporterCreateSettings, + set exporter.CreateSettings, c component.Config, -) (component.LogsExporter, error) { +) (exporter.Logs, error) { cfg := checkAndCastConfig(c) var pusher consumer.ConsumeLogsFunc diff --git a/exporter/datadogexporter/factory_test.go b/exporter/datadogexporter/factory_test.go index 64b3f89d060fa..586e9a42def52 100644 --- a/exporter/datadogexporter/factory_test.go +++ b/exporter/datadogexporter/factory_test.go @@ -28,6 +28,7 @@ import ( "go.opentelemetry.io/collector/config/confignet" "go.opentelemetry.io/collector/confmap/confmaptest" "go.opentelemetry.io/collector/exporter/exporterhelper" + "go.opentelemetry.io/collector/exporter/exportertest" "go.opentelemetry.io/collector/pdata/ptrace" "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/datadogexporter/internal/metadata" @@ -385,7 +386,7 @@ func TestCreateAPIMetricsExporter(t *testing.T) { ctx := context.Background() exp, err := factory.CreateMetricsExporter( ctx, - componenttest.NewNopExporterCreateSettings(), + exportertest.NewNopCreateSettings(), cfg, ) @@ -417,7 +418,7 @@ func TestCreateAPIExporterFailOnInvalidKey(t *testing.T) { // metrics exporter mexp, err := factory.CreateMetricsExporter( ctx, - componenttest.NewNopExporterCreateSettings(), + exportertest.NewNopCreateSettings(), cfg, ) assert.EqualError(t, err, "API Key validation failed") @@ -425,7 +426,7 @@ func TestCreateAPIExporterFailOnInvalidKey(t *testing.T) { texp, err := factory.CreateTracesExporter( ctx, - componenttest.NewNopExporterCreateSettings(), + exportertest.NewNopCreateSettings(), cfg, ) assert.EqualError(t, err, "API Key validation failed") @@ -433,7 +434,7 @@ func TestCreateAPIExporterFailOnInvalidKey(t *testing.T) { lexp, err := factory.CreateLogsExporter( ctx, - componenttest.NewNopExporterCreateSettings(), + exportertest.NewNopCreateSettings(), cfg, ) assert.EqualError(t, err, "API Key validation failed") @@ -444,7 +445,7 @@ func TestCreateAPIExporterFailOnInvalidKey(t *testing.T) { ctx := context.Background() exp, err := factory.CreateMetricsExporter( ctx, - componenttest.NewNopExporterCreateSettings(), + exportertest.NewNopCreateSettings(), cfg, ) assert.Nil(t, err) @@ -452,7 +453,7 @@ func TestCreateAPIExporterFailOnInvalidKey(t *testing.T) { texp, err := factory.CreateTracesExporter( ctx, - componenttest.NewNopExporterCreateSettings(), + exportertest.NewNopCreateSettings(), cfg, ) assert.Nil(t, err) @@ -460,7 +461,7 @@ func TestCreateAPIExporterFailOnInvalidKey(t *testing.T) { lexp, err := factory.CreateLogsExporter( ctx, - componenttest.NewNopExporterCreateSettings(), + exportertest.NewNopCreateSettings(), cfg, ) assert.Nil(t, err) @@ -488,7 +489,7 @@ func TestCreateAPILogsExporter(t *testing.T) { ctx := context.Background() exp, err := factory.CreateLogsExporter( ctx, - componenttest.NewNopExporterCreateSettings(), + exportertest.NewNopCreateSettings(), cfg, ) @@ -526,7 +527,7 @@ func TestOnlyMetadata(t *testing.T) { expTraces, err := factory.CreateTracesExporter( ctx, - componenttest.NewNopExporterCreateSettings(), + exportertest.NewNopCreateSettings(), cfg, ) assert.NoError(t, err) @@ -534,7 +535,7 @@ func TestOnlyMetadata(t *testing.T) { expMetrics, err := factory.CreateMetricsExporter( ctx, - componenttest.NewNopExporterCreateSettings(), + exportertest.NewNopCreateSettings(), cfg, ) assert.NoError(t, err) diff --git a/exporter/datadogexporter/go.mod b/exporter/datadogexporter/go.mod index c049586de2ad9..b9f3fefbb91a7 100644 --- a/exporter/datadogexporter/go.mod +++ b/exporter/datadogexporter/go.mod @@ -12,26 +12,26 @@ require ( github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v0.34.3-0.20221202192616-0186b89ba914 github.com/aws/aws-sdk-go v1.44.155 github.com/cenkalti/backoff/v4 v4.2.0 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/ecsutil v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/metadataproviders v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/processor/k8sattributesprocessor v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/filelogreceiver v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver v0.66.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/ecsutil v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/metadataproviders v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/processor/k8sattributesprocessor v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/filelogreceiver v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver v0.67.0 github.com/patrickmn/go-cache v2.1.0+incompatible github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/receiver/otlpreceiver v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector v0.67.0 + go.opentelemetry.io/collector/component v0.67.0 + go.opentelemetry.io/collector/confmap v0.67.0 + go.opentelemetry.io/collector/consumer v0.67.0 + go.opentelemetry.io/collector/featuregate v0.67.0 + go.opentelemetry.io/collector/pdata v1.0.0-rc1 + go.opentelemetry.io/collector/processor/batchprocessor v0.67.0 + go.opentelemetry.io/collector/receiver/otlpreceiver v0.67.0 + go.opentelemetry.io/collector/semconv v0.67.0 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.24.0 gopkg.in/yaml.v2 v2.4.0 @@ -126,9 +126,9 @@ require ( github.com/mostynb/go-grpc-compression v1.1.17 // indirect github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect github.com/observiq/ctimefmt v1.0.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/internal/filter v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.66.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/internal/filter v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.67.0 // indirect github.com/opencontainers/go-digest v1.0.0 // indirect github.com/opencontainers/image-spec v1.0.2 // indirect github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417 // indirect diff --git a/exporter/datadogexporter/go.sum b/exporter/datadogexporter/go.sum index 6900657ff76cf..1f41cb4ba2696 100644 --- a/exporter/datadogexporter/go.sum +++ b/exporter/datadogexporter/go.sum @@ -707,25 +707,25 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/extension/zpagesextension v0.66.0 h1:tPqSKH5K3VhTT0XXVoWL3woWBSTJqnXZQRt0ZLSCoCc= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221202005155-1c54042beb70 h1:Y4e8NnVevonnAgmjX9Z7QIMA32yMqHAOnAlh8SzTS8c= -go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:Pi1CsKDQFoDrUP1i3+VdE6s2Xuji7bOGFBgqHK0J32E= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.66.1-0.20221202005155-1c54042beb70 h1:KBbbPVDV7o5w857g6ePphdu4MV87jrcQevFYDA1okUk= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:0Py8RNjNiFRH6/F+vM2uptdaw9hMj1FBdv0ySntM2gE= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 h1:Q5L9Urod3c8as6ZYaoaqBjarx/HXxsxy34DFZIU2fO4= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/component v0.67.0 h1:GCBRZAqk4yNaT4L1uwlbbwophFHrxYccLZ4Uj1Ifs/M= +go.opentelemetry.io/collector/component v0.67.0/go.mod h1:Txa2lm9oe7xsGQN8u7GdUIrRpAHFIKsTO4Qi3/CSmKk= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/extension/zpagesextension v0.67.0 h1:TRW8vZwE+/h2vJqqMDmyQO9X0sxcYCSXf5MyXozSLas= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= +go.opentelemetry.io/collector/processor/batchprocessor v0.67.0 h1:Qn4Ytth3q1trwTSAYYTzIRs4SBh9rz0xBou1nZB+Dko= +go.opentelemetry.io/collector/processor/batchprocessor v0.67.0/go.mod h1:+ZXCkUG9tlwbbVLi+PT9DjQ7vz+lfFSQqvW45snLYno= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.67.0 h1:pMluLYSSAH7n8zkPWYkWGY/pALrVxG9rHX8J/WDrcx0= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.67.0/go.mod h1:GIJc0eu4N2oJB420N3NhSFJ1IhAgCwvlTCMGWxKhXgg= +go.opentelemetry.io/collector/semconv v0.67.0 h1:zLAvcQa6Kgow52FFLrmk7/9ZVtEYyA73+xDtCcFG78Q= +go.opentelemetry.io/collector/semconv v0.67.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4 h1:PRXhsszxTt5bbPriTjmaweWUsAnJYeWBhUMLRetUgBU= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4/go.mod h1:05eWWy6ZWzmpeImD3UowLTB3VjDMU1yxQ+ENuVWDM3c= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 h1:aUEBEdCa6iamGzg6fuYxDA8ThxvOG240mAvWDU+XLio= diff --git a/exporter/datadogexporter/internal/metadata/metadata.go b/exporter/datadogexporter/internal/metadata/metadata.go index 68c04a6d8cb4e..c242a36403961 100644 --- a/exporter/datadogexporter/internal/metadata/metadata.go +++ b/exporter/datadogexporter/internal/metadata/metadata.go @@ -29,7 +29,7 @@ import ( ec2Attributes "github.com/DataDog/datadog-agent/pkg/otlp/model/attributes/ec2" "github.com/DataDog/datadog-agent/pkg/otlp/model/attributes/gcp" "github.com/DataDog/datadog-agent/pkg/otlp/model/source" - "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/exporter" "go.opentelemetry.io/collector/featuregate" "go.opentelemetry.io/collector/pdata/pcommon" conventions "go.opentelemetry.io/collector/semconv/v1.6.1" @@ -140,7 +140,7 @@ func metadataFromAttributesWithRegistry(registry *featuregate.Registry, attrs pc return hm } -func fillHostMetadata(params component.ExporterCreateSettings, pcfg PusherConfig, p source.Provider, hm *HostMetadata) { +func fillHostMetadata(params exporter.CreateSettings, pcfg PusherConfig, p source.Provider, hm *HostMetadata) { // Could not get hostname from attributes if hm.InternalHostname == "" { if src, err := p.Source(context.TODO()); err == nil && src.Kind == source.HostnameKind { @@ -171,7 +171,7 @@ func fillHostMetadata(params component.ExporterCreateSettings, pcfg PusherConfig } } -func pushMetadata(pcfg PusherConfig, params component.ExporterCreateSettings, metadata *HostMetadata) error { +func pushMetadata(pcfg PusherConfig, params exporter.CreateSettings, metadata *HostMetadata) error { if metadata.Meta.Hostname == "" { // if the hostname is empty, don't send metadata; we don't need it. params.Logger.Debug("Skipping host metadata since the hostname is empty") @@ -203,7 +203,7 @@ func pushMetadata(pcfg PusherConfig, params component.ExporterCreateSettings, me return nil } -func pushMetadataWithRetry(retrier *clientutil.Retrier, params component.ExporterCreateSettings, pcfg PusherConfig, hostMetadata *HostMetadata) { +func pushMetadataWithRetry(retrier *clientutil.Retrier, params exporter.CreateSettings, pcfg PusherConfig, hostMetadata *HostMetadata) { params.Logger.Debug("Sending host metadata payload", zap.Any("payload", hostMetadata)) err := retrier.DoWithRetries(context.Background(), func(context.Context) error { @@ -219,7 +219,7 @@ func pushMetadataWithRetry(retrier *clientutil.Retrier, params component.Exporte } // Pusher pushes host metadata payloads periodically to Datadog intake -func Pusher(ctx context.Context, params component.ExporterCreateSettings, pcfg PusherConfig, p source.Provider, attrs pcommon.Map) { +func Pusher(ctx context.Context, params exporter.CreateSettings, pcfg PusherConfig, p source.Provider, attrs pcommon.Map) { // Push metadata every 30 minutes ticker := time.NewTicker(30 * time.Minute) defer ticker.Stop() diff --git a/exporter/datadogexporter/internal/metadata/metadata_test.go b/exporter/datadogexporter/internal/metadata/metadata_test.go index b7de464502110..fa77b43416e2f 100644 --- a/exporter/datadogexporter/internal/metadata/metadata_test.go +++ b/exporter/datadogexporter/internal/metadata/metadata_test.go @@ -29,6 +29,8 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" + "go.opentelemetry.io/collector/exporter" + "go.opentelemetry.io/collector/exporter/exportertest" "go.opentelemetry.io/collector/featuregate" "go.opentelemetry.io/collector/pdata/pcommon" conventions "go.opentelemetry.io/collector/semconv/v1.6.1" @@ -56,7 +58,7 @@ var ( Version: "1.0", } - mockExporterCreateSettings = component.ExporterCreateSettings{ + mockExporterCreateSettings = exporter.CreateSettings{ TelemetrySettings: componenttest.NewNopTelemetrySettings(), BuildInfo: mockBuildInfo, } @@ -64,7 +66,7 @@ var ( func TestFillHostMetadata(t *testing.T) { hostnameCache.Flush() - params := componenttest.NewNopExporterCreateSettings() + params := exportertest.NewNopCreateSettings() params.BuildInfo = mockBuildInfo pcfg := PusherConfig{ @@ -300,7 +302,7 @@ func TestPusher(t *testing.T) { APIKey: "apikey", UseResourceMetadata: true, } - params := componenttest.NewNopExporterCreateSettings() + params := exportertest.NewNopCreateSettings() params.BuildInfo = mockBuildInfo hostProvider, err := GetSourceProvider(componenttest.NewNopTelemetrySettings(), "") diff --git a/exporter/datadogexporter/logs_exporter.go b/exporter/datadogexporter/logs_exporter.go index 4756dad136b4d..bc8000ed6817d 100644 --- a/exporter/datadogexporter/logs_exporter.go +++ b/exporter/datadogexporter/logs_exporter.go @@ -20,8 +20,8 @@ import ( "github.com/DataDog/datadog-agent/pkg/otlp/model/source" "github.com/DataDog/datadog-api-client-go/v2/api/datadogV2" - "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/consumer" + "go.opentelemetry.io/collector/exporter" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/plog" @@ -32,7 +32,7 @@ import ( ) type logsExporter struct { - params component.ExporterCreateSettings + params exporter.CreateSettings cfg *Config ctx context.Context // ctx triggers shutdown upon cancellation scrubber scrub.Scrubber // scrubber scrubs sensitive information from error messages @@ -42,7 +42,7 @@ type logsExporter struct { } // newLogsExporter creates a new instance of logsExporter -func newLogsExporter(ctx context.Context, params component.ExporterCreateSettings, cfg *Config, onceMetadata *sync.Once, sourceProvider source.Provider) (*logsExporter, error) { +func newLogsExporter(ctx context.Context, params exporter.CreateSettings, cfg *Config, onceMetadata *sync.Once, sourceProvider source.Provider) (*logsExporter, error) { // create Datadog client // validation endpoint is provided by Metrics client := clientutil.CreateZorkianClient(cfg.API.Key, cfg.Metrics.TCPAddr.Endpoint) diff --git a/exporter/datadogexporter/logs_exporter_test.go b/exporter/datadogexporter/logs_exporter_test.go index 6fd91c21b8405..36c20d458af90 100644 --- a/exporter/datadogexporter/logs_exporter_test.go +++ b/exporter/datadogexporter/logs_exporter_test.go @@ -23,8 +23,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config/confignet" + "go.opentelemetry.io/collector/exporter/exportertest" "go.opentelemetry.io/collector/pdata/plog" "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/datadogexporter/internal/testutil" @@ -115,7 +115,7 @@ func TestLogsExporter(t *testing.T) { }, } - params := componenttest.NewNopExporterCreateSettings() + params := exportertest.NewNopCreateSettings() f := NewFactory() ctx := context.Background() exp, err := f.CreateLogsExporter(ctx, params, cfg) diff --git a/exporter/datadogexporter/metrics_exporter.go b/exporter/datadogexporter/metrics_exporter.go index 52c0bee1d61f2..9ddbeecb475c8 100644 --- a/exporter/datadogexporter/metrics_exporter.go +++ b/exporter/datadogexporter/metrics_exporter.go @@ -24,7 +24,7 @@ import ( "github.com/DataDog/datadog-agent/pkg/otlp/model/source" "github.com/DataDog/datadog-agent/pkg/otlp/model/translator" - "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/exporter" "go.opentelemetry.io/collector/featuregate" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" @@ -40,7 +40,7 @@ import ( ) type metricsExporter struct { - params component.ExporterCreateSettings + params exporter.CreateSettings cfg *Config ctx context.Context client *zorkian.Client @@ -96,7 +96,7 @@ func translatorFromConfig(logger *zap.Logger, cfg *Config, sourceProvider source return translator.New(logger, options...) } -func newMetricsExporter(ctx context.Context, params component.ExporterCreateSettings, cfg *Config, onceMetadata *sync.Once, sourceProvider source.Provider) (*metricsExporter, error) { +func newMetricsExporter(ctx context.Context, params exporter.CreateSettings, cfg *Config, onceMetadata *sync.Once, sourceProvider source.Provider) (*metricsExporter, error) { client := clientutil.CreateZorkianClient(cfg.API.Key, cfg.Metrics.TCPAddr.Endpoint) client.ExtraHeader["User-Agent"] = clientutil.UserAgent(params.BuildInfo) client.HttpClient = clientutil.NewHTTPClient(cfg.TimeoutSettings, cfg.LimitedHTTPClientSettings.TLSSetting.InsecureSkipVerify) diff --git a/exporter/datadogexporter/metrics_exporter_test.go b/exporter/datadogexporter/metrics_exporter_test.go index 08a1f50dc280d..d74b80da1607b 100644 --- a/exporter/datadogexporter/metrics_exporter_test.go +++ b/exporter/datadogexporter/metrics_exporter_test.go @@ -27,8 +27,8 @@ import ( "github.com/DataDog/datadog-agent/pkg/otlp/model/source" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config/confignet" + "go.opentelemetry.io/collector/exporter/exportertest" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" conventions "go.opentelemetry.io/collector/semconv/v1.6.1" @@ -59,7 +59,7 @@ func TestNewExporter(t *testing.T) { }, }, } - params := componenttest.NewNopExporterCreateSettings() + params := exportertest.NewNopCreateSettings() f := NewFactory() // The client should have been created correctly @@ -300,7 +300,7 @@ func Test_metricsExporter_PushMetricsData(t *testing.T) { var once sync.Once exp, err := newMetricsExporter( context.Background(), - componenttest.NewNopExporterCreateSettings(), + exportertest.NewNopCreateSettings(), newTestConfig(t, server.URL, tt.hostTags, tt.histogramMode), &once, &testutil.MockSourceProvider{Src: tt.source}, diff --git a/exporter/datadogexporter/traces_exporter.go b/exporter/datadogexporter/traces_exporter.go index c11f6da8c6317..aa0e2d871ee71 100644 --- a/exporter/datadogexporter/traces_exporter.go +++ b/exporter/datadogexporter/traces_exporter.go @@ -25,8 +25,8 @@ import ( "github.com/DataDog/datadog-agent/pkg/trace/agent" traceconfig "github.com/DataDog/datadog-agent/pkg/trace/config" tracelog "github.com/DataDog/datadog-agent/pkg/trace/log" - "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/consumer" + "go.opentelemetry.io/collector/exporter" "go.opentelemetry.io/collector/featuregate" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/ptrace" @@ -40,7 +40,7 @@ import ( ) type traceExporter struct { - params component.ExporterCreateSettings + params exporter.CreateSettings cfg *Config ctx context.Context // ctx triggers shutdown upon cancellation client *zorkian.Client // client sends runnimg metrics to backend & performs API validation @@ -51,7 +51,7 @@ type traceExporter struct { sourceProvider source.Provider // is able to source the origin of a trace (hostname, container, etc) } -func newTracesExporter(ctx context.Context, params component.ExporterCreateSettings, cfg *Config, onceMetadata *sync.Once, sourceProvider source.Provider) (*traceExporter, error) { +func newTracesExporter(ctx context.Context, params exporter.CreateSettings, cfg *Config, onceMetadata *sync.Once, sourceProvider source.Provider) (*traceExporter, error) { // client to send running metric to the backend & perform API key validation client := clientutil.CreateZorkianClient(cfg.API.Key, cfg.Metrics.TCPAddr.Endpoint) if err := clientutil.ValidateAPIKeyZorkian(params.Logger, client); err != nil && cfg.API.FailOnInvalidKey { diff --git a/exporter/datadogexporter/traces_exporter_test.go b/exporter/datadogexporter/traces_exporter_test.go index 45bed18d8bc08..4b7f8507785fc 100644 --- a/exporter/datadogexporter/traces_exporter_test.go +++ b/exporter/datadogexporter/traces_exporter_test.go @@ -30,9 +30,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confignet" + "go.opentelemetry.io/collector/exporter/exportertest" "go.opentelemetry.io/collector/featuregate" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/ptrace" @@ -149,7 +149,7 @@ func TestTracesSource(t *testing.T) { } assert := assert.New(t) - params := componenttest.NewNopExporterCreateSettings() + params := exportertest.NewNopCreateSettings() reg := featuregate.NewRegistry() reg.MustRegisterID(metadata.HostnamePreviewFeatureGate, featuregate.StageBeta) assert.NoError(reg.Apply(map[string]bool{ @@ -255,7 +255,7 @@ func TestTraceExporter(t *testing.T) { }, } - params := componenttest.NewNopExporterCreateSettings() + params := exportertest.NewNopCreateSettings() f := NewFactory() exporter, err := f.CreateTracesExporter(context.Background(), params, &cfg) assert.NoError(t, err) @@ -280,7 +280,7 @@ func TestNewTracesExporter(t *testing.T) { cfg := &Config{} cfg.API.Key = "ddog_32_characters_long_api_key1" cfg.Metrics.TCPAddr.Endpoint = metricsServer.URL - params := componenttest.NewNopExporterCreateSettings() + params := exportertest.NewNopCreateSettings() // The client should have been created correctly f := NewFactory() @@ -312,7 +312,7 @@ func TestPushTraceData(t *testing.T) { }, } - params := componenttest.NewNopExporterCreateSettings() + params := exportertest.NewNopCreateSettings() f := NewFactory() exp, err := f.CreateTracesExporter(context.Background(), params, cfg) assert.NoError(t, err) diff --git a/exporter/dynatraceexporter/factory.go b/exporter/dynatraceexporter/factory.go index cb30e0ddd1858..0f4d50b562cc5 100644 --- a/exporter/dynatraceexporter/factory.go +++ b/exporter/dynatraceexporter/factory.go @@ -20,6 +20,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confighttp" + exp "go.opentelemetry.io/collector/exporter" "go.opentelemetry.io/collector/exporter/exporterhelper" dtconfig "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/dynatraceexporter/config" @@ -34,11 +35,11 @@ const ( ) // NewFactory creates a Dynatrace exporter factory -func NewFactory() component.ExporterFactory { - return component.NewExporterFactory( +func NewFactory() exp.Factory { + return exp.NewFactory( typeStr, createDefaultConfig, - component.WithMetricsExporter(createMetricsExporter, stability), + exp.WithMetrics(createMetricsExporter, stability), ) } @@ -63,9 +64,9 @@ func createDefaultConfig() component.Config { // createMetricsExporter creates a metrics exporter based on this func createMetricsExporter( ctx context.Context, - set component.ExporterCreateSettings, + set exp.CreateSettings, c component.Config, -) (component.MetricsExporter, error) { +) (exp.Metrics, error) { cfg := c.(*dtconfig.Config) diff --git a/exporter/dynatraceexporter/go.mod b/exporter/dynatraceexporter/go.mod index 40d4d6f510090..087b133fe0580 100644 --- a/exporter/dynatraceexporter/go.mod +++ b/exporter/dynatraceexporter/go.mod @@ -4,14 +4,14 @@ go 1.18 require ( github.com/dynatrace-oss/dynatrace-metric-utils-go v0.5.0 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.66.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.67.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector v0.67.0 + go.opentelemetry.io/collector/component v0.67.0 + go.opentelemetry.io/collector/confmap v0.67.0 + go.opentelemetry.io/collector/consumer v0.67.0 + go.opentelemetry.io/collector/pdata v1.0.0-rc1 go.uber.org/zap v1.24.0 ) @@ -35,7 +35,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rs/cors v1.8.2 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/featuregate v0.67.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect diff --git a/exporter/dynatraceexporter/go.sum b/exporter/dynatraceexporter/go.sum index 8065db1996d65..cc516a6224e42 100644 --- a/exporter/dynatraceexporter/go.sum +++ b/exporter/dynatraceexporter/go.sum @@ -284,18 +284,18 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/component v0.67.0 h1:GCBRZAqk4yNaT4L1uwlbbwophFHrxYccLZ4Uj1Ifs/M= +go.opentelemetry.io/collector/component v0.67.0/go.mod h1:Txa2lm9oe7xsGQN8u7GdUIrRpAHFIKsTO4Qi3/CSmKk= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 h1:aUEBEdCa6iamGzg6fuYxDA8ThxvOG240mAvWDU+XLio= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4/go.mod h1:l2MdsbKTocpPS5nQZscqTR9jd8u96VYZdcpF8Sye7mA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= diff --git a/exporter/dynatraceexporter/metrics_exporter.go b/exporter/dynatraceexporter/metrics_exporter.go index f722073b64818..ae48c133e3893 100644 --- a/exporter/dynatraceexporter/metrics_exporter.go +++ b/exporter/dynatraceexporter/metrics_exporter.go @@ -28,6 +28,7 @@ import ( "github.com/dynatrace-oss/dynatrace-metric-utils-go/metric/dimensions" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/consumer/consumererror" + exp "go.opentelemetry.io/collector/exporter" "go.opentelemetry.io/collector/pdata/pmetric" "go.uber.org/zap" @@ -42,7 +43,7 @@ const ( ) // NewExporter exports to a Dynatrace Metrics v2 API -func newMetricsExporter(params component.ExporterCreateSettings, cfg *config.Config) *exporter { +func newMetricsExporter(params exp.CreateSettings, cfg *config.Config) *exporter { var confDefaultDims []dimensions.Dimension for key, value := range cfg.DefaultDimensions { confDefaultDims = append(confDefaultDims, dimensions.NewDimension(key, value)) diff --git a/exporter/dynatraceexporter/metrics_exporter_test.go b/exporter/dynatraceexporter/metrics_exporter_test.go index ea836e84f7303..d6ef8af16f377 100644 --- a/exporter/dynatraceexporter/metrics_exporter_test.go +++ b/exporter/dynatraceexporter/metrics_exporter_test.go @@ -32,6 +32,7 @@ import ( "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/config/configtls" "go.opentelemetry.io/collector/consumer/consumererror" + "go.opentelemetry.io/collector/exporter/exportertest" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" "go.uber.org/zap" @@ -660,7 +661,7 @@ func Test_exporter_start_InvalidHTTPClientSettings(t *testing.T) { }, } - exp := newMetricsExporter(componenttest.NewNopExporterCreateSettings(), cfg) + exp := newMetricsExporter(exportertest.NewNopCreateSettings(), cfg) err := exp.start(context.Background(), componenttest.NewNopHost()) if err == nil { @@ -674,7 +675,7 @@ func Test_exporter_new_with_tags(t *testing.T) { DefaultDimensions: map[string]string{"test_tag": "value"}, } - exp := newMetricsExporter(componenttest.NewNopExporterCreateSettings(), cfg) + exp := newMetricsExporter(exportertest.NewNopCreateSettings(), cfg) assert.Equal(t, dimensions.NewNormalizedDimensionList(dimensions.NewDimension("test_tag", "value")), exp.defaultDimensions) } @@ -684,7 +685,7 @@ func Test_exporter_new_with_default_dimensions(t *testing.T) { DefaultDimensions: map[string]string{"test_dimension": "value"}, } - exp := newMetricsExporter(componenttest.NewNopExporterCreateSettings(), cfg) + exp := newMetricsExporter(exportertest.NewNopCreateSettings(), cfg) assert.Equal(t, dimensions.NewNormalizedDimensionList(dimensions.NewDimension("test_dimension", "value")), exp.defaultDimensions) } @@ -695,7 +696,7 @@ func Test_exporter_new_with_default_dimensions_override_tag(t *testing.T) { DefaultDimensions: map[string]string{"from": "default_dimensions"}, } - exp := newMetricsExporter(componenttest.NewNopExporterCreateSettings(), cfg) + exp := newMetricsExporter(exportertest.NewNopCreateSettings(), cfg) assert.Equal(t, dimensions.NewNormalizedDimensionList(dimensions.NewDimension("from", "default_dimensions")), exp.defaultDimensions) } @@ -723,7 +724,7 @@ func Test_LineTooLong(t *testing.T) { intGaugeDataPoint := intGaugeDataPoints.AppendEmpty() intGaugeDataPoint.SetIntValue(10) intGaugeDataPoint.SetTimestamp(testTimestamp) - exp := newMetricsExporter(componenttest.NewNopExporterCreateSettings(), &config.Config{DefaultDimensions: dims}) + exp := newMetricsExporter(exportertest.NewNopCreateSettings(), &config.Config{DefaultDimensions: dims}) assert.Empty(t, exp.serializeMetrics(md)) } diff --git a/exporter/elasticsearchexporter/factory.go b/exporter/elasticsearchexporter/factory.go index 2823744659849..89185be83b6e3 100644 --- a/exporter/elasticsearchexporter/factory.go +++ b/exporter/elasticsearchexporter/factory.go @@ -21,6 +21,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" + "go.opentelemetry.io/collector/exporter" "go.opentelemetry.io/collector/exporter/exporterhelper" ) @@ -34,12 +35,12 @@ const ( ) // NewFactory creates a factory for Elastic exporter. -func NewFactory() component.ExporterFactory { - return component.NewExporterFactory( +func NewFactory() exporter.Factory { + return exporter.NewFactory( typeStr, createDefaultConfig, - component.WithLogsExporter(createLogsExporter, stability), - component.WithTracesExporter(createTracesExporter, stability), + exporter.WithLogs(createLogsExporter, stability), + exporter.WithTraces(createTracesExporter, stability), ) } @@ -71,9 +72,9 @@ func createDefaultConfig() component.Config { // Logs are directly indexed into Elasticsearch. func createLogsExporter( ctx context.Context, - set component.ExporterCreateSettings, + set exporter.CreateSettings, cfg component.Config, -) (component.LogsExporter, error) { +) (exporter.Logs, error) { if cfg.(*Config).Index != "" { set.Logger.Warn("index option are deprecated and replaced with logs_index and traces_index.") } @@ -93,8 +94,8 @@ func createLogsExporter( } func createTracesExporter(ctx context.Context, - set component.ExporterCreateSettings, - cfg component.Config) (component.TracesExporter, error) { + set exporter.CreateSettings, + cfg component.Config) (exporter.Traces, error) { exporter, err := newTracesExporter(set.Logger, cfg.(*Config)) if err != nil { diff --git a/exporter/elasticsearchexporter/factory_test.go b/exporter/elasticsearchexporter/factory_test.go index 9bd40e290cccc..d7068b65439d8 100644 --- a/exporter/elasticsearchexporter/factory_test.go +++ b/exporter/elasticsearchexporter/factory_test.go @@ -21,6 +21,7 @@ import ( "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) { @@ -35,7 +36,7 @@ func TestFactory_CreateLogsExporter(t *testing.T) { cfg := withDefaultConfig(func(cfg *Config) { cfg.Endpoints = []string{"test:9200"} }) - params := componenttest.NewNopExporterCreateSettings() + params := exportertest.NewNopCreateSettings() exporter, err := factory.CreateLogsExporter(context.Background(), params, cfg) require.NoError(t, err) require.NotNil(t, exporter) @@ -46,7 +47,7 @@ func TestFactory_CreateLogsExporter(t *testing.T) { func TestFactory_CreateMetricsExporter_Fail(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() - params := componenttest.NewNopExporterCreateSettings() + params := exportertest.NewNopCreateSettings() _, err := factory.CreateMetricsExporter(context.Background(), params, cfg) require.Error(t, err, "expected an error when creating a traces exporter") } @@ -54,7 +55,7 @@ func TestFactory_CreateMetricsExporter_Fail(t *testing.T) { func TestFactory_CreateTracesExporter_Fail(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() - params := componenttest.NewNopExporterCreateSettings() + params := exportertest.NewNopCreateSettings() _, err := factory.CreateTracesExporter(context.Background(), params, cfg) require.Error(t, err, "expected an error when creating a traces exporter") } @@ -65,7 +66,7 @@ func TestFactory_CreateLogsAndTracesExporterWithDeprecatedIndexOption(t *testing cfg.Endpoints = []string{"test:9200"} cfg.Index = "test_index" }) - params := componenttest.NewNopExporterCreateSettings() + params := exportertest.NewNopCreateSettings() logsExporter, err := factory.CreateLogsExporter(context.Background(), params, cfg) require.NoError(t, err) require.NotNil(t, logsExporter) diff --git a/exporter/elasticsearchexporter/go.mod b/exporter/elasticsearchexporter/go.mod index b927179132531..73070a915cf8b 100644 --- a/exporter/elasticsearchexporter/go.mod +++ b/exporter/elasticsearchexporter/go.mod @@ -6,13 +6,13 @@ require ( github.com/cenkalti/backoff/v4 v4.2.0 github.com/elastic/go-elasticsearch/v8 v8.5.0 github.com/elastic/go-structform v0.0.10 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.66.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.67.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector v0.67.0 + go.opentelemetry.io/collector/component v0.67.0 + go.opentelemetry.io/collector/confmap v0.67.0 + go.opentelemetry.io/collector/pdata v1.0.0-rc1 go.uber.org/atomic v1.10.0 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.24.0 @@ -34,8 +34,8 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rogpeppe/go-internal v1.8.1 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/consumer v0.67.0 // indirect + go.opentelemetry.io/collector/featuregate v0.67.0 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/exporter/elasticsearchexporter/go.sum b/exporter/elasticsearchexporter/go.sum index ac0ab8eb2f28d..4149f9c811973 100644 --- a/exporter/elasticsearchexporter/go.sum +++ b/exporter/elasticsearchexporter/go.sum @@ -282,18 +282,18 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/component v0.67.0 h1:GCBRZAqk4yNaT4L1uwlbbwophFHrxYccLZ4Uj1Ifs/M= +go.opentelemetry.io/collector/component v0.67.0/go.mod h1:Txa2lm9oe7xsGQN8u7GdUIrRpAHFIKsTO4Qi3/CSmKk= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/exporter/f5cloudexporter/factory.go b/exporter/f5cloudexporter/factory.go index 9b92e66008992..bcdaa2e67e758 100644 --- a/exporter/f5cloudexporter/factory.go +++ b/exporter/f5cloudexporter/factory.go @@ -21,6 +21,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" + "go.opentelemetry.io/collector/exporter" otlphttp "go.opentelemetry.io/collector/exporter/otlphttpexporter" "golang.org/x/oauth2" "google.golang.org/api/idtoken" @@ -31,17 +32,17 @@ const typeStr = "f5cloud" // The value of "type" key in configuration. type TokenSourceGetter func(config *Config) (oauth2.TokenSource, error) type f5cloudFactory struct { - component.ExporterFactory + exporter.Factory getTokenSource TokenSourceGetter } // NewFactory returns a factory of the F5 Cloud exporter that can be registered to the Collector. -func NewFactory() component.ExporterFactory { +func NewFactory() exporter.Factory { return NewFactoryWithTokenSourceGetter(getTokenSourceFromConfig) } -func NewFactoryWithTokenSourceGetter(tsg TokenSourceGetter) component.ExporterFactory { - return &f5cloudFactory{ExporterFactory: otlphttp.NewFactory(), getTokenSource: tsg} +func NewFactoryWithTokenSourceGetter(tsg TokenSourceGetter) exporter.Factory { + return &f5cloudFactory{Factory: otlphttp.NewFactory(), getTokenSource: tsg} } func (f *f5cloudFactory) Type() component.Type { @@ -50,8 +51,8 @@ func (f *f5cloudFactory) Type() component.Type { func (f *f5cloudFactory) CreateMetricsExporter( ctx context.Context, - params component.ExporterCreateSettings, - config component.Config) (component.MetricsExporter, error) { + params exporter.CreateSettings, + config component.Config) (exporter.Metrics, error) { cfg := config.(*Config) @@ -61,13 +62,13 @@ func (f *f5cloudFactory) CreateMetricsExporter( fillUserAgent(cfg, params.BuildInfo.Version) - return f.ExporterFactory.CreateMetricsExporter(ctx, params, &cfg.Config) + return f.Factory.CreateMetricsExporter(ctx, params, &cfg.Config) } func (f *f5cloudFactory) CreateTracesExporter( ctx context.Context, - params component.ExporterCreateSettings, - config component.Config) (component.TracesExporter, error) { + params exporter.CreateSettings, + config component.Config) (exporter.Traces, error) { cfg := config.(*Config) @@ -77,13 +78,13 @@ func (f *f5cloudFactory) CreateTracesExporter( fillUserAgent(cfg, params.BuildInfo.Version) - return f.ExporterFactory.CreateTracesExporter(ctx, params, &cfg.Config) + return f.Factory.CreateTracesExporter(ctx, params, &cfg.Config) } func (f *f5cloudFactory) CreateLogsExporter( ctx context.Context, - params component.ExporterCreateSettings, - config component.Config) (component.LogsExporter, error) { + params exporter.CreateSettings, + config component.Config) (exporter.Logs, error) { cfg := config.(*Config) @@ -93,12 +94,12 @@ func (f *f5cloudFactory) CreateLogsExporter( fillUserAgent(cfg, params.BuildInfo.Version) - return f.ExporterFactory.CreateLogsExporter(ctx, params, &cfg.Config) + return f.Factory.CreateLogsExporter(ctx, params, &cfg.Config) } func (f *f5cloudFactory) CreateDefaultConfig() component.Config { cfg := &Config{ - Config: *f.ExporterFactory.CreateDefaultConfig().(*otlphttp.Config), + Config: *f.Factory.CreateDefaultConfig().(*otlphttp.Config), AuthConfig: AuthConfig{ CredentialFile: "", Audience: "", diff --git a/exporter/f5cloudexporter/factory_test.go b/exporter/f5cloudexporter/factory_test.go index d7f8309056c69..5c1fd33cedccb 100644 --- a/exporter/f5cloudexporter/factory_test.go +++ b/exporter/f5cloudexporter/factory_test.go @@ -23,6 +23,7 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" + "go.opentelemetry.io/collector/exporter/exportertest" "golang.org/x/oauth2" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/common/testutil" @@ -59,7 +60,7 @@ func TestFactory_CreateMetricsExporter(t *testing.T) { Audience: "tests", } - creationParams := componenttest.NewNopExporterCreateSettings() + creationParams := exportertest.NewNopCreateSettings() creationParams.BuildInfo = component.BuildInfo{ Version: "0.0.0", } @@ -74,7 +75,7 @@ func TestFactory_CreateMetricsExporterInvalidConfig(t *testing.T) { factory := NewFactoryWithTokenSourceGetter(mockTokenSourceGetter) cfg := factory.CreateDefaultConfig().(*Config) - creationParams := componenttest.NewNopExporterCreateSettings() + creationParams := exportertest.NewNopCreateSettings() oexp, err := factory.CreateMetricsExporter(context.Background(), creationParams, cfg) require.Error(t, err) require.Nil(t, oexp) @@ -90,7 +91,7 @@ func TestFactory_CreateTracesExporter(t *testing.T) { Audience: "tests", } - creationParams := componenttest.NewNopExporterCreateSettings() + creationParams := exportertest.NewNopCreateSettings() creationParams.BuildInfo = component.BuildInfo{ Version: "0.0.0", } @@ -105,7 +106,7 @@ func Test_Factory_CreateTracesExporterInvalidConfig(t *testing.T) { factory := NewFactoryWithTokenSourceGetter(mockTokenSourceGetter) cfg := factory.CreateDefaultConfig().(*Config) - creationParams := componenttest.NewNopExporterCreateSettings() + creationParams := exportertest.NewNopCreateSettings() oexp, err := factory.CreateTracesExporter(context.Background(), creationParams, cfg) require.Error(t, err) require.Nil(t, oexp) @@ -121,7 +122,7 @@ func TestFactory_CreateLogsExporter(t *testing.T) { Audience: "tests", } - creationParams := componenttest.NewNopExporterCreateSettings() + creationParams := exportertest.NewNopCreateSettings() creationParams.BuildInfo = component.BuildInfo{ Version: "0.0.0", } @@ -136,7 +137,7 @@ func TestFactory_CreateLogsExporterInvalidConfig(t *testing.T) { factory := NewFactoryWithTokenSourceGetter(mockTokenSourceGetter) cfg := factory.CreateDefaultConfig().(*Config) - creationParams := componenttest.NewNopExporterCreateSettings() + creationParams := exportertest.NewNopCreateSettings() oexp, err := factory.CreateLogsExporter(context.Background(), creationParams, cfg) require.Error(t, err) require.Nil(t, oexp) diff --git a/exporter/f5cloudexporter/go.mod b/exporter/f5cloudexporter/go.mod index 8259ae2114d17..a1c051127d9ba 100644 --- a/exporter/f5cloudexporter/go.mod +++ b/exporter/f5cloudexporter/go.mod @@ -3,12 +3,12 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/exporter/f5clou go 1.18 require ( - github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.66.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.67.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a - go.opentelemetry.io/collector/exporter/otlphttpexporter v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector v0.67.0 + go.opentelemetry.io/collector/component v0.67.0 + go.opentelemetry.io/collector/confmap v0.67.0 + go.opentelemetry.io/collector/exporter/otlphttpexporter v0.67.0 golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 google.golang.org/api v0.104.0 ) @@ -41,9 +41,9 @@ require ( github.com/rogpeppe/go-internal v1.8.1 // indirect github.com/rs/cors v1.8.2 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/consumer v0.67.0 // indirect + go.opentelemetry.io/collector/featuregate v0.67.0 // indirect + go.opentelemetry.io/collector/pdata v1.0.0-rc1 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect diff --git a/exporter/f5cloudexporter/go.sum b/exporter/f5cloudexporter/go.sum index 4e1dd25d78730..a0dde45c9a58c 100644 --- a/exporter/f5cloudexporter/go.sum +++ b/exporter/f5cloudexporter/go.sum @@ -299,21 +299,21 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/exporter/otlphttpexporter v0.66.1-0.20221202005155-1c54042beb70 h1:7rDNCZS1qfqZxnCLaBWItnX/TweYKC6NyULpelzXl4g= -go.opentelemetry.io/collector/exporter/otlphttpexporter v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:vkFlRP0DDfDfSDVl96Gvy5Ah8L8sMcVAxMZn+0af2ew= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.66.0 h1:ZHEOeGOIYIDTKhI9xs30/obFfhUbb9b2+e/eahp1fJA= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/component v0.67.0 h1:GCBRZAqk4yNaT4L1uwlbbwophFHrxYccLZ4Uj1Ifs/M= +go.opentelemetry.io/collector/component v0.67.0/go.mod h1:Txa2lm9oe7xsGQN8u7GdUIrRpAHFIKsTO4Qi3/CSmKk= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/exporter/otlphttpexporter v0.67.0 h1:B91LfbKa0Khqc8SX2aVd5D2g9aDpeCEJ+jDjNb894mA= +go.opentelemetry.io/collector/exporter/otlphttpexporter v0.67.0/go.mod h1:o7HgN765fAq2cuATsQF2BLhbXiFJ+fK0NIbfcmw2Pa8= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.67.0 h1:pMluLYSSAH7n8zkPWYkWGY/pALrVxG9rHX8J/WDrcx0= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4 h1:PRXhsszxTt5bbPriTjmaweWUsAnJYeWBhUMLRetUgBU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 h1:aUEBEdCa6iamGzg6fuYxDA8ThxvOG240mAvWDU+XLio= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4/go.mod h1:l2MdsbKTocpPS5nQZscqTR9jd8u96VYZdcpF8Sye7mA= diff --git a/exporter/fileexporter/factory.go b/exporter/fileexporter/factory.go index 18a90005076d4..2e36defd93159 100644 --- a/exporter/fileexporter/factory.go +++ b/exporter/fileexporter/factory.go @@ -21,6 +21,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" + "go.opentelemetry.io/collector/exporter" "go.opentelemetry.io/collector/exporter/exporterhelper" "gopkg.in/natefinch/lumberjack.v2" @@ -45,13 +46,13 @@ const ( ) // NewFactory creates a factory for OTLP exporter. -func NewFactory() component.ExporterFactory { - return component.NewExporterFactory( +func NewFactory() exporter.Factory { + return exporter.NewFactory( typeStr, createDefaultConfig, - component.WithTracesExporter(createTracesExporter, stability), - component.WithMetricsExporter(createMetricsExporter, stability), - component.WithLogsExporter(createLogsExporter, stability)) + exporter.WithTraces(createTracesExporter, stability), + exporter.WithMetrics(createMetricsExporter, stability), + exporter.WithLogs(createLogsExporter, stability)) } func createDefaultConfig() component.Config { @@ -64,9 +65,9 @@ func createDefaultConfig() component.Config { func createTracesExporter( ctx context.Context, - set component.ExporterCreateSettings, + set exporter.CreateSettings, cfg component.Config, -) (component.TracesExporter, error) { +) (exporter.Traces, error) { conf := cfg.(*Config) writer, err := buildFileWriter(conf) if err != nil { @@ -87,9 +88,9 @@ func createTracesExporter( func createMetricsExporter( ctx context.Context, - set component.ExporterCreateSettings, + set exporter.CreateSettings, cfg component.Config, -) (component.MetricsExporter, error) { +) (exporter.Metrics, error) { conf := cfg.(*Config) writer, err := buildFileWriter(conf) if err != nil { @@ -110,9 +111,9 @@ func createMetricsExporter( func createLogsExporter( ctx context.Context, - set component.ExporterCreateSettings, + set exporter.CreateSettings, cfg component.Config, -) (component.LogsExporter, error) { +) (exporter.Logs, error) { conf := cfg.(*Config) writer, err := buildFileWriter(conf) if err != nil { diff --git a/exporter/fileexporter/factory_test.go b/exporter/fileexporter/factory_test.go index d45b429544b76..78f6b03ec3b36 100644 --- a/exporter/fileexporter/factory_test.go +++ b/exporter/fileexporter/factory_test.go @@ -25,6 +25,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" + "go.opentelemetry.io/collector/exporter/exportertest" "gopkg.in/natefinch/lumberjack.v2" ) @@ -41,7 +42,7 @@ func TestCreateMetricsExporterError(t *testing.T) { } _, err := createMetricsExporter( context.Background(), - componenttest.NewNopExporterCreateSettings(), + exportertest.NewNopCreateSettings(), cfg) assert.Error(t, err) } @@ -54,7 +55,7 @@ func TestCreateMetricsExporter(t *testing.T) { } exp, err := createMetricsExporter( context.Background(), - componenttest.NewNopExporterCreateSettings(), + exportertest.NewNopCreateSettings(), cfg) assert.NoError(t, err) require.NotNil(t, exp) @@ -68,7 +69,7 @@ func TestCreateTracesExporter(t *testing.T) { } exp, err := createTracesExporter( context.Background(), - componenttest.NewNopExporterCreateSettings(), + exportertest.NewNopCreateSettings(), cfg) assert.NoError(t, err) require.NotNil(t, exp) @@ -81,7 +82,7 @@ func TestCreateTracesExporterError(t *testing.T) { } _, err := createTracesExporter( context.Background(), - componenttest.NewNopExporterCreateSettings(), + exportertest.NewNopCreateSettings(), cfg) assert.Error(t, err) } @@ -94,7 +95,7 @@ func TestCreateLogsExporter(t *testing.T) { } exp, err := createLogsExporter( context.Background(), - componenttest.NewNopExporterCreateSettings(), + exportertest.NewNopCreateSettings(), cfg) assert.NoError(t, err) require.NotNil(t, exp) @@ -107,7 +108,7 @@ func TestCreateLogsExporterError(t *testing.T) { } _, err := createLogsExporter( context.Background(), - componenttest.NewNopExporterCreateSettings(), + exportertest.NewNopCreateSettings(), cfg) assert.Error(t, err) } diff --git a/exporter/fileexporter/go.mod b/exporter/fileexporter/go.mod index 8ecf2392e0d8a..e06d447558dcb 100644 --- a/exporter/fileexporter/go.mod +++ b/exporter/fileexporter/go.mod @@ -4,14 +4,14 @@ go 1.18 require ( github.com/klauspost/compress v1.15.12 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent v0.66.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent v0.67.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector v0.67.0 + go.opentelemetry.io/collector/component v0.67.0 + go.opentelemetry.io/collector/confmap v0.67.0 + go.opentelemetry.io/collector/consumer v0.67.0 + go.opentelemetry.io/collector/pdata v1.0.0-rc1 gopkg.in/natefinch/lumberjack.v2 v2.0.0 ) @@ -30,7 +30,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rogpeppe/go-internal v1.8.0 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/featuregate v0.67.0 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/exporter/fileexporter/go.sum b/exporter/fileexporter/go.sum index 267b156a3b25d..45d79f4ae1167 100644 --- a/exporter/fileexporter/go.sum +++ b/exporter/fileexporter/go.sum @@ -277,18 +277,18 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/component v0.67.0 h1:GCBRZAqk4yNaT4L1uwlbbwophFHrxYccLZ4Uj1Ifs/M= +go.opentelemetry.io/collector/component v0.67.0/go.mod h1:Txa2lm9oe7xsGQN8u7GdUIrRpAHFIKsTO4Qi3/CSmKk= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/exporter/googlecloudexporter/factory.go b/exporter/googlecloudexporter/factory.go index 17e86b19b4655..995c587958254 100644 --- a/exporter/googlecloudexporter/factory.go +++ b/exporter/googlecloudexporter/factory.go @@ -21,6 +21,7 @@ import ( "github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" + "go.opentelemetry.io/collector/exporter" "go.opentelemetry.io/collector/exporter/exporterhelper" "go.opentelemetry.io/collector/featuregate" ) @@ -44,13 +45,13 @@ func init() { } // NewFactory creates a factory for the googlecloud exporter -func NewFactory() component.ExporterFactory { - return component.NewExporterFactory( +func NewFactory() exporter.Factory { + return exporter.NewFactory( typeStr, createDefaultConfig, - component.WithTracesExporter(createTracesExporter, stability), - component.WithMetricsExporter(createMetricsExporter, stability), - component.WithLogsExporter(createLogsExporter, stability), + exporter.WithTraces(createTracesExporter, stability), + exporter.WithMetrics(createMetricsExporter, stability), + exporter.WithLogs(createLogsExporter, stability), ) } @@ -76,8 +77,8 @@ func createDefaultConfig() component.Config { func createLogsExporter( ctx context.Context, - params component.ExporterCreateSettings, - cfg component.Config) (component.LogsExporter, error) { + params exporter.CreateSettings, + cfg component.Config) (exporter.Logs, error) { var eCfg *Config if !featuregate.GetRegistry().IsEnabled(pdataExporterFeatureGate) { eCfg = toNewConfig(cfg.(*LegacyConfig)) @@ -104,8 +105,8 @@ func createLogsExporter( // createTracesExporter creates a trace exporter based on this config. func createTracesExporter( ctx context.Context, - params component.ExporterCreateSettings, - cfg component.Config) (component.TracesExporter, error) { + params exporter.CreateSettings, + cfg component.Config) (exporter.Traces, error) { var eCfg *Config if !featuregate.GetRegistry().IsEnabled(pdataExporterFeatureGate) { eCfg = toNewConfig(cfg.(*LegacyConfig)) @@ -132,8 +133,8 @@ func createTracesExporter( // createMetricsExporter creates a metrics exporter based on this config. func createMetricsExporter( ctx context.Context, - params component.ExporterCreateSettings, - cfg component.Config) (component.MetricsExporter, error) { + params exporter.CreateSettings, + cfg component.Config) (exporter.Metrics, error) { if !featuregate.GetRegistry().IsEnabled(pdataExporterFeatureGate) { eCfg := cfg.(*LegacyConfig) return newLegacyGoogleCloudMetricsExporter(eCfg, params) diff --git a/exporter/googlecloudexporter/factory_test.go b/exporter/googlecloudexporter/factory_test.go index 46fd82287b1ae..1a8c46d8edb79 100644 --- a/exporter/googlecloudexporter/factory_test.go +++ b/exporter/googlecloudexporter/factory_test.go @@ -21,6 +21,7 @@ import ( "github.com/stretchr/testify/assert" "go.opentelemetry.io/collector/component/componenttest" + "go.opentelemetry.io/collector/exporter/exportertest" ) func TestCreateDefaultConfig(t *testing.T) { @@ -41,11 +42,11 @@ func TestCreateExporter(t *testing.T) { eCfg := cfg.(*Config) eCfg.ProjectID = "test" - te, err := factory.CreateTracesExporter(ctx, componenttest.NewNopExporterCreateSettings(), eCfg) + te, err := factory.CreateTracesExporter(ctx, exportertest.NewNopCreateSettings(), eCfg) assert.NoError(t, err) assert.NotNil(t, te, "failed to create trace exporter") - me, err := factory.CreateMetricsExporter(ctx, componenttest.NewNopExporterCreateSettings(), eCfg) + me, err := factory.CreateMetricsExporter(ctx, exportertest.NewNopCreateSettings(), eCfg) assert.NoError(t, err) assert.NotNil(t, me, "failed to create metrics exporter") } @@ -61,11 +62,11 @@ func TestCreateLegacyExporter(t *testing.T) { eCfg := cfg.(*Config) eCfg.ProjectID = "test" - te, err := factory.CreateTracesExporter(ctx, componenttest.NewNopExporterCreateSettings(), eCfg) + te, err := factory.CreateTracesExporter(ctx, exportertest.NewNopCreateSettings(), eCfg) assert.NoError(t, err) assert.NotNil(t, te, "failed to create trace exporter") - me, err := factory.CreateMetricsExporter(ctx, componenttest.NewNopExporterCreateSettings(), eCfg) + me, err := factory.CreateMetricsExporter(ctx, exportertest.NewNopCreateSettings(), eCfg) assert.NoError(t, err) assert.NotNil(t, me, "failed to create metrics exporter") } diff --git a/exporter/googlecloudexporter/go.mod b/exporter/googlecloudexporter/go.mod index fdf1c3710e351..8305f86af8890 100644 --- a/exporter/googlecloudexporter/go.mod +++ b/exporter/googlecloudexporter/go.mod @@ -7,16 +7,16 @@ require ( contrib.go.opencensus.io/exporter/stackdriver v0.13.14 github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector v0.34.3-0.20221202192616-0186b89ba914 github.com/census-instrumentation/opencensus-proto v0.4.1 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.66.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.67.0 github.com/stretchr/testify v1.8.1 go.opencensus.io v0.24.0 - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector v0.67.0 + go.opentelemetry.io/collector/component v0.67.0 + go.opentelemetry.io/collector/confmap v0.67.0 + go.opentelemetry.io/collector/featuregate v0.67.0 + go.opentelemetry.io/collector/pdata v1.0.0-rc1 + go.opentelemetry.io/collector/semconv v0.67.0 google.golang.org/api v0.104.0 google.golang.org/genproto v0.0.0-20221206210731-b1a01be3a5f6 google.golang.org/grpc v1.51.0 @@ -76,8 +76,8 @@ require ( github.com/tklauser/go-sysconf v0.3.11 // indirect github.com/tklauser/numcpus v0.6.0 // indirect github.com/yusufpapurcu/wmi v1.2.2 // indirect - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 // indirect - go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/consumer v0.67.0 // indirect + go.opentelemetry.io/collector/processor/batchprocessor v0.67.0 // indirect go.opentelemetry.io/contrib/propagators/b3 v1.11.1 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.33.0 // indirect diff --git a/exporter/googlecloudexporter/go.sum b/exporter/googlecloudexporter/go.sum index b5409587fffaf..645a9edf7c696 100644 --- a/exporter/googlecloudexporter/go.sum +++ b/exporter/googlecloudexporter/go.sum @@ -438,23 +438,23 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/extension/zpagesextension v0.66.0 h1:tPqSKH5K3VhTT0XXVoWL3woWBSTJqnXZQRt0ZLSCoCc= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221202005155-1c54042beb70 h1:Y4e8NnVevonnAgmjX9Z7QIMA32yMqHAOnAlh8SzTS8c= -go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:Pi1CsKDQFoDrUP1i3+VdE6s2Xuji7bOGFBgqHK0J32E= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 h1:Q5L9Urod3c8as6ZYaoaqBjarx/HXxsxy34DFZIU2fO4= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/component v0.67.0 h1:GCBRZAqk4yNaT4L1uwlbbwophFHrxYccLZ4Uj1Ifs/M= +go.opentelemetry.io/collector/component v0.67.0/go.mod h1:Txa2lm9oe7xsGQN8u7GdUIrRpAHFIKsTO4Qi3/CSmKk= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/extension/zpagesextension v0.67.0 h1:TRW8vZwE+/h2vJqqMDmyQO9X0sxcYCSXf5MyXozSLas= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= +go.opentelemetry.io/collector/processor/batchprocessor v0.67.0 h1:Qn4Ytth3q1trwTSAYYTzIRs4SBh9rz0xBou1nZB+Dko= +go.opentelemetry.io/collector/processor/batchprocessor v0.67.0/go.mod h1:+ZXCkUG9tlwbbVLi+PT9DjQ7vz+lfFSQqvW45snLYno= +go.opentelemetry.io/collector/semconv v0.67.0 h1:zLAvcQa6Kgow52FFLrmk7/9ZVtEYyA73+xDtCcFG78Q= +go.opentelemetry.io/collector/semconv v0.67.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/contrib/propagators/b3 v1.11.1 h1:icQ6ttRV+r/2fnU46BIo/g/mPu6Rs5Ug8Rtohe3KqzI= go.opentelemetry.io/contrib/propagators/b3 v1.11.1/go.mod h1:ECIveyMXgnl4gorxFcA7RYjJY/Ql9n20ubhbfDc3QfA= go.opentelemetry.io/contrib/zpages v0.36.4 h1:Z2VK5WsDhWs9VwZ1p0TM5RyusTOgAQfdMMDDQPRnlmY= diff --git a/exporter/googlecloudexporter/legacyconfig_test.go b/exporter/googlecloudexporter/legacyconfig_test.go index 524efcfc4586a..041dcd948fdca 100644 --- a/exporter/googlecloudexporter/legacyconfig_test.go +++ b/exporter/googlecloudexporter/legacyconfig_test.go @@ -24,7 +24,7 @@ import ( "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/exporter/exporterhelper" - "go.opentelemetry.io/collector/service/servicetest" + "go.opentelemetry.io/collector/otelcol/otelcoltest" ) func TestLoadLegacyConfig(t *testing.T) { @@ -33,7 +33,7 @@ func TestLoadLegacyConfig(t *testing.T) { assert.Nil(t, err) factory := NewFactory() factories.Exporters[typeStr] = factory - cfg, err := servicetest.LoadConfigAndValidate(filepath.Join("testdata", "legacyconfig.yaml"), factories) + cfg, err := otelcoltest.LoadConfigAndValidate(filepath.Join("testdata", "legacyconfig.yaml"), factories) require.NoError(t, err) require.NotNil(t, cfg) assert.Equal(t, len(cfg.Exporters), 2) diff --git a/exporter/googlecloudexporter/legacymetrics.go b/exporter/googlecloudexporter/legacymetrics.go index f3c03aadc2d0c..eecba68bb18ac 100644 --- a/exporter/googlecloudexporter/legacymetrics.go +++ b/exporter/googlecloudexporter/legacymetrics.go @@ -28,7 +28,7 @@ import ( metricspb "github.com/census-instrumentation/opencensus-proto/gen-go/metrics/v1" "go.opencensus.io/plugin/ocgrpc" "go.opencensus.io/stats/view" - "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/exporter" "go.opentelemetry.io/collector/exporter/exporterhelper" "go.opentelemetry.io/collector/pdata/pmetric" conventions "go.opentelemetry.io/collector/semconv/v1.6.1" @@ -85,7 +85,7 @@ func generateClientOptions(cfg *LegacyConfig) ([]option.ClientOption, error) { var once sync.Once -func newLegacyGoogleCloudMetricsExporter(cfg *LegacyConfig, set component.ExporterCreateSettings) (component.MetricsExporter, error) { +func newLegacyGoogleCloudMetricsExporter(cfg *LegacyConfig, set exporter.CreateSettings) (exporter.Metrics, error) { // register view for self-observability once.Do(func() { if err := view.Register(viewPointCount); err != nil { diff --git a/exporter/googlecloudexporter/legacymetrics_test.go b/exporter/googlecloudexporter/legacymetrics_test.go index 06431289218ad..cfd4e5dfb51e1 100644 --- a/exporter/googlecloudexporter/legacymetrics_test.go +++ b/exporter/googlecloudexporter/legacymetrics_test.go @@ -24,8 +24,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" + "go.opentelemetry.io/collector/exporter/exportertest" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" "google.golang.org/api/option" @@ -95,7 +95,7 @@ func TestGoogleCloudMetricExport(t *testing.T) { option.WithTelemetryDisabled(), } - creationParams := componenttest.NewNopExporterCreateSettings() + creationParams := exportertest.NewNopCreateSettings() creationParams.BuildInfo = component.BuildInfo{ Version: "v0.0.1", } diff --git a/exporter/googlecloudpubsubexporter/exporter_test.go b/exporter/googlecloudpubsubexporter/exporter_test.go index 496df7904e822..f43eb91513bae 100644 --- a/exporter/googlecloudpubsubexporter/exporter_test.go +++ b/exporter/googlecloudpubsubexporter/exporter_test.go @@ -22,8 +22,8 @@ import ( pb "cloud.google.com/go/pubsub/apiv1/pubsubpb" "cloud.google.com/go/pubsub/pstest" "github.com/stretchr/testify/assert" - "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/exporter/exporterhelper" + "go.opentelemetry.io/collector/exporter/exportertest" "go.opentelemetry.io/collector/pdata/plog" "go.opentelemetry.io/collector/pdata/pmetric" "go.opentelemetry.io/collector/pdata/ptrace" @@ -50,7 +50,7 @@ func TestGenerateClientOptions(t *testing.T) { exporterConfig.TimeoutSettings = exporterhelper.TimeoutSettings{ Timeout: 12 * time.Second, } - exporter := ensureExporter(componenttest.NewNopExporterCreateSettings(), exporterConfig) + exporter := ensureExporter(exportertest.NewNopCreateSettings(), exporterConfig) options := exporter.generateClientOptions() assert.Equal(t, option.WithUserAgent("test-user-agent"), options[0]) @@ -81,7 +81,7 @@ func TestExporterDefaultSettings(t *testing.T) { exporterConfig.TimeoutSettings = exporterhelper.TimeoutSettings{ Timeout: 12 * time.Second, } - exporter := ensureExporter(componenttest.NewNopExporterCreateSettings(), exporterConfig) + exporter := ensureExporter(exportertest.NewNopCreateSettings(), exporterConfig) assert.NoError(t, exporter.start(ctx, nil)) assert.NoError(t, exporter.consumeTraces(ctx, ptrace.NewTraces())) assert.NoError(t, exporter.consumeMetrics(ctx, pmetric.NewMetrics())) @@ -111,7 +111,7 @@ func TestExporterCompression(t *testing.T) { Timeout: 12 * time.Second, } exporterConfig.Compression = "gzip" - exporter := ensureExporter(componenttest.NewNopExporterCreateSettings(), exporterConfig) + exporter := ensureExporter(exportertest.NewNopCreateSettings(), exporterConfig) assert.NoError(t, exporter.start(ctx, nil)) assert.NoError(t, exporter.consumeTraces(ctx, ptrace.NewTraces())) assert.NoError(t, exporter.consumeMetrics(ctx, pmetric.NewMetrics())) diff --git a/exporter/googlecloudpubsubexporter/factory.go b/exporter/googlecloudpubsubexporter/factory.go index 7758120d25d84..191d312106e06 100644 --- a/exporter/googlecloudpubsubexporter/factory.go +++ b/exporter/googlecloudpubsubexporter/factory.go @@ -23,6 +23,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer" + "go.opentelemetry.io/collector/exporter" "go.opentelemetry.io/collector/exporter/exporterhelper" "go.opentelemetry.io/collector/pdata/plog" "go.opentelemetry.io/collector/pdata/pmetric" @@ -38,18 +39,18 @@ const ( ) // NewFactory creates a factory for Google Cloud Pub/Sub exporter. -func NewFactory() component.ExporterFactory { - return component.NewExporterFactory( +func NewFactory() exporter.Factory { + return exporter.NewFactory( typeStr, createDefaultConfig, - component.WithTracesExporter(createTracesExporter, stability), - component.WithMetricsExporter(createMetricsExporter, stability), - component.WithLogsExporter(createLogsExporter, stability)) + exporter.WithTraces(createTracesExporter, stability), + exporter.WithMetrics(createMetricsExporter, stability), + exporter.WithLogs(createLogsExporter, stability)) } var exporters = map[*Config]*pubsubExporter{} -func ensureExporter(params component.ExporterCreateSettings, pCfg *Config) *pubsubExporter { +func ensureExporter(params exporter.CreateSettings, pCfg *Config) *pubsubExporter { receiver := exporters[pCfg] if receiver != nil { return receiver @@ -95,8 +96,8 @@ func createDefaultConfig() component.Config { func createTracesExporter( ctx context.Context, - set component.ExporterCreateSettings, - cfg component.Config) (component.TracesExporter, error) { + set exporter.CreateSettings, + cfg component.Config) (exporter.Traces, error) { pCfg := cfg.(*Config) pubsubExporter := ensureExporter(set, pCfg) @@ -117,8 +118,8 @@ func createTracesExporter( func createMetricsExporter( ctx context.Context, - set component.ExporterCreateSettings, - cfg component.Config) (component.MetricsExporter, error) { + set exporter.CreateSettings, + cfg component.Config) (exporter.Metrics, error) { pCfg := cfg.(*Config) pubsubExporter := ensureExporter(set, pCfg) @@ -138,8 +139,8 @@ func createMetricsExporter( func createLogsExporter( ctx context.Context, - set component.ExporterCreateSettings, - cfg component.Config) (component.LogsExporter, error) { + set exporter.CreateSettings, + cfg component.Config) (exporter.Logs, error) { pCfg := cfg.(*Config) pubsubExporter := ensureExporter(set, pCfg) diff --git a/exporter/googlecloudpubsubexporter/factory_test.go b/exporter/googlecloudpubsubexporter/factory_test.go index 028f7d22f745b..8435be4b1415e 100644 --- a/exporter/googlecloudpubsubexporter/factory_test.go +++ b/exporter/googlecloudpubsubexporter/factory_test.go @@ -21,6 +21,7 @@ import ( "github.com/stretchr/testify/assert" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" + "go.opentelemetry.io/collector/exporter/exportertest" ) func TestCreateDefaultConfig(t *testing.T) { @@ -43,7 +44,7 @@ func TestCreateTracesExporter(t *testing.T) { te, err := factory.CreateTracesExporter( context.Background(), - componenttest.NewNopExporterCreateSettings(), + exportertest.NewNopCreateSettings(), eCfg, ) assert.NoError(t, err) @@ -58,7 +59,7 @@ func TestCreateMetricsExporter(t *testing.T) { me, err := factory.CreateMetricsExporter( context.Background(), - componenttest.NewNopExporterCreateSettings(), + exportertest.NewNopCreateSettings(), eCfg, ) assert.NoError(t, err) @@ -73,7 +74,7 @@ func TestLogsCreateExporter(t *testing.T) { me, err := factory.CreateLogsExporter( context.Background(), - componenttest.NewNopExporterCreateSettings(), + exportertest.NewNopCreateSettings(), eCfg, ) assert.NoError(t, err) @@ -86,7 +87,7 @@ func TestEnsureExporter(t *testing.T) { eCfg := cfg.(*Config) eCfg.endpoint = "http://testing.invalid" - exporter1 := ensureExporter(componenttest.NewNopExporterCreateSettings(), eCfg) - exporter2 := ensureExporter(componenttest.NewNopExporterCreateSettings(), eCfg) + exporter1 := ensureExporter(exportertest.NewNopCreateSettings(), eCfg) + exporter2 := ensureExporter(exportertest.NewNopCreateSettings(), eCfg) assert.Equal(t, exporter1, exporter2) } diff --git a/exporter/googlecloudpubsubexporter/go.mod b/exporter/googlecloudpubsubexporter/go.mod index 4f2b372a17f00..5e470485e7b69 100644 --- a/exporter/googlecloudpubsubexporter/go.mod +++ b/exporter/googlecloudpubsubexporter/go.mod @@ -6,11 +6,11 @@ require ( cloud.google.com/go/pubsub v1.28.0 github.com/google/uuid v1.3.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector v0.67.0 + go.opentelemetry.io/collector/component v0.67.0 + go.opentelemetry.io/collector/confmap v0.67.0 + go.opentelemetry.io/collector/consumer v0.67.0 + go.opentelemetry.io/collector/pdata v1.0.0-rc1 go.uber.org/zap v1.24.0 google.golang.org/api v0.104.0 google.golang.org/grpc v1.51.0 @@ -41,7 +41,7 @@ require ( github.com/pelletier/go-toml v1.9.4 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/featuregate v0.67.0 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/exporter/googlecloudpubsubexporter/go.sum b/exporter/googlecloudpubsubexporter/go.sum index 12e1b8a1f9d5f..bddba0c8c0a02 100644 --- a/exporter/googlecloudpubsubexporter/go.sum +++ b/exporter/googlecloudpubsubexporter/go.sum @@ -297,18 +297,18 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/component v0.67.0 h1:GCBRZAqk4yNaT4L1uwlbbwophFHrxYccLZ4Uj1Ifs/M= +go.opentelemetry.io/collector/component v0.67.0/go.mod h1:Txa2lm9oe7xsGQN8u7GdUIrRpAHFIKsTO4Qi3/CSmKk= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/exporter/googlemanagedprometheusexporter/config_test.go b/exporter/googlemanagedprometheusexporter/config_test.go index cacb9ba9d6a14..1c140d359dc58 100644 --- a/exporter/googlemanagedprometheusexporter/config_test.go +++ b/exporter/googlemanagedprometheusexporter/config_test.go @@ -25,7 +25,7 @@ import ( "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/exporter/exporterhelper" - "go.opentelemetry.io/collector/service/servicetest" + "go.opentelemetry.io/collector/otelcol/otelcoltest" ) func TestLoadConfig(t *testing.T) { @@ -34,7 +34,7 @@ func TestLoadConfig(t *testing.T) { factory := NewFactory() factories.Exporters[typeStr] = factory - cfg, err := servicetest.LoadConfigAndValidate(filepath.Join("testdata", "config.yaml"), factories) + cfg, err := otelcoltest.LoadConfigAndValidate(filepath.Join("testdata", "config.yaml"), factories) require.NoError(t, err) require.NotNil(t, cfg) diff --git a/exporter/googlemanagedprometheusexporter/factory.go b/exporter/googlemanagedprometheusexporter/factory.go index 89e49535257df..87313fcf46a0d 100644 --- a/exporter/googlemanagedprometheusexporter/factory.go +++ b/exporter/googlemanagedprometheusexporter/factory.go @@ -21,6 +21,7 @@ import ( "github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" + "go.opentelemetry.io/collector/exporter" "go.opentelemetry.io/collector/exporter/exporterhelper" ) @@ -33,11 +34,11 @@ const ( ) // NewFactory creates a factory for the googlemanagedprometheus exporter -func NewFactory() component.ExporterFactory { - return component.NewExporterFactory( +func NewFactory() exporter.Factory { + return exporter.NewFactory( typeStr, createDefaultConfig, - component.WithMetricsExporter(createMetricsExporter, stability), + exporter.WithMetrics(createMetricsExporter, stability), ) } @@ -54,8 +55,8 @@ func createDefaultConfig() component.Config { // createMetricsExporter creates a metrics exporter based on this config. func createMetricsExporter( ctx context.Context, - params component.ExporterCreateSettings, - cfg component.Config) (component.MetricsExporter, error) { + params exporter.CreateSettings, + cfg component.Config) (exporter.Metrics, error) { eCfg := cfg.(*Config) mExp, err := collector.NewGoogleCloudMetricsExporter(ctx, eCfg.GMPConfig.toCollectorConfig(), params.TelemetrySettings.Logger, params.BuildInfo.Version, eCfg.Timeout) if err != nil { diff --git a/exporter/googlemanagedprometheusexporter/factory_test.go b/exporter/googlemanagedprometheusexporter/factory_test.go index d528d89d0bbb9..724b1d4070be2 100644 --- a/exporter/googlemanagedprometheusexporter/factory_test.go +++ b/exporter/googlemanagedprometheusexporter/factory_test.go @@ -21,6 +21,7 @@ import ( "github.com/stretchr/testify/assert" "go.opentelemetry.io/collector/component/componenttest" + "go.opentelemetry.io/collector/exporter/exportertest" ) func TestCreateDefaultConfig(t *testing.T) { @@ -40,11 +41,11 @@ func TestCreateExporter(t *testing.T) { eCfg := cfg.(*Config) eCfg.ProjectID = "test" - te, err := factory.CreateTracesExporter(ctx, componenttest.NewNopExporterCreateSettings(), eCfg) + te, err := factory.CreateTracesExporter(ctx, exportertest.NewNopCreateSettings(), eCfg) assert.NoError(t, err) assert.NotNil(t, te, "failed to create trace exporter") - me, err := factory.CreateMetricsExporter(ctx, componenttest.NewNopExporterCreateSettings(), eCfg) + me, err := factory.CreateMetricsExporter(ctx, exportertest.NewNopCreateSettings(), eCfg) assert.NoError(t, err) assert.NotNil(t, me, "failed to create metrics exporter") } diff --git a/exporter/googlemanagedprometheusexporter/go.mod b/exporter/googlemanagedprometheusexporter/go.mod index f96d92fab2db1..868a15f7a8416 100644 --- a/exporter/googlemanagedprometheusexporter/go.mod +++ b/exporter/googlemanagedprometheusexporter/go.mod @@ -6,8 +6,8 @@ require ( github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector v0.34.3-0.20221202192616-0186b89ba914 github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector/googlemanagedprometheus v0.34.3-0.20221202192616-0186b89ba914 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector v0.67.0 + go.opentelemetry.io/collector/component v0.67.0 ) require ( @@ -61,12 +61,12 @@ require ( github.com/tklauser/numcpus v0.6.0 // indirect github.com/yusufpapurcu/wmi v1.2.2 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a // indirect - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 // indirect - go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221202005155-1c54042beb70 // indirect - go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/confmap v0.67.0 // indirect + go.opentelemetry.io/collector/consumer v0.67.0 // indirect + go.opentelemetry.io/collector/featuregate v0.67.0 // indirect + go.opentelemetry.io/collector/pdata v1.0.0-rc1 // indirect + go.opentelemetry.io/collector/processor/batchprocessor v0.67.0 // indirect + go.opentelemetry.io/collector/semconv v0.67.0 // indirect go.opentelemetry.io/contrib/propagators/b3 v1.11.1 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.33.0 // indirect diff --git a/exporter/googlemanagedprometheusexporter/go.sum b/exporter/googlemanagedprometheusexporter/go.sum index ba37a2cb50aeb..5bb2bece0c0c3 100644 --- a/exporter/googlemanagedprometheusexporter/go.sum +++ b/exporter/googlemanagedprometheusexporter/go.sum @@ -425,23 +425,23 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/extension/zpagesextension v0.66.0 h1:tPqSKH5K3VhTT0XXVoWL3woWBSTJqnXZQRt0ZLSCoCc= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221202005155-1c54042beb70 h1:Y4e8NnVevonnAgmjX9Z7QIMA32yMqHAOnAlh8SzTS8c= -go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:Pi1CsKDQFoDrUP1i3+VdE6s2Xuji7bOGFBgqHK0J32E= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 h1:Q5L9Urod3c8as6ZYaoaqBjarx/HXxsxy34DFZIU2fO4= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/component v0.67.0 h1:GCBRZAqk4yNaT4L1uwlbbwophFHrxYccLZ4Uj1Ifs/M= +go.opentelemetry.io/collector/component v0.67.0/go.mod h1:Txa2lm9oe7xsGQN8u7GdUIrRpAHFIKsTO4Qi3/CSmKk= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/extension/zpagesextension v0.67.0 h1:TRW8vZwE+/h2vJqqMDmyQO9X0sxcYCSXf5MyXozSLas= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= +go.opentelemetry.io/collector/processor/batchprocessor v0.67.0 h1:Qn4Ytth3q1trwTSAYYTzIRs4SBh9rz0xBou1nZB+Dko= +go.opentelemetry.io/collector/processor/batchprocessor v0.67.0/go.mod h1:+ZXCkUG9tlwbbVLi+PT9DjQ7vz+lfFSQqvW45snLYno= +go.opentelemetry.io/collector/semconv v0.67.0 h1:zLAvcQa6Kgow52FFLrmk7/9ZVtEYyA73+xDtCcFG78Q= +go.opentelemetry.io/collector/semconv v0.67.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/contrib/propagators/b3 v1.11.1 h1:icQ6ttRV+r/2fnU46BIo/g/mPu6Rs5Ug8Rtohe3KqzI= go.opentelemetry.io/contrib/propagators/b3 v1.11.1/go.mod h1:ECIveyMXgnl4gorxFcA7RYjJY/Ql9n20ubhbfDc3QfA= go.opentelemetry.io/contrib/zpages v0.36.4 h1:Z2VK5WsDhWs9VwZ1p0TM5RyusTOgAQfdMMDDQPRnlmY= diff --git a/exporter/humioexporter/factory.go b/exporter/humioexporter/factory.go index 84f67792cf561..8ef5400eaab8e 100644 --- a/exporter/humioexporter/factory.go +++ b/exporter/humioexporter/factory.go @@ -21,6 +21,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confighttp" + "go.opentelemetry.io/collector/exporter" "go.opentelemetry.io/collector/exporter/exporterhelper" ) @@ -32,11 +33,11 @@ const ( ) // NewFactory creates an exporter factory for Humio -func NewFactory() component.ExporterFactory { - return component.NewExporterFactory( +func NewFactory() exporter.Factory { + return exporter.NewFactory( typeStr, createDefaultConfig, - component.WithTracesExporter(createTracesExporter, stability), + exporter.WithTraces(createTracesExporter, stability), ) } @@ -65,9 +66,9 @@ func createDefaultConfig() component.Config { // Creates a new trace exporter for Humio func createTracesExporter( ctx context.Context, - set component.ExporterCreateSettings, + set exporter.CreateSettings, config component.Config, -) (component.TracesExporter, error) { +) (exporter.Traces, error) { if config == nil { return nil, errors.New("missing config") } diff --git a/exporter/humioexporter/factory_test.go b/exporter/humioexporter/factory_test.go index 2f3ca239eede2..8cb9c14b2c5aa 100644 --- a/exporter/humioexporter/factory_test.go +++ b/exporter/humioexporter/factory_test.go @@ -25,9 +25,11 @@ import ( "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/config/configtls" + "go.opentelemetry.io/collector/exporter" + "go.opentelemetry.io/collector/exporter/exportertest" ) -func newHumioFactory(t *testing.T) component.ExporterFactory { +func newHumioFactory(t *testing.T) exporter.Factory { factories, err := componenttest.NopFactories() require.NoError(t, err) @@ -115,7 +117,7 @@ func TestCreateTracesExporter(t *testing.T) { t.Run(tC.desc, func(t *testing.T) { exp, err := factory.CreateTracesExporter( context.Background(), - componenttest.NewNopExporterCreateSettings(), + exportertest.NewNopCreateSettings(), tC.cfg, ) @@ -141,7 +143,7 @@ func TestCreateMetricsExporter(t *testing.T) { factory := newHumioFactory(t) mExp, err := factory.CreateMetricsExporter( context.Background(), - componenttest.NewNopExporterCreateSettings(), + exportertest.NewNopCreateSettings(), factory.CreateDefaultConfig(), ) @@ -153,7 +155,7 @@ func TestCreateLogsExporter(t *testing.T) { factory := newHumioFactory(t) lExp, err := factory.CreateLogsExporter( context.Background(), - componenttest.NewNopExporterCreateSettings(), + exportertest.NewNopCreateSettings(), factory.CreateDefaultConfig(), ) diff --git a/exporter/humioexporter/go.mod b/exporter/humioexporter/go.mod index bae6c50f790aa..f9c0611de3682 100644 --- a/exporter/humioexporter/go.mod +++ b/exporter/humioexporter/go.mod @@ -3,14 +3,14 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/exporter/humioe go 1.18 require ( - github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.66.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.67.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector v0.67.0 + go.opentelemetry.io/collector/component v0.67.0 + go.opentelemetry.io/collector/confmap v0.67.0 + go.opentelemetry.io/collector/consumer v0.67.0 + go.opentelemetry.io/collector/pdata v1.0.0-rc1 + go.opentelemetry.io/collector/semconv v0.67.0 ) require ( @@ -35,7 +35,7 @@ require ( github.com/rogpeppe/go-internal v1.6.1 // indirect github.com/rs/cors v1.8.2 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/featuregate v0.67.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect diff --git a/exporter/humioexporter/go.sum b/exporter/humioexporter/go.sum index 51bad97b9dcf6..bfd3178d496ee 100644 --- a/exporter/humioexporter/go.sum +++ b/exporter/humioexporter/go.sum @@ -286,20 +286,20 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 h1:Q5L9Urod3c8as6ZYaoaqBjarx/HXxsxy34DFZIU2fO4= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/component v0.67.0 h1:GCBRZAqk4yNaT4L1uwlbbwophFHrxYccLZ4Uj1Ifs/M= +go.opentelemetry.io/collector/component v0.67.0/go.mod h1:Txa2lm9oe7xsGQN8u7GdUIrRpAHFIKsTO4Qi3/CSmKk= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= +go.opentelemetry.io/collector/semconv v0.67.0 h1:zLAvcQa6Kgow52FFLrmk7/9ZVtEYyA73+xDtCcFG78Q= +go.opentelemetry.io/collector/semconv v0.67.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 h1:aUEBEdCa6iamGzg6fuYxDA8ThxvOG240mAvWDU+XLio= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4/go.mod h1:l2MdsbKTocpPS5nQZscqTR9jd8u96VYZdcpF8Sye7mA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= diff --git a/exporter/influxdbexporter/exporter.go b/exporter/influxdbexporter/exporter.go index d8f96a5d3ebbd..7a77bb5e0e7c0 100644 --- a/exporter/influxdbexporter/exporter.go +++ b/exporter/influxdbexporter/exporter.go @@ -22,6 +22,7 @@ import ( "github.com/influxdata/influxdb-observability/otel2influx" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/consumer/consumererror" + "go.opentelemetry.io/collector/exporter" "go.opentelemetry.io/collector/pdata/plog" "go.opentelemetry.io/collector/pdata/pmetric" "go.opentelemetry.io/collector/pdata/ptrace" @@ -35,7 +36,7 @@ type tracesExporter struct { settings component.TelemetrySettings } -func newTracesExporter(config *Config, params component.ExporterCreateSettings) *tracesExporter { +func newTracesExporter(config *Config, params exporter.CreateSettings) *tracesExporter { logger := newZapInfluxLogger(params.Logger) converter := otel2influx.NewOtelTracesToLineProtocol(logger) @@ -82,7 +83,7 @@ var metricsSchemata = map[string]common.MetricsSchema{ "telegraf-prometheus-v2": common.MetricsSchemaTelegrafPrometheusV2, } -func newMetricsExporter(config *Config, params component.ExporterCreateSettings) (*metricsExporter, error) { +func newMetricsExporter(config *Config, params exporter.CreateSettings) (*metricsExporter, error) { logger := newZapInfluxLogger(params.Logger) schema, found := metricsSchemata[config.MetricsSchema] if !found { @@ -132,7 +133,7 @@ type logsExporter struct { settings component.TelemetrySettings } -func newLogsExporter(config *Config, params component.ExporterCreateSettings) *logsExporter { +func newLogsExporter(config *Config, params exporter.CreateSettings) *logsExporter { logger := newZapInfluxLogger(params.Logger) converter := otel2influx.NewOtelLogsToLineProtocol(logger) diff --git a/exporter/influxdbexporter/factory.go b/exporter/influxdbexporter/factory.go index a751496711299..bd4d4c36da5b5 100644 --- a/exporter/influxdbexporter/factory.go +++ b/exporter/influxdbexporter/factory.go @@ -21,21 +21,22 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confighttp" + "go.opentelemetry.io/collector/exporter" "go.opentelemetry.io/collector/exporter/exporterhelper" ) // NewFactory creates a factory for Jaeger Thrift over HTTP exporter. -func NewFactory() component.ExporterFactory { - return component.NewExporterFactory( +func NewFactory() exporter.Factory { + return exporter.NewFactory( typeStr, createDefaultConfig, - component.WithTracesExporter(createTraceExporter, stability), - component.WithMetricsExporter(createMetricsExporter, stability), - component.WithLogsExporter(createLogsExporter, stability), + exporter.WithTraces(createTraceExporter, stability), + exporter.WithMetrics(createMetricsExporter, stability), + exporter.WithLogs(createLogsExporter, stability), ) } -func createTraceExporter(ctx context.Context, set component.ExporterCreateSettings, config component.Config) (component.TracesExporter, error) { +func createTraceExporter(ctx context.Context, set exporter.CreateSettings, config component.Config) (exporter.Traces, error) { cfg := config.(*Config) exporter := newTracesExporter(cfg, set) @@ -51,7 +52,7 @@ func createTraceExporter(ctx context.Context, set component.ExporterCreateSettin ) } -func createMetricsExporter(ctx context.Context, set component.ExporterCreateSettings, config component.Config) (component.MetricsExporter, error) { +func createMetricsExporter(ctx context.Context, set exporter.CreateSettings, config component.Config) (exporter.Metrics, error) { cfg := config.(*Config) exporter, err := newMetricsExporter(cfg, set) @@ -70,7 +71,7 @@ func createMetricsExporter(ctx context.Context, set component.ExporterCreateSett ) } -func createLogsExporter(ctx context.Context, set component.ExporterCreateSettings, config component.Config) (component.LogsExporter, error) { +func createLogsExporter(ctx context.Context, set exporter.CreateSettings, config component.Config) (exporter.Logs, error) { cfg := config.(*Config) exporter := newLogsExporter(cfg, set) diff --git a/exporter/influxdbexporter/go.mod b/exporter/influxdbexporter/go.mod index c6a394b3b5d7a..0756dcb1342cb 100644 --- a/exporter/influxdbexporter/go.mod +++ b/exporter/influxdbexporter/go.mod @@ -7,11 +7,11 @@ require ( github.com/influxdata/influxdb-observability/otel2influx v0.2.32 github.com/influxdata/line-protocol/v2 v2.2.1 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector v0.67.0 + go.opentelemetry.io/collector/component v0.67.0 + go.opentelemetry.io/collector/confmap v0.67.0 + go.opentelemetry.io/collector/consumer v0.67.0 + go.opentelemetry.io/collector/pdata v1.0.0-rc1 go.uber.org/zap v1.24.0 ) @@ -38,7 +38,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rs/cors v1.8.2 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/featuregate v0.67.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect diff --git a/exporter/influxdbexporter/go.sum b/exporter/influxdbexporter/go.sum index 22a48387882dc..5c37432161a47 100644 --- a/exporter/influxdbexporter/go.sum +++ b/exporter/influxdbexporter/go.sum @@ -315,18 +315,18 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/component v0.67.0 h1:GCBRZAqk4yNaT4L1uwlbbwophFHrxYccLZ4Uj1Ifs/M= +go.opentelemetry.io/collector/component v0.67.0/go.mod h1:Txa2lm9oe7xsGQN8u7GdUIrRpAHFIKsTO4Qi3/CSmKk= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 h1:aUEBEdCa6iamGzg6fuYxDA8ThxvOG240mAvWDU+XLio= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4/go.mod h1:l2MdsbKTocpPS5nQZscqTR9jd8u96VYZdcpF8Sye7mA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= diff --git a/exporter/instanaexporter/exporter.go b/exporter/instanaexporter/exporter.go index fdef5cb7b8e11..f06679bddd355 100644 --- a/exporter/instanaexporter/exporter.go +++ b/exporter/instanaexporter/exporter.go @@ -24,6 +24,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/consumer/consumererror" + "go.opentelemetry.io/collector/exporter" "go.opentelemetry.io/collector/pdata/ptrace" "go.uber.org/zap" @@ -93,7 +94,7 @@ func (e *instanaExporter) pushConvertedTraces(ctx context.Context, td ptrace.Tra return e.export(ctx, e.config.Endpoint, headers, req) } -func newInstanaExporter(cfg component.Config, set component.ExporterCreateSettings) *instanaExporter { +func newInstanaExporter(cfg component.Config, set exporter.CreateSettings) *instanaExporter { iCfg := cfg.(*Config) userAgent := fmt.Sprintf("%s/%s (%s/%s)", set.BuildInfo.Description, set.BuildInfo.Version, runtime.GOOS, runtime.GOARCH) return &instanaExporter{ diff --git a/exporter/instanaexporter/exporter_test.go b/exporter/instanaexporter/exporter_test.go index 6e36d2ad17991..db823127dffce 100644 --- a/exporter/instanaexporter/exporter_test.go +++ b/exporter/instanaexporter/exporter_test.go @@ -29,6 +29,7 @@ import ( "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/config/configtls" + "go.opentelemetry.io/collector/exporter/exportertest" "go.opentelemetry.io/collector/pdata/ptrace" ) @@ -45,7 +46,7 @@ func TestPushConvertedTraces(t *testing.T) { ExporterSettings: config.NewExporterSettings(component.NewIDWithName(typeStr, "valid")), } - instanaExporter := newInstanaExporter(&cfg, componenttest.NewNopExporterCreateSettings()) + instanaExporter := newInstanaExporter(&cfg, exportertest.NewNopCreateSettings()) ctx := context.Background() err := instanaExporter.start(ctx, componenttest.NewNopHost()) assert.NoError(t, err) @@ -109,7 +110,7 @@ func TestSelfSignedBackend(t *testing.T) { ctx := context.Background() - instanaExporter := newInstanaExporter(&cfg, componenttest.NewNopExporterCreateSettings()) + instanaExporter := newInstanaExporter(&cfg, exportertest.NewNopCreateSettings()) err = instanaExporter.start(ctx, componenttest.NewNopHost()) if err != nil { @@ -136,7 +137,7 @@ func TestSelfSignedBackendCAFileNotFound(t *testing.T) { ctx := context.Background() - instanaExporter := newInstanaExporter(&cfg, componenttest.NewNopExporterCreateSettings()) + instanaExporter := newInstanaExporter(&cfg, exportertest.NewNopCreateSettings()) assert.Error(t, instanaExporter.start(ctx, componenttest.NewNopHost()), "expect not to find the ca file") } diff --git a/exporter/instanaexporter/factory.go b/exporter/instanaexporter/factory.go index 60e6e54ccee14..12df3ce70404a 100644 --- a/exporter/instanaexporter/factory.go +++ b/exporter/instanaexporter/factory.go @@ -22,6 +22,7 @@ import ( "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/consumer" + "go.opentelemetry.io/collector/exporter" "go.opentelemetry.io/collector/exporter/exporterhelper" ) @@ -33,11 +34,11 @@ const ( ) // NewFactory creates an Instana exporter factory -func NewFactory() component.ExporterFactory { - return component.NewExporterFactory( +func NewFactory() exporter.Factory { + return exporter.NewFactory( typeStr, createDefaultConfig, - component.WithTracesExporter(createTracesExporter, stability), + exporter.WithTraces(createTracesExporter, stability), ) } @@ -55,7 +56,7 @@ func createDefaultConfig() component.Config { } // createTracesExporter creates a trace exporter based on this configuration -func createTracesExporter(ctx context.Context, set component.ExporterCreateSettings, config component.Config) (component.TracesExporter, error) { +func createTracesExporter(ctx context.Context, set exporter.CreateSettings, config component.Config) (exporter.Traces, error) { cfg := config.(*Config) ctx, cancel := context.WithCancel(ctx) diff --git a/exporter/instanaexporter/go.mod b/exporter/instanaexporter/go.mod index 6aff166fa4422..142b17cd0c800 100644 --- a/exporter/instanaexporter/go.mod +++ b/exporter/instanaexporter/go.mod @@ -3,14 +3,14 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/exporter/instan go 1.18 require ( - github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.66.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.67.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector v0.67.0 + go.opentelemetry.io/collector/component v0.67.0 + go.opentelemetry.io/collector/confmap v0.67.0 + go.opentelemetry.io/collector/consumer v0.67.0 + go.opentelemetry.io/collector/pdata v1.0.0-rc1 + go.opentelemetry.io/collector/semconv v0.67.0 go.uber.org/zap v1.24.0 ) @@ -35,7 +35,7 @@ require ( github.com/rogpeppe/go-internal v1.9.0 // indirect github.com/rs/cors v1.8.2 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/featuregate v0.67.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect diff --git a/exporter/instanaexporter/go.sum b/exporter/instanaexporter/go.sum index 3480ebd1bd616..fbe5054a28641 100644 --- a/exporter/instanaexporter/go.sum +++ b/exporter/instanaexporter/go.sum @@ -284,20 +284,20 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 h1:Q5L9Urod3c8as6ZYaoaqBjarx/HXxsxy34DFZIU2fO4= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/component v0.67.0 h1:GCBRZAqk4yNaT4L1uwlbbwophFHrxYccLZ4Uj1Ifs/M= +go.opentelemetry.io/collector/component v0.67.0/go.mod h1:Txa2lm9oe7xsGQN8u7GdUIrRpAHFIKsTO4Qi3/CSmKk= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= +go.opentelemetry.io/collector/semconv v0.67.0 h1:zLAvcQa6Kgow52FFLrmk7/9ZVtEYyA73+xDtCcFG78Q= +go.opentelemetry.io/collector/semconv v0.67.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 h1:aUEBEdCa6iamGzg6fuYxDA8ThxvOG240mAvWDU+XLio= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4/go.mod h1:l2MdsbKTocpPS5nQZscqTR9jd8u96VYZdcpF8Sye7mA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= diff --git a/exporter/jaegerexporter/exporter.go b/exporter/jaegerexporter/exporter.go index c998c162f49f5..faf2ba1dcf2ca 100644 --- a/exporter/jaegerexporter/exporter.go +++ b/exporter/jaegerexporter/exporter.go @@ -27,6 +27,7 @@ import ( "go.opentelemetry.io/collector/config/configgrpc" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/consumer/consumererror" + "go.opentelemetry.io/collector/exporter" "go.opentelemetry.io/collector/exporter/exporterhelper" "go.opentelemetry.io/collector/pdata/ptrace" "go.uber.org/zap" @@ -40,7 +41,7 @@ import ( // newTracesExporter returns a new Jaeger gRPC exporter. // The exporter name is the name to be used in the observability of the exporter. // The collectorEndpoint should be of the form "hostname:14250" (a gRPC target). -func newTracesExporter(cfg *Config, set component.ExporterCreateSettings) (component.TracesExporter, error) { +func newTracesExporter(cfg *Config, set exporter.CreateSettings) (exporter.Traces, error) { s := newProtoGRPCSender(cfg, set) return exporterhelper.NewTracesExporter( context.TODO(), set, cfg, s.pushTraces, @@ -72,7 +73,7 @@ type protoGRPCSender struct { clientSettings *configgrpc.GRPCClientSettings } -func newProtoGRPCSender(cfg *Config, set component.ExporterCreateSettings) *protoGRPCSender { +func newProtoGRPCSender(cfg *Config, set exporter.CreateSettings) *protoGRPCSender { s := &protoGRPCSender{ name: set.ID.String(), settings: set.TelemetrySettings, diff --git a/exporter/jaegerexporter/exporter_test.go b/exporter/jaegerexporter/exporter_test.go index b328c5492b2d2..434f68acaf16e 100644 --- a/exporter/jaegerexporter/exporter_test.go +++ b/exporter/jaegerexporter/exporter_test.go @@ -31,6 +31,7 @@ import ( "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/configgrpc" "go.opentelemetry.io/collector/config/configtls" + "go.opentelemetry.io/collector/exporter/exportertest" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/ptrace" "google.golang.org/grpc" @@ -148,7 +149,7 @@ func TestNew(t *testing.T) { } for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { - got, err := newTracesExporter(&tt.config, componenttest.NewNopExporterCreateSettings()) + got, err := newTracesExporter(&tt.config, exportertest.NewNopCreateSettings()) assert.NoError(t, err) assert.NotNil(t, got) t.Cleanup(func() { @@ -223,7 +224,7 @@ func TestMutualTLS(t *testing.T) { ServerName: "localhost", }, } - exporter, err := factory.CreateTracesExporter(context.Background(), componenttest.NewNopExporterCreateSettings(), cfg) + exporter, err := factory.CreateTracesExporter(context.Background(), exportertest.NewNopCreateSettings(), cfg) require.NoError(t, err) err = exporter.Start(context.Background(), componenttest.NewNopHost()) require.NoError(t, err) diff --git a/exporter/jaegerexporter/factory.go b/exporter/jaegerexporter/factory.go index 0a023d0ef6e12..74dec081f1c09 100644 --- a/exporter/jaegerexporter/factory.go +++ b/exporter/jaegerexporter/factory.go @@ -20,6 +20,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/configgrpc" + "go.opentelemetry.io/collector/exporter" "go.opentelemetry.io/collector/exporter/exporterhelper" ) @@ -31,11 +32,11 @@ const ( ) // NewFactory creates a factory for Jaeger exporter -func NewFactory() component.ExporterFactory { - return component.NewExporterFactory( +func NewFactory() exporter.Factory { + return exporter.NewFactory( typeStr, createDefaultConfig, - component.WithTracesExporter(createTracesExporter, stability)) + exporter.WithTraces(createTracesExporter, stability)) } func createDefaultConfig() component.Config { @@ -53,9 +54,9 @@ func createDefaultConfig() component.Config { func createTracesExporter( _ context.Context, - set component.ExporterCreateSettings, + set exporter.CreateSettings, config component.Config, -) (component.TracesExporter, error) { +) (exporter.Traces, error) { expCfg := config.(*Config) return newTracesExporter(expCfg, set) diff --git a/exporter/jaegerexporter/factory_test.go b/exporter/jaegerexporter/factory_test.go index 11cc6ee947218..8d35dcc100e82 100644 --- a/exporter/jaegerexporter/factory_test.go +++ b/exporter/jaegerexporter/factory_test.go @@ -21,6 +21,7 @@ import ( "github.com/stretchr/testify/assert" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" + "go.opentelemetry.io/collector/exporter/exportertest" ) func TestCreateDefaultConfig(t *testing.T) { @@ -34,7 +35,7 @@ func TestCreateMetricsExporter(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() - set := componenttest.NewNopExporterCreateSettings() + set := exportertest.NewNopCreateSettings() _, err := factory.CreateMetricsExporter(context.Background(), set, cfg) assert.Error(t, err, component.ErrDataTypeIsNotSupported) } @@ -46,7 +47,7 @@ func TestCreateInstanceViaFactory(t *testing.T) { // Default config doesn't have default endpoint so creating from it should // fail. - set := componenttest.NewNopExporterCreateSettings() + set := exportertest.NewNopCreateSettings() // Endpoint doesn't have a default value so set it directly. expCfg := cfg.(*Config) expCfg.Endpoint = "some.target.org:12345" diff --git a/exporter/jaegerexporter/go.mod b/exporter/jaegerexporter/go.mod index 351c8c612c9a7..22cf5943bde48 100644 --- a/exporter/jaegerexporter/go.mod +++ b/exporter/jaegerexporter/go.mod @@ -4,15 +4,15 @@ go 1.18 require ( github.com/jaegertracing/jaeger v1.39.1-0.20221110195127-14c11365a856 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.66.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.67.0 github.com/stretchr/testify v1.8.1 go.opencensus.io v0.24.0 - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector v0.67.0 + go.opentelemetry.io/collector/component v0.67.0 + go.opentelemetry.io/collector/confmap v0.67.0 + go.opentelemetry.io/collector/consumer v0.67.0 + go.opentelemetry.io/collector/pdata v1.0.0-rc1 go.uber.org/zap v1.24.0 google.golang.org/grpc v1.51.0 ) @@ -41,8 +41,8 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/uber/jaeger-client-go v2.30.0+incompatible // indirect github.com/uber/jaeger-lib v2.4.1+incompatible // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect - go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/featuregate v0.67.0 // indirect + go.opentelemetry.io/collector/semconv v0.67.0 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect diff --git a/exporter/jaegerexporter/go.sum b/exporter/jaegerexporter/go.sum index 1755f5b904f3f..7cd5b4abfb943 100644 --- a/exporter/jaegerexporter/go.sum +++ b/exporter/jaegerexporter/go.sum @@ -313,20 +313,20 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 h1:Q5L9Urod3c8as6ZYaoaqBjarx/HXxsxy34DFZIU2fO4= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/component v0.67.0 h1:GCBRZAqk4yNaT4L1uwlbbwophFHrxYccLZ4Uj1Ifs/M= +go.opentelemetry.io/collector/component v0.67.0/go.mod h1:Txa2lm9oe7xsGQN8u7GdUIrRpAHFIKsTO4Qi3/CSmKk= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= +go.opentelemetry.io/collector/semconv v0.67.0 h1:zLAvcQa6Kgow52FFLrmk7/9ZVtEYyA73+xDtCcFG78Q= +go.opentelemetry.io/collector/semconv v0.67.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4 h1:PRXhsszxTt5bbPriTjmaweWUsAnJYeWBhUMLRetUgBU= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4/go.mod h1:05eWWy6ZWzmpeImD3UowLTB3VjDMU1yxQ+ENuVWDM3c= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= diff --git a/exporter/jaegerthrifthttpexporter/exporter.go b/exporter/jaegerthrifthttpexporter/exporter.go index d9c0599d20980..cf6be265102de 100644 --- a/exporter/jaegerthrifthttpexporter/exporter.go +++ b/exporter/jaegerthrifthttpexporter/exporter.go @@ -27,13 +27,14 @@ import ( "github.com/jaegertracing/jaeger/thrift-gen/jaeger" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/consumer/consumererror" + "go.opentelemetry.io/collector/exporter" "go.opentelemetry.io/collector/exporter/exporterhelper" "go.opentelemetry.io/collector/pdata/ptrace" jaegertranslator "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger" ) -func newTracesExporter(config *Config, params component.ExporterCreateSettings) (component.TracesExporter, error) { +func newTracesExporter(config *Config, params exporter.CreateSettings) (exporter.Traces, error) { s := &jaegerThriftHTTPSender{ config: config, settings: params.TelemetrySettings, diff --git a/exporter/jaegerthrifthttpexporter/exporter_test.go b/exporter/jaegerthrifthttpexporter/exporter_test.go index 128ec9826dd23..4b9812cb96e51 100644 --- a/exporter/jaegerthrifthttpexporter/exporter_test.go +++ b/exporter/jaegerthrifthttpexporter/exporter_test.go @@ -22,9 +22,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confighttp" + "go.opentelemetry.io/collector/exporter/exportertest" "go.opentelemetry.io/collector/pdata/ptrace" ) @@ -40,7 +40,7 @@ func TestNew(t *testing.T) { }, } - got, err := newTracesExporter(&config, componenttest.NewNopExporterCreateSettings()) + got, err := newTracesExporter(&config, exportertest.NewNopCreateSettings()) assert.NoError(t, err) require.NotNil(t, got) diff --git a/exporter/jaegerthrifthttpexporter/factory.go b/exporter/jaegerthrifthttpexporter/factory.go index 693781b11f528..2f8e02fd77d02 100644 --- a/exporter/jaegerthrifthttpexporter/factory.go +++ b/exporter/jaegerthrifthttpexporter/factory.go @@ -20,6 +20,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confighttp" + "go.opentelemetry.io/collector/exporter" "go.opentelemetry.io/collector/exporter/exporterhelper" ) @@ -31,11 +32,11 @@ const ( ) // NewFactory creates a factory for Jaeger Thrift over HTTP exporter. -func NewFactory() component.ExporterFactory { - return component.NewExporterFactory( +func NewFactory() exporter.Factory { + return exporter.NewFactory( typeStr, createDefaultConfig, - component.WithTracesExporter(createTracesExporter, stability)) + exporter.WithTraces(createTracesExporter, stability)) } func createDefaultConfig() component.Config { @@ -49,9 +50,9 @@ func createDefaultConfig() component.Config { func createTracesExporter( _ context.Context, - set component.ExporterCreateSettings, + set exporter.CreateSettings, config component.Config, -) (component.TracesExporter, error) { +) (exporter.Traces, error) { expCfg := config.(*Config) diff --git a/exporter/jaegerthrifthttpexporter/factory_test.go b/exporter/jaegerthrifthttpexporter/factory_test.go index a9eff7dbf9b12..21832d6fc09a7 100644 --- a/exporter/jaegerthrifthttpexporter/factory_test.go +++ b/exporter/jaegerthrifthttpexporter/factory_test.go @@ -24,6 +24,7 @@ import ( "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confighttp" + "go.opentelemetry.io/collector/exporter/exportertest" ) func TestCreateDefaultConfig(t *testing.T) { @@ -34,7 +35,7 @@ func TestCreateDefaultConfig(t *testing.T) { func TestCreateInstanceViaFactory(t *testing.T) { cfg := createDefaultConfig() - params := componenttest.NewNopExporterCreateSettings() + params := exportertest.NewNopCreateSettings() // Endpoint doesn't have a default value so set it directly. expCfg := cfg.(*Config) expCfg.HTTPClientSettings.Endpoint = "http://jaeger.example.com:12345/api/traces" @@ -58,7 +59,7 @@ func TestFactory_CreateTracesExporter(t *testing.T) { }, } - params := componenttest.NewNopExporterCreateSettings() + params := exportertest.NewNopCreateSettings() te, err := createTracesExporter(context.Background(), params, config) assert.NoError(t, err) assert.NotNil(t, te) diff --git a/exporter/jaegerthrifthttpexporter/go.mod b/exporter/jaegerthrifthttpexporter/go.mod index c6da09ef53377..4d081df4d9f6b 100644 --- a/exporter/jaegerthrifthttpexporter/go.mod +++ b/exporter/jaegerthrifthttpexporter/go.mod @@ -5,13 +5,13 @@ go 1.18 require ( github.com/apache/thrift v0.17.0 github.com/jaegertracing/jaeger v1.39.1-0.20221110195127-14c11365a856 - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.66.0 + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.67.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector v0.67.0 + go.opentelemetry.io/collector/component v0.67.0 + go.opentelemetry.io/collector/confmap v0.67.0 + go.opentelemetry.io/collector/consumer v0.67.0 + go.opentelemetry.io/collector/pdata v1.0.0-rc1 ) require ( @@ -32,15 +32,15 @@ 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/internal/coreinternal v0.66.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.67.0 // indirect github.com/opentracing/opentracing-go v1.2.0 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rs/cors v1.8.2 // indirect github.com/uber/jaeger-client-go v2.30.0+incompatible // indirect github.com/uber/jaeger-lib v2.4.1+incompatible // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect - go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/featuregate v0.67.0 // indirect + go.opentelemetry.io/collector/semconv v0.67.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect diff --git a/exporter/jaegerthrifthttpexporter/go.sum b/exporter/jaegerthrifthttpexporter/go.sum index d8804ab16486b..ef5f43c264684 100644 --- a/exporter/jaegerthrifthttpexporter/go.sum +++ b/exporter/jaegerthrifthttpexporter/go.sum @@ -298,20 +298,20 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 h1:Q5L9Urod3c8as6ZYaoaqBjarx/HXxsxy34DFZIU2fO4= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/component v0.67.0 h1:GCBRZAqk4yNaT4L1uwlbbwophFHrxYccLZ4Uj1Ifs/M= +go.opentelemetry.io/collector/component v0.67.0/go.mod h1:Txa2lm9oe7xsGQN8u7GdUIrRpAHFIKsTO4Qi3/CSmKk= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= +go.opentelemetry.io/collector/semconv v0.67.0 h1:zLAvcQa6Kgow52FFLrmk7/9ZVtEYyA73+xDtCcFG78Q= +go.opentelemetry.io/collector/semconv v0.67.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 h1:aUEBEdCa6iamGzg6fuYxDA8ThxvOG240mAvWDU+XLio= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4/go.mod h1:l2MdsbKTocpPS5nQZscqTR9jd8u96VYZdcpF8Sye7mA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= diff --git a/exporter/kafkaexporter/factory.go b/exporter/kafkaexporter/factory.go index 5a5af82fb7ff6..578a2729f6c72 100644 --- a/exporter/kafkaexporter/factory.go +++ b/exporter/kafkaexporter/factory.go @@ -22,6 +22,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer" + "go.opentelemetry.io/collector/exporter" "go.opentelemetry.io/collector/exporter/exporterhelper" ) @@ -81,7 +82,7 @@ func WithLogsMarshalers(logsMarshalers ...LogsMarshaler) FactoryOption { } // NewFactory creates Kafka exporter factory. -func NewFactory(options ...FactoryOption) component.ExporterFactory { +func NewFactory(options ...FactoryOption) exporter.Factory { f := &kafkaExporterFactory{ tracesMarshalers: tracesMarshalers(), metricsMarshalers: metricsMarshalers(), @@ -90,12 +91,12 @@ func NewFactory(options ...FactoryOption) component.ExporterFactory { for _, o := range options { o(f) } - return component.NewExporterFactory( + return exporter.NewFactory( typeStr, createDefaultConfig, - component.WithTracesExporter(f.createTracesExporter, stability), - component.WithMetricsExporter(f.createMetricsExporter, stability), - component.WithLogsExporter(f.createLogsExporter, stability), + exporter.WithTraces(f.createTracesExporter, stability), + exporter.WithMetrics(f.createMetricsExporter, stability), + exporter.WithLogs(f.createLogsExporter, stability), ) } @@ -133,9 +134,9 @@ type kafkaExporterFactory struct { func (f *kafkaExporterFactory) createTracesExporter( ctx context.Context, - set component.ExporterCreateSettings, + set exporter.CreateSettings, cfg component.Config, -) (component.TracesExporter, error) { +) (exporter.Traces, error) { oCfg := *(cfg.(*Config)) // Clone the config if oCfg.Topic == "" { oCfg.Topic = defaultTracesTopic @@ -163,9 +164,9 @@ func (f *kafkaExporterFactory) createTracesExporter( func (f *kafkaExporterFactory) createMetricsExporter( ctx context.Context, - set component.ExporterCreateSettings, + set exporter.CreateSettings, cfg component.Config, -) (component.MetricsExporter, error) { +) (exporter.Metrics, error) { oCfg := *(cfg.(*Config)) // Clone the config if oCfg.Topic == "" { oCfg.Topic = defaultMetricsTopic @@ -193,9 +194,9 @@ func (f *kafkaExporterFactory) createMetricsExporter( func (f *kafkaExporterFactory) createLogsExporter( ctx context.Context, - set component.ExporterCreateSettings, + set exporter.CreateSettings, cfg component.Config, -) (component.LogsExporter, error) { +) (exporter.Logs, error) { oCfg := *(cfg.(*Config)) // Clone the config if oCfg.Topic == "" { oCfg.Topic = defaultLogsTopic diff --git a/exporter/kafkaexporter/factory_test.go b/exporter/kafkaexporter/factory_test.go index d0b1e38fce029..7d14f3133661b 100644 --- a/exporter/kafkaexporter/factory_test.go +++ b/exporter/kafkaexporter/factory_test.go @@ -23,6 +23,7 @@ import ( "github.com/Shopify/sarama" "github.com/stretchr/testify/assert" "go.opentelemetry.io/collector/component/componenttest" + "go.opentelemetry.io/collector/exporter/exportertest" "go.opentelemetry.io/collector/pdata/plog" "go.opentelemetry.io/collector/pdata/pmetric" "go.opentelemetry.io/collector/pdata/ptrace" @@ -130,7 +131,7 @@ func TestCreateMetricExporter(t *testing.T) { f := NewFactory(WithMetricsMarshalers(tc.marshalers...)) exporter, err := f.CreateMetricsExporter( context.Background(), - componenttest.NewNopExporterCreateSettings(), + exportertest.NewNopCreateSettings(), tc.conf, ) if tc.err != nil { @@ -204,7 +205,7 @@ func TestCreateLogExporter(t *testing.T) { f := NewFactory(WithLogsMarshalers(tc.marshalers...)) exporter, err := f.CreateLogsExporter( context.Background(), - componenttest.NewNopExporterCreateSettings(), + exportertest.NewNopCreateSettings(), tc.conf, ) if tc.err != nil { @@ -278,7 +279,7 @@ func TestCreateTraceExporter(t *testing.T) { f := NewFactory(WithTracesMarshalers(tc.marshalers...)) exporter, err := f.CreateTracesExporter( context.Background(), - componenttest.NewNopExporterCreateSettings(), + exportertest.NewNopCreateSettings(), tc.conf, ) if tc.err != nil { diff --git a/exporter/kafkaexporter/go.mod b/exporter/kafkaexporter/go.mod index 265ab593640f7..02e7888b5b5e3 100644 --- a/exporter/kafkaexporter/go.mod +++ b/exporter/kafkaexporter/go.mod @@ -7,16 +7,16 @@ require ( github.com/aws/aws-sdk-go v1.44.155 github.com/gogo/protobuf v1.3.2 github.com/jaegertracing/jaeger v1.39.1-0.20221110195127-14c11365a856 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.66.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.67.0 github.com/stretchr/testify v1.8.1 github.com/xdg-go/scram v1.1.1 - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector v0.67.0 + go.opentelemetry.io/collector/component v0.67.0 + go.opentelemetry.io/collector/confmap v0.67.0 + go.opentelemetry.io/collector/consumer v0.67.0 + go.opentelemetry.io/collector/pdata v1.0.0-rc1 + go.opentelemetry.io/collector/semconv v0.67.0 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.24.0 ) @@ -56,7 +56,7 @@ require ( github.com/xdg-go/pbkdf2 v1.0.0 // indirect github.com/xdg-go/stringprep v1.0.3 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/featuregate v0.67.0 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/exporter/kafkaexporter/go.sum b/exporter/kafkaexporter/go.sum index f1966d23c130c..21774c3dc17b8 100644 --- a/exporter/kafkaexporter/go.sum +++ b/exporter/kafkaexporter/go.sum @@ -334,20 +334,20 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 h1:Q5L9Urod3c8as6ZYaoaqBjarx/HXxsxy34DFZIU2fO4= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/component v0.67.0 h1:GCBRZAqk4yNaT4L1uwlbbwophFHrxYccLZ4Uj1Ifs/M= +go.opentelemetry.io/collector/component v0.67.0/go.mod h1:Txa2lm9oe7xsGQN8u7GdUIrRpAHFIKsTO4Qi3/CSmKk= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= +go.opentelemetry.io/collector/semconv v0.67.0 h1:zLAvcQa6Kgow52FFLrmk7/9ZVtEYyA73+xDtCcFG78Q= +go.opentelemetry.io/collector/semconv v0.67.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/exporter/kafkaexporter/kafka_exporter.go b/exporter/kafkaexporter/kafka_exporter.go index 5f4a134c93b83..ea3590b9119a5 100644 --- a/exporter/kafkaexporter/kafka_exporter.go +++ b/exporter/kafkaexporter/kafka_exporter.go @@ -20,8 +20,8 @@ import ( "fmt" "github.com/Shopify/sarama" - "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/consumer/consumererror" + "go.opentelemetry.io/collector/exporter" "go.opentelemetry.io/collector/pdata/plog" "go.opentelemetry.io/collector/pdata/pmetric" "go.opentelemetry.io/collector/pdata/ptrace" @@ -168,7 +168,7 @@ func newSaramaProducer(config Config) (sarama.SyncProducer, error) { return producer, nil } -func newMetricsExporter(config Config, set component.ExporterCreateSettings, marshalers map[string]MetricsMarshaler) (*kafkaMetricsProducer, error) { +func newMetricsExporter(config Config, set exporter.CreateSettings, marshalers map[string]MetricsMarshaler) (*kafkaMetricsProducer, error) { marshaler := marshalers[config.Encoding] if marshaler == nil { return nil, errUnrecognizedEncoding @@ -188,7 +188,7 @@ func newMetricsExporter(config Config, set component.ExporterCreateSettings, mar } // newTracesExporter creates Kafka exporter. -func newTracesExporter(config Config, set component.ExporterCreateSettings, marshalers map[string]TracesMarshaler) (*kafkaTracesProducer, error) { +func newTracesExporter(config Config, set exporter.CreateSettings, marshalers map[string]TracesMarshaler) (*kafkaTracesProducer, error) { marshaler := marshalers[config.Encoding] if marshaler == nil { return nil, errUnrecognizedEncoding @@ -205,7 +205,7 @@ func newTracesExporter(config Config, set component.ExporterCreateSettings, mars }, nil } -func newLogsExporter(config Config, set component.ExporterCreateSettings, marshalers map[string]LogsMarshaler) (*kafkaLogsProducer, error) { +func newLogsExporter(config Config, set exporter.CreateSettings, marshalers map[string]LogsMarshaler) (*kafkaLogsProducer, error) { marshaler := marshalers[config.Encoding] if marshaler == nil { return nil, errUnrecognizedEncoding diff --git a/exporter/kafkaexporter/kafka_exporter_test.go b/exporter/kafkaexporter/kafka_exporter_test.go index 03e9ced31717a..a62fc4031222d 100644 --- a/exporter/kafkaexporter/kafka_exporter_test.go +++ b/exporter/kafkaexporter/kafka_exporter_test.go @@ -23,8 +23,8 @@ import ( "github.com/Shopify/sarama/mocks" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config/configtls" + "go.opentelemetry.io/collector/exporter/exportertest" "go.opentelemetry.io/collector/pdata/plog" "go.opentelemetry.io/collector/pdata/pmetric" "go.opentelemetry.io/collector/pdata/ptrace" @@ -35,56 +35,56 @@ import ( func TestNewExporter_err_version(t *testing.T) { c := Config{ProtocolVersion: "0.0.0", Encoding: defaultEncoding} - texp, err := newTracesExporter(c, componenttest.NewNopExporterCreateSettings(), tracesMarshalers()) + texp, err := newTracesExporter(c, exportertest.NewNopCreateSettings(), tracesMarshalers()) assert.Error(t, err) assert.Nil(t, texp) } func TestNewExporter_err_encoding(t *testing.T) { c := Config{Encoding: "foo"} - texp, err := newTracesExporter(c, componenttest.NewNopExporterCreateSettings(), tracesMarshalers()) + texp, err := newTracesExporter(c, exportertest.NewNopCreateSettings(), tracesMarshalers()) assert.EqualError(t, err, errUnrecognizedEncoding.Error()) assert.Nil(t, texp) } func TestNewMetricsExporter_err_version(t *testing.T) { c := Config{ProtocolVersion: "0.0.0", Encoding: defaultEncoding} - mexp, err := newMetricsExporter(c, componenttest.NewNopExporterCreateSettings(), metricsMarshalers()) + mexp, err := newMetricsExporter(c, exportertest.NewNopCreateSettings(), metricsMarshalers()) assert.Error(t, err) assert.Nil(t, mexp) } func TestNewMetricsExporter_err_encoding(t *testing.T) { c := Config{Encoding: "bar"} - mexp, err := newMetricsExporter(c, componenttest.NewNopExporterCreateSettings(), metricsMarshalers()) + mexp, err := newMetricsExporter(c, exportertest.NewNopCreateSettings(), metricsMarshalers()) assert.EqualError(t, err, errUnrecognizedEncoding.Error()) assert.Nil(t, mexp) } func TestNewMetricsExporter_err_traces_encoding(t *testing.T) { c := Config{Encoding: "jaeger_proto"} - mexp, err := newMetricsExporter(c, componenttest.NewNopExporterCreateSettings(), metricsMarshalers()) + mexp, err := newMetricsExporter(c, exportertest.NewNopCreateSettings(), metricsMarshalers()) assert.EqualError(t, err, errUnrecognizedEncoding.Error()) assert.Nil(t, mexp) } func TestNewLogsExporter_err_version(t *testing.T) { c := Config{ProtocolVersion: "0.0.0", Encoding: defaultEncoding} - mexp, err := newLogsExporter(c, componenttest.NewNopExporterCreateSettings(), logsMarshalers()) + mexp, err := newLogsExporter(c, exportertest.NewNopCreateSettings(), logsMarshalers()) assert.Error(t, err) assert.Nil(t, mexp) } func TestNewLogsExporter_err_encoding(t *testing.T) { c := Config{Encoding: "bar"} - mexp, err := newLogsExporter(c, componenttest.NewNopExporterCreateSettings(), logsMarshalers()) + mexp, err := newLogsExporter(c, exportertest.NewNopCreateSettings(), logsMarshalers()) assert.EqualError(t, err, errUnrecognizedEncoding.Error()) assert.Nil(t, mexp) } func TestNewLogsExporter_err_traces_encoding(t *testing.T) { c := Config{Encoding: "jaeger_proto"} - mexp, err := newLogsExporter(c, componenttest.NewNopExporterCreateSettings(), logsMarshalers()) + mexp, err := newLogsExporter(c, exportertest.NewNopCreateSettings(), logsMarshalers()) assert.EqualError(t, err, errUnrecognizedEncoding.Error()) assert.Nil(t, mexp) } @@ -107,15 +107,15 @@ func TestNewExporter_err_auth_type(t *testing.T) { Compression: "none", }, } - texp, err := newTracesExporter(c, componenttest.NewNopExporterCreateSettings(), tracesMarshalers()) + texp, err := newTracesExporter(c, exportertest.NewNopCreateSettings(), tracesMarshalers()) assert.Error(t, err) assert.Contains(t, err.Error(), "failed to load TLS config") assert.Nil(t, texp) - mexp, err := newMetricsExporter(c, componenttest.NewNopExporterCreateSettings(), metricsMarshalers()) + mexp, err := newMetricsExporter(c, exportertest.NewNopCreateSettings(), metricsMarshalers()) assert.Error(t, err) assert.Contains(t, err.Error(), "failed to load TLS config") assert.Nil(t, mexp) - lexp, err := newLogsExporter(c, componenttest.NewNopExporterCreateSettings(), logsMarshalers()) + lexp, err := newLogsExporter(c, exportertest.NewNopCreateSettings(), logsMarshalers()) assert.Error(t, err) assert.Contains(t, err.Error(), "failed to load TLS config") assert.Nil(t, lexp) @@ -129,7 +129,7 @@ func TestNewExporter_err_compression(t *testing.T) { Compression: "idk", }, } - texp, err := newTracesExporter(c, componenttest.NewNopExporterCreateSettings(), tracesMarshalers()) + texp, err := newTracesExporter(c, exportertest.NewNopCreateSettings(), tracesMarshalers()) assert.Error(t, err) assert.Contains(t, err.Error(), "producer.compression should be one of 'none', 'gzip', 'snappy', 'lz4', or 'zstd'. configured value idk") assert.Nil(t, texp) diff --git a/exporter/loadbalancingexporter/factory.go b/exporter/loadbalancingexporter/factory.go index 090c3baf44c27..5b8821f2a6aa2 100644 --- a/exporter/loadbalancingexporter/factory.go +++ b/exporter/loadbalancingexporter/factory.go @@ -20,6 +20,7 @@ import ( "go.opencensus.io/stats/view" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" + "go.opentelemetry.io/collector/exporter" "go.opentelemetry.io/collector/exporter/otlpexporter" ) @@ -31,14 +32,14 @@ const ( ) // NewFactory creates a factory for the exporter. -func NewFactory() component.ExporterFactory { +func NewFactory() exporter.Factory { _ = view.Register(MetricViews()...) - return component.NewExporterFactory( + return exporter.NewFactory( typeStr, createDefaultConfig, - component.WithTracesExporter(createTracesExporter, stability), - component.WithLogsExporter(createLogsExporter, stability), + exporter.WithTraces(createTracesExporter, stability), + exporter.WithLogs(createLogsExporter, stability), ) } @@ -54,10 +55,10 @@ func createDefaultConfig() component.Config { } } -func createTracesExporter(_ context.Context, params component.ExporterCreateSettings, cfg component.Config) (component.TracesExporter, error) { +func createTracesExporter(_ context.Context, params exporter.CreateSettings, cfg component.Config) (exporter.Traces, error) { return newTracesExporter(params, cfg) } -func createLogsExporter(_ context.Context, params component.ExporterCreateSettings, cfg component.Config) (component.LogsExporter, error) { +func createLogsExporter(_ context.Context, params exporter.CreateSettings, cfg component.Config) (exporter.Logs, error) { return newLogsExporter(params, cfg) } diff --git a/exporter/loadbalancingexporter/factory_test.go b/exporter/loadbalancingexporter/factory_test.go index 18b5a92b248d1..fe59680a32fbc 100644 --- a/exporter/loadbalancingexporter/factory_test.go +++ b/exporter/loadbalancingexporter/factory_test.go @@ -20,14 +20,14 @@ import ( "github.com/stretchr/testify/assert" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" + "go.opentelemetry.io/collector/exporter/exportertest" ) func TestTracesExporterGetsCreatedWithValidConfiguration(t *testing.T) { // prepare factory := NewFactory() - creationParams := componenttest.NewNopExporterCreateSettings() + creationParams := exportertest.NewNopCreateSettings() cfg := &Config{ ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), Resolver: ResolverSettings{ @@ -46,7 +46,7 @@ func TestTracesExporterGetsCreatedWithValidConfiguration(t *testing.T) { func TestLogExporterGetsCreatedWithValidConfiguration(t *testing.T) { // prepare factory := NewFactory() - creationParams := componenttest.NewNopExporterCreateSettings() + creationParams := exportertest.NewNopCreateSettings() cfg := &Config{ ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), Resolver: ResolverSettings{ diff --git a/exporter/loadbalancingexporter/go.mod b/exporter/loadbalancingexporter/go.mod index 54d567037bdad..76ee6a5081640 100644 --- a/exporter/loadbalancingexporter/go.mod +++ b/exporter/loadbalancingexporter/go.mod @@ -3,16 +3,16 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/exporter/loadba go 1.18 require ( - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchpersignal v0.66.0 + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchpersignal v0.67.0 github.com/stretchr/testify v1.8.1 go.opencensus.io v0.24.0 - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/exporter/otlpexporter v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector v0.67.0 + go.opentelemetry.io/collector/component v0.67.0 + go.opentelemetry.io/collector/confmap v0.67.0 + go.opentelemetry.io/collector/consumer v0.67.0 + go.opentelemetry.io/collector/exporter/otlpexporter v0.67.0 + go.opentelemetry.io/collector/pdata v1.0.0-rc1 + go.opentelemetry.io/collector/semconv v0.67.0 go.uber.org/atomic v1.10.0 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.24.0 @@ -63,8 +63,8 @@ require ( github.com/tklauser/go-sysconf v0.3.11 // indirect github.com/tklauser/numcpus v0.6.0 // indirect github.com/yusufpapurcu/wmi v1.2.2 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect - go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/featuregate v0.67.0 // indirect + go.opentelemetry.io/collector/processor/batchprocessor v0.67.0 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4 // indirect go.opentelemetry.io/contrib/propagators/b3 v1.11.1 // indirect go.opentelemetry.io/otel v1.11.1 // indirect diff --git a/exporter/loadbalancingexporter/go.sum b/exporter/loadbalancingexporter/go.sum index 31031a4581267..7827c18f8e98f 100644 --- a/exporter/loadbalancingexporter/go.sum +++ b/exporter/loadbalancingexporter/go.sum @@ -422,25 +422,25 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/exporter/otlpexporter v0.66.1-0.20221202005155-1c54042beb70 h1:m9GPfziw/079Xt7/Pfby/5obJhtqR19WKkgQQ/VxNZo= -go.opentelemetry.io/collector/exporter/otlpexporter v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:bCD3trc7OqeEVCgyQdO3kwGgogZMjcMu2tX49SFv1lU= -go.opentelemetry.io/collector/extension/zpagesextension v0.66.0 h1:tPqSKH5K3VhTT0XXVoWL3woWBSTJqnXZQRt0ZLSCoCc= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221202005155-1c54042beb70 h1:Y4e8NnVevonnAgmjX9Z7QIMA32yMqHAOnAlh8SzTS8c= -go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:Pi1CsKDQFoDrUP1i3+VdE6s2Xuji7bOGFBgqHK0J32E= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 h1:Q5L9Urod3c8as6ZYaoaqBjarx/HXxsxy34DFZIU2fO4= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/component v0.67.0 h1:GCBRZAqk4yNaT4L1uwlbbwophFHrxYccLZ4Uj1Ifs/M= +go.opentelemetry.io/collector/component v0.67.0/go.mod h1:Txa2lm9oe7xsGQN8u7GdUIrRpAHFIKsTO4Qi3/CSmKk= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/exporter/otlpexporter v0.67.0 h1:AxejzV7pxCQjdIsIBLQPbeub2SqbyAsu09TA1BG0jcs= +go.opentelemetry.io/collector/exporter/otlpexporter v0.67.0/go.mod h1:urludZR9ya0gUNf7JXzKL06gX2Anu4BDa6UfCvI61Hw= +go.opentelemetry.io/collector/extension/zpagesextension v0.67.0 h1:TRW8vZwE+/h2vJqqMDmyQO9X0sxcYCSXf5MyXozSLas= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= +go.opentelemetry.io/collector/processor/batchprocessor v0.67.0 h1:Qn4Ytth3q1trwTSAYYTzIRs4SBh9rz0xBou1nZB+Dko= +go.opentelemetry.io/collector/processor/batchprocessor v0.67.0/go.mod h1:+ZXCkUG9tlwbbVLi+PT9DjQ7vz+lfFSQqvW45snLYno= +go.opentelemetry.io/collector/semconv v0.67.0 h1:zLAvcQa6Kgow52FFLrmk7/9ZVtEYyA73+xDtCcFG78Q= +go.opentelemetry.io/collector/semconv v0.67.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4 h1:PRXhsszxTt5bbPriTjmaweWUsAnJYeWBhUMLRetUgBU= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4/go.mod h1:05eWWy6ZWzmpeImD3UowLTB3VjDMU1yxQ+ENuVWDM3c= go.opentelemetry.io/contrib/propagators/b3 v1.11.1 h1:icQ6ttRV+r/2fnU46BIo/g/mPu6Rs5Ug8Rtohe3KqzI= diff --git a/exporter/loadbalancingexporter/loadbalancer.go b/exporter/loadbalancingexporter/loadbalancer.go index 480816cea04bb..981a73e8fc0e6 100644 --- a/exporter/loadbalancingexporter/loadbalancer.go +++ b/exporter/loadbalancingexporter/loadbalancer.go @@ -22,6 +22,7 @@ import ( "sync" "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/exporter" "go.uber.org/zap" ) @@ -59,7 +60,7 @@ type loadBalancerImp struct { } // Create new load balancer -func newLoadBalancer(params component.ExporterCreateSettings, cfg component.Config, factory componentFactory) (*loadBalancerImp, error) { +func newLoadBalancer(params exporter.CreateSettings, cfg component.Config, factory componentFactory) (*loadBalancerImp, error) { oCfg := cfg.(*Config) if oCfg.Resolver.DNS != nil && oCfg.Resolver.Static != nil { diff --git a/exporter/loadbalancingexporter/loadbalancer_test.go b/exporter/loadbalancingexporter/loadbalancer_test.go index 5f89e240f8d70..75cc18d297017 100644 --- a/exporter/loadbalancingexporter/loadbalancer_test.go +++ b/exporter/loadbalancingexporter/loadbalancer_test.go @@ -23,6 +23,8 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" + "go.opentelemetry.io/collector/exporter" + "go.opentelemetry.io/collector/exporter/exportertest" "go.opentelemetry.io/collector/exporter/otlpexporter" ) @@ -31,7 +33,7 @@ func TestNewLoadBalancerNoResolver(t *testing.T) { cfg := &Config{} // test - p, err := newLoadBalancer(componenttest.NewNopExporterCreateSettings(), cfg, nil) + p, err := newLoadBalancer(exportertest.NewNopCreateSettings(), cfg, nil) // verify require.Nil(t, p) @@ -47,7 +49,7 @@ func TestNewLoadBalancerInvalidStaticResolver(t *testing.T) { } // test - p, err := newLoadBalancer(componenttest.NewNopExporterCreateSettings(), cfg, nil) + p, err := newLoadBalancer(exportertest.NewNopCreateSettings(), cfg, nil) // verify require.Nil(t, p) @@ -65,7 +67,7 @@ func TestNewLoadBalancerInvalidDNSResolver(t *testing.T) { } // test - p, err := newLoadBalancer(componenttest.NewNopExporterCreateSettings(), cfg, nil) + p, err := newLoadBalancer(exportertest.NewNopCreateSettings(), cfg, nil) // verify require.Nil(t, p) @@ -75,7 +77,7 @@ func TestNewLoadBalancerInvalidDNSResolver(t *testing.T) { func TestLoadBalancerStart(t *testing.T) { // prepare cfg := simpleConfig() - p, err := newLoadBalancer(componenttest.NewNopExporterCreateSettings(), cfg, nil) + p, err := newLoadBalancer(exportertest.NewNopCreateSettings(), cfg, nil) require.NotNil(t, p) require.NoError(t, err) p.res = &mockResolver{} @@ -97,7 +99,7 @@ func TestWithDNSResolver(t *testing.T) { }, }, } - p, err := newLoadBalancer(componenttest.NewNopExporterCreateSettings(), cfg, nil) + p, err := newLoadBalancer(exportertest.NewNopCreateSettings(), cfg, nil) require.NotNil(t, p) require.NoError(t, err) @@ -118,7 +120,7 @@ func TestWithDNSResolverNoEndpoints(t *testing.T) { }, }, } - p, err := newLoadBalancer(componenttest.NewNopExporterCreateSettings(), cfg, nil) + p, err := newLoadBalancer(exportertest.NewNopCreateSettings(), cfg, nil) require.NotNil(t, p) require.NoError(t, err) @@ -145,7 +147,7 @@ func TestMultipleResolvers(t *testing.T) { } // test - p, err := newLoadBalancer(componenttest.NewNopExporterCreateSettings(), cfg, nil) + p, err := newLoadBalancer(exportertest.NewNopCreateSettings(), cfg, nil) // verify assert.Nil(t, p) @@ -155,7 +157,7 @@ func TestMultipleResolvers(t *testing.T) { func TestStartFailureStaticResolver(t *testing.T) { // prepare cfg := simpleConfig() - p, err := newLoadBalancer(componenttest.NewNopExporterCreateSettings(), cfg, nil) + p, err := newLoadBalancer(exportertest.NewNopCreateSettings(), cfg, nil) require.NotNil(t, p) require.NoError(t, err) @@ -176,7 +178,7 @@ func TestStartFailureStaticResolver(t *testing.T) { func TestLoadBalancerShutdown(t *testing.T) { // prepare cfg := simpleConfig() - p, err := newTracesExporter(componenttest.NewNopExporterCreateSettings(), cfg) + p, err := newTracesExporter(exportertest.NewNopCreateSettings(), cfg) require.NotNil(t, p) require.NoError(t, err) @@ -193,7 +195,7 @@ func TestOnBackendChanges(t *testing.T) { componentFactory := func(ctx context.Context, endpoint string) (component.Component, error) { return newNopMockExporter(), nil } - p, err := newLoadBalancer(componenttest.NewNopExporterCreateSettings(), cfg, componentFactory) + p, err := newLoadBalancer(exportertest.NewNopCreateSettings(), cfg, componentFactory) require.NotNil(t, p) require.NoError(t, err) @@ -215,7 +217,7 @@ func TestRemoveExtraExporters(t *testing.T) { componentFactory := func(ctx context.Context, endpoint string) (component.Component, error) { return newNopMockExporter(), nil } - p, err := newLoadBalancer(componenttest.NewNopExporterCreateSettings(), cfg, componentFactory) + p, err := newLoadBalancer(exportertest.NewNopCreateSettings(), cfg, componentFactory) require.NotNil(t, p) require.NoError(t, err) @@ -233,22 +235,22 @@ func TestRemoveExtraExporters(t *testing.T) { func TestAddMissingExporters(t *testing.T) { // prepare cfg := simpleConfig() - exporterFactory := component.NewExporterFactory("otlp", func() component.Config { + exporterFactory := exporter.NewFactory("otlp", func() component.Config { return &otlpexporter.Config{} - }, component.WithTracesExporter(func( + }, exporter.WithTraces(func( _ context.Context, - _ component.ExporterCreateSettings, + _ exporter.CreateSettings, _ component.Config, - ) (component.TracesExporter, error) { + ) (exporter.Traces, error) { return newNopMockTracesExporter(), nil }, component.StabilityLevelDevelopment)) fn := func(ctx context.Context, endpoint string) (component.Component, error) { oCfg := cfg.Protocol.OTLP oCfg.Endpoint = endpoint - return exporterFactory.CreateTracesExporter(ctx, componenttest.NewNopExporterCreateSettings(), &oCfg) + return exporterFactory.CreateTracesExporter(ctx, exportertest.NewNopCreateSettings(), &oCfg) } - p, err := newLoadBalancer(componenttest.NewNopExporterCreateSettings(), cfg, fn) + p, err := newLoadBalancer(exportertest.NewNopCreateSettings(), cfg, fn) require.NotNil(t, p) require.NoError(t, err) @@ -267,22 +269,22 @@ func TestFailedToAddMissingExporters(t *testing.T) { // prepare cfg := simpleConfig() expectedErr := errors.New("some expected error") - exporterFactory := component.NewExporterFactory("otlp", func() component.Config { + exporterFactory := exporter.NewFactory("otlp", func() component.Config { return &otlpexporter.Config{} - }, component.WithTracesExporter(func( + }, exporter.WithTraces(func( _ context.Context, - _ component.ExporterCreateSettings, + _ exporter.CreateSettings, _ component.Config, - ) (component.TracesExporter, error) { + ) (exporter.Traces, error) { return nil, expectedErr }, component.StabilityLevelDevelopment)) fn := func(ctx context.Context, endpoint string) (component.Component, error) { oCfg := cfg.Protocol.OTLP oCfg.Endpoint = endpoint - return exporterFactory.CreateTracesExporter(ctx, componenttest.NewNopExporterCreateSettings(), &oCfg) + return exporterFactory.CreateTracesExporter(ctx, exportertest.NewNopCreateSettings(), &oCfg) } - p, err := newLoadBalancer(componenttest.NewNopExporterCreateSettings(), cfg, fn) + p, err := newLoadBalancer(exportertest.NewNopCreateSettings(), cfg, fn) require.NotNil(t, p) require.NoError(t, err) @@ -347,7 +349,7 @@ func TestFailedExporterInRing(t *testing.T) { componentFactory := func(ctx context.Context, endpoint string) (component.Component, error) { return newNopMockExporter(), nil } - p, err := newLoadBalancer(componenttest.NewNopExporterCreateSettings(), cfg, componentFactory) + p, err := newLoadBalancer(exportertest.NewNopCreateSettings(), cfg, componentFactory) require.NotNil(t, p) require.NoError(t, err) diff --git a/exporter/loadbalancingexporter/log_exporter.go b/exporter/loadbalancingexporter/log_exporter.go index 4c61b40070ca3..432740c2348f2 100644 --- a/exporter/loadbalancingexporter/log_exporter.go +++ b/exporter/loadbalancingexporter/log_exporter.go @@ -25,6 +25,7 @@ import ( "go.opencensus.io/tag" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/consumer" + "go.opentelemetry.io/collector/exporter" "go.opentelemetry.io/collector/exporter/otlpexporter" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/plog" @@ -33,7 +34,7 @@ import ( "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchpersignal" ) -var _ component.LogsExporter = (*logExporterImp)(nil) +var _ exporter.Logs = (*logExporterImp)(nil) type logExporterImp struct { loadBalancer loadBalancer @@ -43,7 +44,7 @@ type logExporterImp struct { } // Create new logs exporter -func newLogsExporter(params component.ExporterCreateSettings, cfg component.Config) (*logExporterImp, error) { +func newLogsExporter(params exporter.CreateSettings, cfg component.Config) (*logExporterImp, error) { exporterFactory := otlpexporter.NewFactory() lb, err := newLoadBalancer(params, cfg, func(ctx context.Context, endpoint string) (component.Component, error) { @@ -99,9 +100,9 @@ func (e *logExporterImp) consumeLog(ctx context.Context, ld plog.Logs) error { return err } - le, ok := exp.(component.LogsExporter) + le, ok := exp.(exporter.Logs) if !ok { - expectType := (*component.LogsExporter)(nil) + expectType := (*exporter.Logs)(nil) return fmt.Errorf("unable to export logs, unexpected exporter type: expected %T but got %T", expectType, exp) } diff --git a/exporter/loadbalancingexporter/log_exporter_test.go b/exporter/loadbalancingexporter/log_exporter_test.go index 851f18d5c2321..0b9b0f2ac12cf 100644 --- a/exporter/loadbalancingexporter/log_exporter_test.go +++ b/exporter/loadbalancingexporter/log_exporter_test.go @@ -30,6 +30,8 @@ import ( "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/consumer/consumertest" + "go.opentelemetry.io/collector/exporter" + "go.opentelemetry.io/collector/exporter/exportertest" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/plog" "go.uber.org/atomic" @@ -57,7 +59,7 @@ func TestNewLogsExporter(t *testing.T) { } { t.Run(tt.desc, func(t *testing.T) { // test - _, err := newLogsExporter(componenttest.NewNopExporterCreateSettings(), tt.config) + _, err := newLogsExporter(exportertest.NewNopCreateSettings(), tt.config) // verify require.Equal(t, tt.err, err) @@ -74,7 +76,7 @@ func TestLogExporterStart(t *testing.T) { { "ok", func() *logExporterImp { - p, _ := newLogsExporter(componenttest.NewNopExporterCreateSettings(), simpleConfig()) + p, _ := newLogsExporter(exportertest.NewNopCreateSettings(), simpleConfig()) return p }(), nil, @@ -83,8 +85,8 @@ func TestLogExporterStart(t *testing.T) { "error", func() *logExporterImp { // prepare - lb, _ := newLoadBalancer(componenttest.NewNopExporterCreateSettings(), simpleConfig(), nil) - p, _ := newLogsExporter(componenttest.NewNopExporterCreateSettings(), simpleConfig()) + lb, _ := newLoadBalancer(exportertest.NewNopCreateSettings(), simpleConfig(), nil) + p, _ := newLogsExporter(exportertest.NewNopCreateSettings(), simpleConfig()) lb.res = &mockResolver{ onStart: func(context.Context) error { @@ -114,7 +116,7 @@ func TestLogExporterStart(t *testing.T) { } func TestLogExporterShutdown(t *testing.T) { - p, err := newLogsExporter(componenttest.NewNopExporterCreateSettings(), simpleConfig()) + p, err := newLogsExporter(exportertest.NewNopCreateSettings(), simpleConfig()) require.NotNil(t, p) require.NoError(t, err) @@ -129,11 +131,11 @@ func TestConsumeLogs(t *testing.T) { componentFactory := func(ctx context.Context, endpoint string) (component.Component, error) { return newNopMockLogsExporter(), nil } - lb, err := newLoadBalancer(componenttest.NewNopExporterCreateSettings(), simpleConfig(), componentFactory) + lb, err := newLoadBalancer(exportertest.NewNopCreateSettings(), simpleConfig(), componentFactory) require.NotNil(t, lb) require.NoError(t, err) - p, err := newLogsExporter(componenttest.NewNopExporterCreateSettings(), simpleConfig()) + p, err := newLogsExporter(exportertest.NewNopCreateSettings(), simpleConfig()) require.NotNil(t, p) require.NoError(t, err) @@ -164,11 +166,11 @@ func TestConsumeLogsUnexpectedExporterType(t *testing.T) { componentFactory := func(ctx context.Context, endpoint string) (component.Component, error) { return newNopMockExporter(), nil } - lb, err := newLoadBalancer(componenttest.NewNopExporterCreateSettings(), simpleConfig(), componentFactory) + lb, err := newLoadBalancer(exportertest.NewNopCreateSettings(), simpleConfig(), componentFactory) require.NotNil(t, lb) require.NoError(t, err) - p, err := newLogsExporter(componenttest.NewNopExporterCreateSettings(), simpleConfig()) + p, err := newLogsExporter(exportertest.NewNopCreateSettings(), simpleConfig()) require.NotNil(t, p) require.NoError(t, err) @@ -193,7 +195,7 @@ func TestConsumeLogsUnexpectedExporterType(t *testing.T) { // verify assert.Error(t, res) - assert.EqualError(t, res, fmt.Sprintf("unable to export logs, unexpected exporter type: expected *component.LogsExporter but got %T", newNopMockExporter())) + assert.EqualError(t, res, fmt.Sprintf("unable to export logs, unexpected exporter type: expected *exporter.Logs but got %T", newNopMockExporter())) } func TestLogBatchWithTwoTraces(t *testing.T) { @@ -201,11 +203,11 @@ func TestLogBatchWithTwoTraces(t *testing.T) { componentFactory := func(ctx context.Context, endpoint string) (component.Component, error) { return newMockLogsExporter(sink.ConsumeLogs), nil } - lb, err := newLoadBalancer(componenttest.NewNopExporterCreateSettings(), simpleConfig(), componentFactory) + lb, err := newLoadBalancer(exportertest.NewNopCreateSettings(), simpleConfig(), componentFactory) require.NotNil(t, lb) require.NoError(t, err) - p, err := newLogsExporter(componenttest.NewNopExporterCreateSettings(), simpleConfig()) + p, err := newLogsExporter(exportertest.NewNopCreateSettings(), simpleConfig()) require.NotNil(t, p) require.NoError(t, err) @@ -273,11 +275,11 @@ func TestLogsWithoutTraceID(t *testing.T) { componentFactory := func(ctx context.Context, endpoint string) (component.Component, error) { return newMockLogsExporter(sink.ConsumeLogs), nil } - lb, err := newLoadBalancer(componenttest.NewNopExporterCreateSettings(), simpleConfig(), componentFactory) + lb, err := newLoadBalancer(exportertest.NewNopCreateSettings(), simpleConfig(), componentFactory) require.NotNil(t, lb) require.NoError(t, err) - p, err := newLogsExporter(componenttest.NewNopExporterCreateSettings(), simpleConfig()) + p, err := newLogsExporter(exportertest.NewNopCreateSettings(), simpleConfig()) require.NotNil(t, p) require.NoError(t, err) @@ -360,11 +362,11 @@ func TestRollingUpdatesWhenConsumeLogs(t *testing.T) { componentFactory := func(ctx context.Context, endpoint string) (component.Component, error) { return newNopMockLogsExporter(), nil } - lb, err := newLoadBalancer(componenttest.NewNopExporterCreateSettings(), cfg, componentFactory) + lb, err := newLoadBalancer(exportertest.NewNopCreateSettings(), cfg, componentFactory) require.NotNil(t, lb) require.NoError(t, err) - p, err := newLogsExporter(componenttest.NewNopExporterCreateSettings(), cfg) + p, err := newLogsExporter(exportertest.NewNopCreateSettings(), cfg) require.NotNil(t, p) require.NoError(t, err) @@ -489,14 +491,14 @@ type mockComponent struct { component.ShutdownFunc } -func newMockLogsExporter(consumelogsfn func(ctx context.Context, ld plog.Logs) error) component.LogsExporter { +func newMockLogsExporter(consumelogsfn func(ctx context.Context, ld plog.Logs) error) exporter.Logs { return &mockLogsExporter{ Component: mockComponent{}, consumelogsfn: consumelogsfn, } } -func newNopMockLogsExporter() component.LogsExporter { +func newNopMockLogsExporter() exporter.Logs { return &mockLogsExporter{ Component: mockComponent{}, consumelogsfn: func(ctx context.Context, ld plog.Logs) error { diff --git a/exporter/loadbalancingexporter/trace_exporter.go b/exporter/loadbalancingexporter/trace_exporter.go index a3ffedcd7d512..79256b500ffc2 100644 --- a/exporter/loadbalancingexporter/trace_exporter.go +++ b/exporter/loadbalancingexporter/trace_exporter.go @@ -26,6 +26,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer" + "go.opentelemetry.io/collector/exporter" "go.opentelemetry.io/collector/exporter/otlpexporter" "go.opentelemetry.io/collector/pdata/ptrace" "go.uber.org/multierr" @@ -33,7 +34,7 @@ import ( "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchpersignal" ) -var _ component.TracesExporter = (*traceExporterImp)(nil) +var _ exporter.Traces = (*traceExporterImp)(nil) type traceExporterImp struct { loadBalancer loadBalancer @@ -44,7 +45,7 @@ type traceExporterImp struct { } // Create new traces exporter -func newTracesExporter(params component.ExporterCreateSettings, cfg component.Config) (*traceExporterImp, error) { +func newTracesExporter(params exporter.CreateSettings, cfg component.Config) (*traceExporterImp, error) { exporterFactory := otlpexporter.NewFactory() lb, err := newLoadBalancer(params, cfg, func(ctx context.Context, endpoint string) (component.Component, error) { @@ -111,9 +112,9 @@ func (e *traceExporterImp) consumeTrace(ctx context.Context, td ptrace.Traces) e return err } - te, ok := exp.(component.TracesExporter) + te, ok := exp.(exporter.Traces) if !ok { - expectType := (*component.TracesExporter)(nil) + expectType := (*exporter.Traces)(nil) return fmt.Errorf("expected %T but got %T", expectType, exp) } diff --git a/exporter/loadbalancingexporter/trace_exporter_test.go b/exporter/loadbalancingexporter/trace_exporter_test.go index a566ae00032a5..83e06d63a1c0e 100644 --- a/exporter/loadbalancingexporter/trace_exporter_test.go +++ b/exporter/loadbalancingexporter/trace_exporter_test.go @@ -32,11 +32,13 @@ import ( "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/consumer/consumertest" + "go.opentelemetry.io/collector/exporter" + "go.opentelemetry.io/collector/exporter/exportertest" "go.opentelemetry.io/collector/exporter/otlpexporter" + "go.opentelemetry.io/collector/otelcol/otelcoltest" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/ptrace" conventions "go.opentelemetry.io/collector/semconv/v1.9.0" - "go.opentelemetry.io/collector/service/servicetest" "go.uber.org/atomic" "go.uber.org/zap" ) @@ -60,7 +62,7 @@ func TestNewTracesExporter(t *testing.T) { } { t.Run(tt.desc, func(t *testing.T) { // test - _, err := newTracesExporter(componenttest.NewNopExporterCreateSettings(), tt.config) + _, err := newTracesExporter(exportertest.NewNopCreateSettings(), tt.config) // verify require.Equal(t, tt.err, err) @@ -77,7 +79,7 @@ func TestTracesExporterStart(t *testing.T) { { "ok", func() *traceExporterImp { - p, _ := newTracesExporter(componenttest.NewNopExporterCreateSettings(), simpleConfig()) + p, _ := newTracesExporter(exportertest.NewNopCreateSettings(), simpleConfig()) return p }(), nil, @@ -85,8 +87,8 @@ func TestTracesExporterStart(t *testing.T) { { "error", func() *traceExporterImp { - lb, _ := newLoadBalancer(componenttest.NewNopExporterCreateSettings(), simpleConfig(), nil) - p, _ := newTracesExporter(componenttest.NewNopExporterCreateSettings(), simpleConfig()) + lb, _ := newLoadBalancer(exportertest.NewNopCreateSettings(), simpleConfig(), nil) + p, _ := newTracesExporter(exportertest.NewNopCreateSettings(), simpleConfig()) lb.res = &mockResolver{ onStart: func(context.Context) error { @@ -116,7 +118,7 @@ func TestTracesExporterStart(t *testing.T) { } func TestTracesExporterShutdown(t *testing.T) { - p, err := newTracesExporter(componenttest.NewNopExporterCreateSettings(), simpleConfig()) + p, err := newTracesExporter(exportertest.NewNopCreateSettings(), simpleConfig()) require.NotNil(t, p) require.NoError(t, err) @@ -131,11 +133,11 @@ func TestConsumeTraces(t *testing.T) { componentFactory := func(ctx context.Context, endpoint string) (component.Component, error) { return newNopMockTracesExporter(), nil } - lb, err := newLoadBalancer(componenttest.NewNopExporterCreateSettings(), simpleConfig(), componentFactory) + lb, err := newLoadBalancer(exportertest.NewNopCreateSettings(), simpleConfig(), componentFactory) require.NotNil(t, lb) require.NoError(t, err) - p, err := newTracesExporter(componenttest.NewNopExporterCreateSettings(), simpleConfig()) + p, err := newTracesExporter(exportertest.NewNopCreateSettings(), simpleConfig()) require.NotNil(t, p) require.NoError(t, err) assert.Equal(t, p.routingKey, traceIDRouting) @@ -167,11 +169,11 @@ func TestConsumeTracesServiceBased(t *testing.T) { componentFactory := func(ctx context.Context, endpoint string) (component.Component, error) { return newNopMockTracesExporter(), nil } - lb, err := newLoadBalancer(componenttest.NewNopExporterCreateSettings(), serviceBasedRoutingConfig(), componentFactory) + lb, err := newLoadBalancer(exportertest.NewNopCreateSettings(), serviceBasedRoutingConfig(), componentFactory) require.NotNil(t, lb) require.NoError(t, err) - p, err := newTracesExporter(componenttest.NewNopExporterCreateSettings(), serviceBasedRoutingConfig()) + p, err := newTracesExporter(exportertest.NewNopCreateSettings(), serviceBasedRoutingConfig()) require.NotNil(t, p) require.NoError(t, err) assert.Equal(t, p.routingKey, svcRouting) @@ -232,11 +234,11 @@ func TestConsumeTracesExporterNoEndpoint(t *testing.T) { componentFactory := func(ctx context.Context, endpoint string) (component.Component, error) { return newNopMockTracesExporter(), nil } - lb, err := newLoadBalancer(componenttest.NewNopExporterCreateSettings(), simpleConfig(), componentFactory) + lb, err := newLoadBalancer(exportertest.NewNopCreateSettings(), simpleConfig(), componentFactory) require.NotNil(t, lb) require.NoError(t, err) - p, err := newTracesExporter(componenttest.NewNopExporterCreateSettings(), simpleConfig()) + p, err := newTracesExporter(exportertest.NewNopCreateSettings(), simpleConfig()) require.NotNil(t, p) require.NoError(t, err) @@ -266,11 +268,11 @@ func TestConsumeTracesUnexpectedExporterType(t *testing.T) { componentFactory := func(ctx context.Context, endpoint string) (component.Component, error) { return newNopMockExporter(), nil } - lb, err := newLoadBalancer(componenttest.NewNopExporterCreateSettings(), simpleConfig(), componentFactory) + lb, err := newLoadBalancer(exportertest.NewNopCreateSettings(), simpleConfig(), componentFactory) require.NotNil(t, lb) require.NoError(t, err) - p, err := newTracesExporter(componenttest.NewNopExporterCreateSettings(), simpleConfig()) + p, err := newTracesExporter(exportertest.NewNopCreateSettings(), simpleConfig()) require.NotNil(t, p) require.NoError(t, err) @@ -295,7 +297,7 @@ func TestConsumeTracesUnexpectedExporterType(t *testing.T) { // verify assert.Error(t, res) - assert.EqualError(t, res, fmt.Sprintf("expected *component.TracesExporter but got %T", newNopMockExporter())) + assert.EqualError(t, res, fmt.Sprintf("expected *exporter.Traces but got %T", newNopMockExporter())) } func TestBuildExporterConfig(t *testing.T) { @@ -305,7 +307,7 @@ func TestBuildExporterConfig(t *testing.T) { factories.Exporters[typeStr] = NewFactory() - cfg, err := servicetest.LoadConfigAndValidate(filepath.Join("testdata", "test-build-exporter-config.yaml"), factories) + cfg, err := otelcoltest.LoadConfigAndValidate(filepath.Join("testdata", "test-build-exporter-config.yaml"), factories) require.NoError(t, err) require.NotNil(t, cfg) @@ -332,11 +334,11 @@ func TestBatchWithTwoTraces(t *testing.T) { componentFactory := func(ctx context.Context, endpoint string) (component.Component, error) { return newMockTracesExporter(sink.ConsumeTraces), nil } - lb, err := newLoadBalancer(componenttest.NewNopExporterCreateSettings(), simpleConfig(), componentFactory) + lb, err := newLoadBalancer(exportertest.NewNopCreateSettings(), simpleConfig(), componentFactory) require.NotNil(t, lb) require.NoError(t, err) - p, err := newTracesExporter(componenttest.NewNopExporterCreateSettings(), simpleConfig()) + p, err := newTracesExporter(exportertest.NewNopCreateSettings(), simpleConfig()) require.NotNil(t, p) require.NoError(t, err) @@ -460,11 +462,11 @@ func TestRollingUpdatesWhenConsumeTraces(t *testing.T) { componentFactory := func(ctx context.Context, endpoint string) (component.Component, error) { return newNopMockTracesExporter(), nil } - lb, err := newLoadBalancer(componenttest.NewNopExporterCreateSettings(), cfg, componentFactory) + lb, err := newLoadBalancer(exportertest.NewNopCreateSettings(), cfg, componentFactory) require.NotNil(t, lb) require.NoError(t, err) - p, err := newTracesExporter(componenttest.NewNopExporterCreateSettings(), cfg) + p, err := newTracesExporter(exportertest.NewNopCreateSettings(), cfg) require.NotNil(t, p) require.NoError(t, err) @@ -607,14 +609,14 @@ type mockTracesExporter struct { ConsumeTracesFn func(ctx context.Context, td ptrace.Traces) error } -func newMockTracesExporter(consumeTracesFn func(ctx context.Context, td ptrace.Traces) error) component.TracesExporter { +func newMockTracesExporter(consumeTracesFn func(ctx context.Context, td ptrace.Traces) error) exporter.Traces { return &mockTracesExporter{ Component: mockComponent{}, ConsumeTracesFn: consumeTracesFn, } } -func newNopMockTracesExporter() component.TracesExporter { +func newNopMockTracesExporter() exporter.Traces { return &mockTracesExporter{ Component: mockComponent{}, ConsumeTracesFn: func(ctx context.Context, td ptrace.Traces) error { diff --git a/exporter/logicmonitorexporter/factory.go b/exporter/logicmonitorexporter/factory.go index 107387efafb46..bc4f15ac123c3 100644 --- a/exporter/logicmonitorexporter/factory.go +++ b/exporter/logicmonitorexporter/factory.go @@ -20,6 +20,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer" + "go.opentelemetry.io/collector/exporter" "go.opentelemetry.io/collector/exporter/exporterhelper" ) @@ -31,12 +32,12 @@ const ( ) // NewFactory creates a LogicMonitor exporter factory -func NewFactory() component.ExporterFactory { - return component.NewExporterFactory( +func NewFactory() exporter.Factory { + return exporter.NewFactory( typeStr, createDefaultConfig, - component.WithTracesExporter(createTracesExporter, stability), - component.WithLogsExporter(createLogsExporter, stability), + exporter.WithTraces(createTracesExporter, stability), + exporter.WithLogs(createLogsExporter, stability), ) } @@ -50,9 +51,9 @@ func createDefaultConfig() component.Config { func createTracesExporter( ctx context.Context, - set component.ExporterCreateSettings, + set exporter.CreateSettings, c component.Config, -) (component.TracesExporter, error) { +) (exporter.Traces, error) { cfg := c.(*Config) // TODO: Lines commented out until implementation is available // lmexpCfg, err := newTracesExporter(cfg, set) @@ -73,7 +74,7 @@ func createTracesExporter( exporterhelper.WithQueue(cfg.QueueSettings)) } -func createLogsExporter(ctx context.Context, set component.ExporterCreateSettings, cfg component.Config) (component.LogsExporter, error) { +func createLogsExporter(ctx context.Context, set exporter.CreateSettings, cfg component.Config) (exporter.Logs, error) { // TODO: Lines commented out until implementation is available // lmexpCfg, err := newLogsExporter(cfg, set.Logger) // if err != nil { diff --git a/exporter/logicmonitorexporter/factory_test.go b/exporter/logicmonitorexporter/factory_test.go index d65f8f297c1ac..2bfd488ec6c2b 100644 --- a/exporter/logicmonitorexporter/factory_test.go +++ b/exporter/logicmonitorexporter/factory_test.go @@ -73,7 +73,7 @@ func TestCreateDefaultConfig(t *testing.T) { // t.Run(tt.name, func(t *testing.T) { // t.Setenv("LOGICMONITOR_ACCOUNT", "localdev") // factory := NewFactory() -// set := componenttest.NewNopExporterCreateSettings() +// set := exportertest.NewNopCreateSettings() // _, err := factory.CreateTracesExporter(context.Background(), set, &tt.config) // if (err != nil) != tt.wantErr { // t.Errorf("CreateTracesExporter() error = %v, wantErr %v", err, tt.wantErr) @@ -115,7 +115,7 @@ func TestCreateDefaultConfig(t *testing.T) { // t.Run(tt.name, func(t *testing.T) { // factory := NewFactory() // cfg := factory.CreateDefaultConfig().(*Config) -// set := componenttest.NewNopExporterCreateSettings() +// set := exportertest.NewNopCreateSettings() // t.Setenv("LOGICMONITOR_ACCOUNT", "localdev") // oexp, err := factory.CreateLogsExporter(context.Background(), set, cfg) // if (err != nil) != tt.shouldError { diff --git a/exporter/logicmonitorexporter/go.mod b/exporter/logicmonitorexporter/go.mod index 3557a4dabbe2e..bca4598cbdc77 100644 --- a/exporter/logicmonitorexporter/go.mod +++ b/exporter/logicmonitorexporter/go.mod @@ -3,12 +3,12 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/exporter/logicm go 1.18 require ( - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.66.0 + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.67.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector v0.67.0 + go.opentelemetry.io/collector/component v0.67.0 + go.opentelemetry.io/collector/confmap v0.67.0 + go.opentelemetry.io/collector/consumer v0.67.0 ) require ( @@ -31,8 +31,8 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rs/cors v1.8.2 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/featuregate v0.67.0 // indirect + go.opentelemetry.io/collector/pdata v1.0.0-rc1 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect diff --git a/exporter/logicmonitorexporter/go.sum b/exporter/logicmonitorexporter/go.sum index 02cc8ac647343..99410d45ae173 100644 --- a/exporter/logicmonitorexporter/go.sum +++ b/exporter/logicmonitorexporter/go.sum @@ -283,18 +283,18 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/component v0.67.0 h1:GCBRZAqk4yNaT4L1uwlbbwophFHrxYccLZ4Uj1Ifs/M= +go.opentelemetry.io/collector/component v0.67.0/go.mod h1:Txa2lm9oe7xsGQN8u7GdUIrRpAHFIKsTO4Qi3/CSmKk= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 h1:aUEBEdCa6iamGzg6fuYxDA8ThxvOG240mAvWDU+XLio= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4/go.mod h1:l2MdsbKTocpPS5nQZscqTR9jd8u96VYZdcpF8Sye7mA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= diff --git a/exporter/logzioexporter/config_test.go b/exporter/logzioexporter/config_test.go index 49be3bb7c586b..fbb1d00c64e3e 100644 --- a/exporter/logzioexporter/config_test.go +++ b/exporter/logzioexporter/config_test.go @@ -22,12 +22,12 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/configcompression" "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/confmap/confmaptest" "go.opentelemetry.io/collector/exporter/exporterhelper" + "go.opentelemetry.io/collector/exporter/exportertest" ) func TestLoadConfig(t *testing.T) { @@ -109,7 +109,7 @@ func TestCheckAndWarnDeprecatedOptions(t *testing.T) { WriteBufferSize: 512 * 1024, }, } - params := componenttest.NewNopExporterCreateSettings() + params := exportertest.NewNopCreateSettings() logger := hclog2ZapLogger{ Zap: params.Logger, name: loggerName, diff --git a/exporter/logzioexporter/exporter.go b/exporter/logzioexporter/exporter.go index 56e5c89e81256..36423d96ddda0 100644 --- a/exporter/logzioexporter/exporter.go +++ b/exporter/logzioexporter/exporter.go @@ -30,6 +30,7 @@ import ( "github.com/jaegertracing/jaeger/pkg/cache" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/consumer/consumererror" + "go.opentelemetry.io/collector/exporter" "go.opentelemetry.io/collector/exporter/exporterhelper" "go.opentelemetry.io/collector/pdata/plog" "go.opentelemetry.io/collector/pdata/ptrace" @@ -54,7 +55,7 @@ type logzioExporter struct { serviceCache cache.Cache } -func newLogzioExporter(cfg *Config, params component.ExporterCreateSettings) (*logzioExporter, error) { +func newLogzioExporter(cfg *Config, params exporter.CreateSettings) (*logzioExporter, error) { logger := hclog2ZapLogger{ Zap: params.Logger, name: loggerName, @@ -75,7 +76,7 @@ func newLogzioExporter(cfg *Config, params component.ExporterCreateSettings) (*l }, nil } -func newLogzioTracesExporter(config *Config, set component.ExporterCreateSettings) (component.TracesExporter, error) { +func newLogzioTracesExporter(config *Config, set exporter.CreateSettings) (exporter.Traces, error) { exporter, err := newLogzioExporter(config, set) if err != nil { return nil, err @@ -100,7 +101,7 @@ func newLogzioTracesExporter(config *Config, set component.ExporterCreateSetting exporterhelper.WithRetry(config.RetrySettings), ) } -func newLogzioLogsExporter(config *Config, set component.ExporterCreateSettings) (component.LogsExporter, error) { +func newLogzioLogsExporter(config *Config, set exporter.CreateSettings) (exporter.Logs, error) { exporter, err := newLogzioExporter(config, set) if err != nil { return nil, err diff --git a/exporter/logzioexporter/exporter_test.go b/exporter/logzioexporter/exporter_test.go index 8e023363b17f5..ac0f7f55c9c72 100644 --- a/exporter/logzioexporter/exporter_test.go +++ b/exporter/logzioexporter/exporter_test.go @@ -34,6 +34,7 @@ import ( "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/configcompression" "go.opentelemetry.io/collector/config/confighttp" + "go.opentelemetry.io/collector/exporter/exportertest" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/plog" "go.opentelemetry.io/collector/pdata/ptrace" @@ -114,7 +115,7 @@ func generateLogsOneEmptyTimestamp() plog.Logs { func testLogsExporter(ld plog.Logs, t *testing.T, cfg *Config) error { var err error - params := componenttest.NewNopExporterCreateSettings() + params := exportertest.NewNopCreateSettings() exporter, err := createLogsExporter(context.Background(), params, cfg) if err != nil { return err @@ -162,7 +163,7 @@ func newTestTraces() ptrace.Traces { } func testTracesExporter(td ptrace.Traces, t *testing.T, cfg *Config) error { - params := componenttest.NewNopExporterCreateSettings() + params := exportertest.NewNopCreateSettings() exporter, err := createTracesExporter(context.Background(), params, cfg) if err != nil { return err @@ -223,13 +224,13 @@ func TestExportErrors(tester *testing.T) { } func TestNullTracesExporterConfig(tester *testing.T) { - params := componenttest.NewNopExporterCreateSettings() + params := exportertest.NewNopCreateSettings() _, err := newLogzioTracesExporter(nil, params) assert.Error(tester, err, "Null exporter config should produce error") } func TestNullExporterConfig(tester *testing.T) { - params := componenttest.NewNopExporterCreateSettings() + params := exportertest.NewNopCreateSettings() _, err := newLogzioExporter(nil, params) assert.Error(tester, err, "Null exporter config should produce error") } @@ -238,7 +239,7 @@ func TestNullTokenConfig(tester *testing.T) { cfg := Config{ Region: "eu", } - params := componenttest.NewNopExporterCreateSettings() + params := exportertest.NewNopCreateSettings() _, err := createTracesExporter(context.Background(), params, &cfg) assert.Error(tester, err, "Empty token should produce error") } diff --git a/exporter/logzioexporter/factory.go b/exporter/logzioexporter/factory.go index 271757895ec0e..b03c7af3ec2a6 100644 --- a/exporter/logzioexporter/factory.go +++ b/exporter/logzioexporter/factory.go @@ -25,6 +25,7 @@ import ( "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/configcompression" "go.opentelemetry.io/collector/config/confighttp" + "go.opentelemetry.io/collector/exporter" "go.opentelemetry.io/collector/exporter/exporterhelper" ) @@ -35,12 +36,12 @@ const ( ) // NewFactory creates a factory for Logz.io exporter. -func NewFactory() component.ExporterFactory { - return component.NewExporterFactory( +func NewFactory() exporter.Factory { + return exporter.NewFactory( typeStr, createDefaultConfig, - component.WithTracesExporter(createTracesExporter, stability), - component.WithLogsExporter(createLogsExporter, component.StabilityLevelBeta)) + exporter.WithTraces(createTracesExporter, stability), + exporter.WithLogs(createLogsExporter, component.StabilityLevelBeta)) } @@ -101,12 +102,12 @@ func generateEndpoint(cfg *Config) (string, error) { } } -func createTracesExporter(_ context.Context, params component.ExporterCreateSettings, cfg component.Config) (component.TracesExporter, error) { +func createTracesExporter(_ context.Context, params exporter.CreateSettings, cfg component.Config) (exporter.Traces, error) { exporterConfig := cfg.(*Config) return newLogzioTracesExporter(exporterConfig, params) } -func createLogsExporter(_ context.Context, params component.ExporterCreateSettings, cfg component.Config) (component.LogsExporter, error) { +func createLogsExporter(_ context.Context, params exporter.CreateSettings, cfg component.Config) (exporter.Logs, error) { exporterConfig := cfg.(*Config) return newLogzioLogsExporter(exporterConfig, params) } diff --git a/exporter/logzioexporter/factory_test.go b/exporter/logzioexporter/factory_test.go index 27211f43baa80..2c614be7f88c9 100644 --- a/exporter/logzioexporter/factory_test.go +++ b/exporter/logzioexporter/factory_test.go @@ -26,6 +26,7 @@ import ( "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/confmap/confmaptest" + "go.opentelemetry.io/collector/exporter/exportertest" ) func TestCreateDefaultConfig(t *testing.T) { @@ -45,7 +46,7 @@ func TestCreateTracesExporter(t *testing.T) { require.NoError(t, err) require.NoError(t, component.UnmarshalConfig(sub, cfg)) - params := componenttest.NewNopExporterCreateSettings() + params := exportertest.NewNopCreateSettings() exporter, err := factory.CreateTracesExporter(context.Background(), params, cfg) assert.Nil(t, err) assert.NotNil(t, exporter) diff --git a/exporter/logzioexporter/go.mod b/exporter/logzioexporter/go.mod index 5b31a0074e76e..d58451e42e5f9 100644 --- a/exporter/logzioexporter/go.mod +++ b/exporter/logzioexporter/go.mod @@ -5,15 +5,15 @@ go 1.18 require ( github.com/hashicorp/go-hclog v1.3.1 github.com/jaegertracing/jaeger v1.39.1-0.20221110195127-14c11365a856 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.66.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.67.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector v0.67.0 + go.opentelemetry.io/collector/component v0.67.0 + go.opentelemetry.io/collector/confmap v0.67.0 + go.opentelemetry.io/collector/consumer v0.67.0 + go.opentelemetry.io/collector/pdata v1.0.0-rc1 + go.opentelemetry.io/collector/semconv v0.67.0 go.uber.org/zap v1.24.0 google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c google.golang.org/protobuf v1.28.1 @@ -46,7 +46,7 @@ require ( github.com/uber/jaeger-client-go v2.30.0+incompatible // indirect github.com/uber/jaeger-lib v2.4.1+incompatible // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/featuregate v0.67.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect diff --git a/exporter/logzioexporter/go.sum b/exporter/logzioexporter/go.sum index 48d4029466287..7aa5d558029d2 100644 --- a/exporter/logzioexporter/go.sum +++ b/exporter/logzioexporter/go.sum @@ -306,20 +306,20 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 h1:Q5L9Urod3c8as6ZYaoaqBjarx/HXxsxy34DFZIU2fO4= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/component v0.67.0 h1:GCBRZAqk4yNaT4L1uwlbbwophFHrxYccLZ4Uj1Ifs/M= +go.opentelemetry.io/collector/component v0.67.0/go.mod h1:Txa2lm9oe7xsGQN8u7GdUIrRpAHFIKsTO4Qi3/CSmKk= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= +go.opentelemetry.io/collector/semconv v0.67.0 h1:zLAvcQa6Kgow52FFLrmk7/9ZVtEYyA73+xDtCcFG78Q= +go.opentelemetry.io/collector/semconv v0.67.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 h1:aUEBEdCa6iamGzg6fuYxDA8ThxvOG240mAvWDU+XLio= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4/go.mod h1:l2MdsbKTocpPS5nQZscqTR9jd8u96VYZdcpF8Sye7mA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= diff --git a/exporter/logzioexporter/jsonlog_test.go b/exporter/logzioexporter/jsonlog_test.go index 9ae05333b7a0f..30c055a8b5427 100644 --- a/exporter/logzioexporter/jsonlog_test.go +++ b/exporter/logzioexporter/jsonlog_test.go @@ -30,6 +30,7 @@ import ( "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/configcompression" "go.opentelemetry.io/collector/config/confighttp" + "go.opentelemetry.io/collector/exporter/exportertest" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/plog" ) @@ -106,7 +107,7 @@ func TestSetTimeStamp(t *testing.T) { }, } var err error - params := componenttest.NewNopExporterCreateSettings() + params := exportertest.NewNopCreateSettings() exporter, err := createLogsExporter(context.Background(), params, cfg) require.NoError(t, err) err = exporter.Start(context.Background(), componenttest.NewNopHost()) diff --git a/exporter/lokiexporter/factory.go b/exporter/lokiexporter/factory.go index 489e397fc600f..3c10c4f81522d 100644 --- a/exporter/lokiexporter/factory.go +++ b/exporter/lokiexporter/factory.go @@ -18,6 +18,7 @@ import ( "context" "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/exporter" ) const ( @@ -27,15 +28,15 @@ const ( ) // NewFactory creates a factory for the legacy Loki exporter. -func NewFactory() component.ExporterFactory { - return component.NewExporterFactory( +func NewFactory() exporter.Factory { + return exporter.NewFactory( typeStr, createDefaultLegacyConfig, - component.WithLogsExporter(createLogsExporter, stability), + exporter.WithLogs(createLogsExporter, stability), ) } -func createLogsExporter(ctx context.Context, set component.ExporterCreateSettings, config component.Config) (component.LogsExporter, error) { +func createLogsExporter(ctx context.Context, set exporter.CreateSettings, config component.Config) (exporter.Logs, error) { expCfg := config.(*Config) // this should go away once the legacy code is removed, as the config validation happens during the loading diff --git a/exporter/lokiexporter/factory_deprecated.go b/exporter/lokiexporter/factory_deprecated.go index 12cce974e45e7..5d8cd74fed240 100644 --- a/exporter/lokiexporter/factory_deprecated.go +++ b/exporter/lokiexporter/factory_deprecated.go @@ -21,6 +21,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confighttp" + "go.opentelemetry.io/collector/exporter" "go.opentelemetry.io/collector/exporter/exporterhelper" ) @@ -39,7 +40,7 @@ func createDefaultLegacyConfig() component.Config { } } -func createLegacyLogsExporter(ctx context.Context, set component.ExporterCreateSettings, cfg *Config) (component.LogsExporter, error) { +func createLegacyLogsExporter(ctx context.Context, set exporter.CreateSettings, cfg *Config) (exporter.Logs, error) { exp := newLegacyExporter(cfg, set.TelemetrySettings) return exporterhelper.NewLogsExporter( diff --git a/exporter/lokiexporter/factory_next.go b/exporter/lokiexporter/factory_next.go index bf408696c0651..8aaf445c0f7ba 100644 --- a/exporter/lokiexporter/factory_next.go +++ b/exporter/lokiexporter/factory_next.go @@ -17,11 +17,11 @@ package lokiexporter // import "github.com/open-telemetry/opentelemetry-collecto import ( "context" - "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/exporter" "go.opentelemetry.io/collector/exporter/exporterhelper" ) -func createNextLogsExporter(ctx context.Context, set component.ExporterCreateSettings, cfg *Config) (component.LogsExporter, error) { +func createNextLogsExporter(ctx context.Context, set exporter.CreateSettings, cfg *Config) (exporter.Logs, error) { exp := newNextExporter(cfg, set.TelemetrySettings) return exporterhelper.NewLogsExporter( diff --git a/exporter/lokiexporter/go.mod b/exporter/lokiexporter/go.mod index 217f930842a4d..df5a07d3b5258 100644 --- a/exporter/lokiexporter/go.mod +++ b/exporter/lokiexporter/go.mod @@ -5,17 +5,17 @@ go 1.18 require ( github.com/gogo/protobuf v1.3.2 github.com/golang/snappy v0.0.4 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/loki v0.66.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/loki v0.67.0 github.com/prometheus/common v0.37.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector v0.67.0 + go.opentelemetry.io/collector/component v0.67.0 + go.opentelemetry.io/collector/confmap v0.67.0 + go.opentelemetry.io/collector/consumer v0.67.0 + go.opentelemetry.io/collector/pdata v1.0.0-rc1 + go.opentelemetry.io/collector/semconv v0.67.0 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.24.0 ) @@ -42,7 +42,7 @@ require ( github.com/prometheus/prometheus v0.40.5 // indirect github.com/rs/cors v1.8.2 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/featuregate v0.67.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect diff --git a/exporter/lokiexporter/go.sum b/exporter/lokiexporter/go.sum index 1e05a3797fda9..399c677b37438 100644 --- a/exporter/lokiexporter/go.sum +++ b/exporter/lokiexporter/go.sum @@ -370,20 +370,20 @@ go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 h1:Q5L9Urod3c8as6ZYaoaqBjarx/HXxsxy34DFZIU2fO4= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/component v0.67.0 h1:GCBRZAqk4yNaT4L1uwlbbwophFHrxYccLZ4Uj1Ifs/M= +go.opentelemetry.io/collector/component v0.67.0/go.mod h1:Txa2lm9oe7xsGQN8u7GdUIrRpAHFIKsTO4Qi3/CSmKk= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= +go.opentelemetry.io/collector/semconv v0.67.0 h1:zLAvcQa6Kgow52FFLrmk7/9ZVtEYyA73+xDtCcFG78Q= +go.opentelemetry.io/collector/semconv v0.67.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 h1:aUEBEdCa6iamGzg6fuYxDA8ThxvOG240mAvWDU+XLio= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4/go.mod h1:l2MdsbKTocpPS5nQZscqTR9jd8u96VYZdcpF8Sye7mA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= diff --git a/exporter/lokiexporter/legacy_factory_test.go b/exporter/lokiexporter/legacy_factory_test.go index 267acbb527fe7..35b69f2b74207 100644 --- a/exporter/lokiexporter/legacy_factory_test.go +++ b/exporter/lokiexporter/legacy_factory_test.go @@ -26,6 +26,7 @@ import ( "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confighttp" + "go.opentelemetry.io/collector/exporter/exportertest" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/common/testutil" ) @@ -98,7 +99,7 @@ func TestFactory_CreateLogsExporter(t *testing.T) { for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { factory := NewFactory() - creationParams := componenttest.NewNopExporterCreateSettings() + creationParams := exportertest.NewNopCreateSettings() exp, err := factory.CreateLogsExporter(context.Background(), creationParams, &tt.config) if (err != nil) != tt.shouldError { t.Errorf("CreateLogsExporter() error = %v, shouldError %v", err, tt.shouldError) diff --git a/exporter/lokiexporter/next_exporter_test.go b/exporter/lokiexporter/next_exporter_test.go index dfb6bd0a5279c..7e9dedd99651b 100644 --- a/exporter/lokiexporter/next_exporter_test.go +++ b/exporter/lokiexporter/next_exporter_test.go @@ -28,6 +28,7 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config/confighttp" + "go.opentelemetry.io/collector/exporter/exportertest" "go.opentelemetry.io/collector/pdata/plog" "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/loki/logproto" @@ -91,7 +92,7 @@ func TestPushLogData(t *testing.T) { } f := NewFactory() - exp, err := f.CreateLogsExporter(context.Background(), componenttest.NewNopExporterCreateSettings(), cfg) + exp, err := f.CreateLogsExporter(context.Background(), exportertest.NewNopCreateSettings(), cfg) require.NoError(t, err) err = exp.Start(context.Background(), componenttest.NewNopHost()) @@ -270,7 +271,7 @@ func TestLogsToLokiRequestWithGroupingByTenant(t *testing.T) { } f := NewFactory() - exp, err := f.CreateLogsExporter(context.Background(), componenttest.NewNopExporterCreateSettings(), cfg) + exp, err := f.CreateLogsExporter(context.Background(), exportertest.NewNopCreateSettings(), cfg) require.NoError(t, err) err = exp.Start(context.Background(), componenttest.NewNopHost()) diff --git a/exporter/mezmoexporter/factory.go b/exporter/mezmoexporter/factory.go index 7164b42ec47c3..8ec5aadbc57a2 100644 --- a/exporter/mezmoexporter/factory.go +++ b/exporter/mezmoexporter/factory.go @@ -20,6 +20,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" + "go.opentelemetry.io/collector/exporter" "go.opentelemetry.io/collector/exporter/exporterhelper" ) @@ -30,11 +31,11 @@ const ( ) // NewFactory creates a factory for Mezmo exporter. -func NewFactory() component.ExporterFactory { - return component.NewExporterFactory( +func NewFactory() exporter.Factory { + return exporter.NewFactory( typeStr, createDefaultConfig, - component.WithLogsExporter(createLogsExporter, stability), + exporter.WithLogs(createLogsExporter, stability), ) } @@ -50,7 +51,7 @@ func createDefaultConfig() component.Config { } // Create a log exporter for exporting to Mezmo -func createLogsExporter(ctx context.Context, settings component.ExporterCreateSettings, exporterConfig component.Config) (component.LogsExporter, error) { +func createLogsExporter(ctx context.Context, settings exporter.CreateSettings, exporterConfig component.Config) (exporter.Logs, error) { log := settings.Logger if exporterConfig == nil { diff --git a/exporter/mezmoexporter/factory_test.go b/exporter/mezmoexporter/factory_test.go index 8b97404083b6e..de74d99ae60ac 100644 --- a/exporter/mezmoexporter/factory_test.go +++ b/exporter/mezmoexporter/factory_test.go @@ -25,6 +25,7 @@ import ( "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/exporter/exporterhelper" + "go.opentelemetry.io/collector/exporter/exportertest" ) func TestType(t *testing.T) { @@ -56,7 +57,7 @@ func TestIngestUrlMustConform(t *testing.T) { cfg.IngestURL = "https://example.com:8088/services/collector" cfg.IngestKey = "1234-1234" - params := componenttest.NewNopExporterCreateSettings() + params := exportertest.NewNopCreateSettings() _, err := createLogsExporter(context.Background(), params, cfg) assert.Error(t, err, `"ingest_url" must end with "/otel/ingest/rest"`) } @@ -66,13 +67,13 @@ func TestCreateLogsExporter(t *testing.T) { cfg.IngestURL = "https://example.com:8088/otel/ingest/rest" cfg.IngestKey = "1234-1234" - params := componenttest.NewNopExporterCreateSettings() + params := exportertest.NewNopCreateSettings() _, err := createLogsExporter(context.Background(), params, cfg) assert.NoError(t, err) } func TestCreateLogsExporterNoConfig(t *testing.T) { - params := componenttest.NewNopExporterCreateSettings() + params := exportertest.NewNopCreateSettings() _, err := createLogsExporter(context.Background(), params, nil) assert.Error(t, err) } @@ -80,7 +81,7 @@ func TestCreateLogsExporterNoConfig(t *testing.T) { func TestCreateLogsExporterInvalidEndpoint(t *testing.T) { cfg := createDefaultConfig().(*Config) cfg.IngestURL = "urn:something:12345" - params := componenttest.NewNopExporterCreateSettings() + params := exportertest.NewNopCreateSettings() _, err := createLogsExporter(context.Background(), params, cfg) assert.Error(t, err) } @@ -91,7 +92,7 @@ func TestCreateInstanceViaFactory(t *testing.T) { cfg := factory.CreateDefaultConfig().(*Config) cfg.IngestURL = "https://example.com:8088/otel/ingest/rest" cfg.IngestKey = "1234-1234" - params := componenttest.NewNopExporterCreateSettings() + params := exportertest.NewNopCreateSettings() exp, err := factory.CreateLogsExporter(context.Background(), params, cfg) assert.NoError(t, err) assert.NotNil(t, exp) diff --git a/exporter/mezmoexporter/go.mod b/exporter/mezmoexporter/go.mod index 267a37d131e6e..0426474575499 100644 --- a/exporter/mezmoexporter/go.mod +++ b/exporter/mezmoexporter/go.mod @@ -4,11 +4,11 @@ go 1.18 require ( github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector v0.67.0 + go.opentelemetry.io/collector/component v0.67.0 + go.opentelemetry.io/collector/confmap v0.67.0 + go.opentelemetry.io/collector/pdata v1.0.0-rc1 + go.opentelemetry.io/collector/semconv v0.67.0 go.uber.org/zap v1.24.0 ) @@ -32,8 +32,8 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rs/cors v1.8.2 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/consumer v0.67.0 // indirect + go.opentelemetry.io/collector/featuregate v0.67.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect diff --git a/exporter/mezmoexporter/go.sum b/exporter/mezmoexporter/go.sum index c6bf6530b1c54..fa6e4ca0f8ccd 100644 --- a/exporter/mezmoexporter/go.sum +++ b/exporter/mezmoexporter/go.sum @@ -289,20 +289,20 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 h1:Q5L9Urod3c8as6ZYaoaqBjarx/HXxsxy34DFZIU2fO4= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/component v0.67.0 h1:GCBRZAqk4yNaT4L1uwlbbwophFHrxYccLZ4Uj1Ifs/M= +go.opentelemetry.io/collector/component v0.67.0/go.mod h1:Txa2lm9oe7xsGQN8u7GdUIrRpAHFIKsTO4Qi3/CSmKk= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= +go.opentelemetry.io/collector/semconv v0.67.0 h1:zLAvcQa6Kgow52FFLrmk7/9ZVtEYyA73+xDtCcFG78Q= +go.opentelemetry.io/collector/semconv v0.67.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 h1:aUEBEdCa6iamGzg6fuYxDA8ThxvOG240mAvWDU+XLio= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4/go.mod h1:l2MdsbKTocpPS5nQZscqTR9jd8u96VYZdcpF8Sye7mA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= diff --git a/exporter/opencensusexporter/factory.go b/exporter/opencensusexporter/factory.go index c6a41c5066d07..6f0c19a7c73ec 100644 --- a/exporter/opencensusexporter/factory.go +++ b/exporter/opencensusexporter/factory.go @@ -21,6 +21,7 @@ import ( "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/configgrpc" "go.opentelemetry.io/collector/consumer" + "go.opentelemetry.io/collector/exporter" "go.opentelemetry.io/collector/exporter/exporterhelper" ) @@ -32,12 +33,12 @@ const ( ) // NewFactory creates a factory for OTLP exporter. -func NewFactory() component.ExporterFactory { - return component.NewExporterFactory( +func NewFactory() exporter.Factory { + return exporter.NewFactory( typeStr, createDefaultConfig, - component.WithTracesExporter(createTracesExporter, stability), - component.WithMetricsExporter(createMetricsExporter, stability)) + exporter.WithTraces(createTracesExporter, stability), + exporter.WithMetrics(createMetricsExporter, stability)) } func createDefaultConfig() component.Config { @@ -52,7 +53,7 @@ func createDefaultConfig() component.Config { } } -func createTracesExporter(ctx context.Context, set component.ExporterCreateSettings, cfg component.Config) (component.TracesExporter, error) { +func createTracesExporter(ctx context.Context, set exporter.CreateSettings, cfg component.Config) (exporter.Traces, error) { oCfg := cfg.(*Config) oce, err := newTracesExporter(ctx, oCfg, set.TelemetrySettings) if err != nil { @@ -71,7 +72,7 @@ func createTracesExporter(ctx context.Context, set component.ExporterCreateSetti exporterhelper.WithShutdown(oce.shutdown)) } -func createMetricsExporter(ctx context.Context, set component.ExporterCreateSettings, cfg component.Config) (component.MetricsExporter, error) { +func createMetricsExporter(ctx context.Context, set exporter.CreateSettings, cfg component.Config) (exporter.Metrics, error) { oCfg := cfg.(*Config) oce, err := newMetricsExporter(ctx, oCfg, set.TelemetrySettings) if err != nil { diff --git a/exporter/opencensusexporter/factory_test.go b/exporter/opencensusexporter/factory_test.go index fe3bfa41818a2..42732f248bd72 100644 --- a/exporter/opencensusexporter/factory_test.go +++ b/exporter/opencensusexporter/factory_test.go @@ -26,6 +26,7 @@ import ( "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/configgrpc" "go.opentelemetry.io/collector/config/configtls" + "go.opentelemetry.io/collector/exporter/exportertest" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/common/testutil" ) @@ -171,7 +172,7 @@ func TestCreateTracesExporter(t *testing.T) { for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { - set := componenttest.NewNopExporterCreateSettings() + set := exportertest.NewNopCreateSettings() tExporter, tErr := createTracesExporter(context.Background(), set, &tt.config) checkErrorsAndStartAndShutdown(t, tExporter, tErr, tt.mustFailOnCreate, tt.mustFailOnStart) mExporter, mErr := createMetricsExporter(context.Background(), set, &tt.config) diff --git a/exporter/opencensusexporter/go.mod b/exporter/opencensusexporter/go.mod index 59e9db76aa2d7..5482502cb9655 100644 --- a/exporter/opencensusexporter/go.mod +++ b/exporter/opencensusexporter/go.mod @@ -4,16 +4,16 @@ go 1.18 require ( github.com/census-instrumentation/opencensus-proto v0.4.1 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/opencensusreceiver v0.66.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/opencensusreceiver v0.67.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector v0.67.0 + go.opentelemetry.io/collector/component v0.67.0 + go.opentelemetry.io/collector/confmap v0.67.0 + go.opentelemetry.io/collector/consumer v0.67.0 + go.opentelemetry.io/collector/pdata v1.0.0-rc1 google.golang.org/grpc v1.51.0 ) @@ -36,13 +36,13 @@ require ( github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/mostynb/go-grpc-compression v1.1.17 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent v0.66.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent v0.67.0 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rs/cors v1.8.2 // indirect github.com/soheilhy/cmux v0.1.5 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect - go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/featuregate v0.67.0 // indirect + go.opentelemetry.io/collector/semconv v0.67.0 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect diff --git a/exporter/opencensusexporter/go.sum b/exporter/opencensusexporter/go.sum index 86c37d0505517..fcd8dacbf3461 100644 --- a/exporter/opencensusexporter/go.sum +++ b/exporter/opencensusexporter/go.sum @@ -320,20 +320,20 @@ go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/ go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 h1:Q5L9Urod3c8as6ZYaoaqBjarx/HXxsxy34DFZIU2fO4= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/component v0.67.0 h1:GCBRZAqk4yNaT4L1uwlbbwophFHrxYccLZ4Uj1Ifs/M= +go.opentelemetry.io/collector/component v0.67.0/go.mod h1:Txa2lm9oe7xsGQN8u7GdUIrRpAHFIKsTO4Qi3/CSmKk= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= +go.opentelemetry.io/collector/semconv v0.67.0 h1:zLAvcQa6Kgow52FFLrmk7/9ZVtEYyA73+xDtCcFG78Q= +go.opentelemetry.io/collector/semconv v0.67.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4 h1:PRXhsszxTt5bbPriTjmaweWUsAnJYeWBhUMLRetUgBU= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4/go.mod h1:05eWWy6ZWzmpeImD3UowLTB3VjDMU1yxQ+ENuVWDM3c= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= diff --git a/exporter/opencensusexporter/opencensus_test.go b/exporter/opencensusexporter/opencensus_test.go index 909068a4c39e6..8089a554cb9be 100644 --- a/exporter/opencensusexporter/opencensus_test.go +++ b/exporter/opencensusexporter/opencensus_test.go @@ -25,7 +25,9 @@ import ( "go.opentelemetry.io/collector/config/configgrpc" "go.opentelemetry.io/collector/config/configtls" "go.opentelemetry.io/collector/consumer/consumertest" + "go.opentelemetry.io/collector/exporter/exportertest" "go.opentelemetry.io/collector/pdata/ptrace" + "go.opentelemetry.io/collector/receiver/receivertest" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/common/testutil" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal/testdata" @@ -38,7 +40,7 @@ func TestSendTraces(t *testing.T) { rCfg := rFactory.CreateDefaultConfig().(*opencensusreceiver.Config) endpoint := testutil.GetAvailableLocalAddress(t) rCfg.GRPCServerSettings.NetAddr.Endpoint = endpoint - set := componenttest.NewNopReceiverCreateSettings() + set := receivertest.NewNopCreateSettings() recv, err := rFactory.CreateTracesReceiver(context.Background(), set, rCfg, sink) assert.NoError(t, err) assert.NoError(t, recv.Start(context.Background(), componenttest.NewNopHost())) @@ -55,7 +57,7 @@ func TestSendTraces(t *testing.T) { }, } cfg.NumWorkers = 1 - exp, err := factory.CreateTracesExporter(context.Background(), componenttest.NewNopExporterCreateSettings(), cfg) + exp, err := factory.CreateTracesExporter(context.Background(), exportertest.NewNopCreateSettings(), cfg) require.NoError(t, err) require.NotNil(t, exp) host := componenttest.NewNopHost() @@ -96,7 +98,7 @@ func TestSendTraces_NoBackend(t *testing.T) { Insecure: true, }, } - exp, err := factory.CreateTracesExporter(context.Background(), componenttest.NewNopExporterCreateSettings(), cfg) + exp, err := factory.CreateTracesExporter(context.Background(), exportertest.NewNopCreateSettings(), cfg) require.NoError(t, err) require.NotNil(t, exp) host := componenttest.NewNopHost() @@ -120,7 +122,7 @@ func TestSendTraces_AfterStop(t *testing.T) { Insecure: true, }, } - exp, err := factory.CreateTracesExporter(context.Background(), componenttest.NewNopExporterCreateSettings(), cfg) + exp, err := factory.CreateTracesExporter(context.Background(), exportertest.NewNopCreateSettings(), cfg) require.NoError(t, err) require.NotNil(t, exp) host := componenttest.NewNopHost() @@ -137,7 +139,7 @@ func TestSendMetrics(t *testing.T) { rCfg := rFactory.CreateDefaultConfig().(*opencensusreceiver.Config) endpoint := testutil.GetAvailableLocalAddress(t) rCfg.GRPCServerSettings.NetAddr.Endpoint = endpoint - set := componenttest.NewNopReceiverCreateSettings() + set := receivertest.NewNopCreateSettings() recv, err := rFactory.CreateMetricsReceiver(context.Background(), set, rCfg, sink) assert.NoError(t, err) assert.NoError(t, recv.Start(context.Background(), componenttest.NewNopHost())) @@ -154,7 +156,7 @@ func TestSendMetrics(t *testing.T) { }, } cfg.NumWorkers = 1 - exp, err := factory.CreateMetricsExporter(context.Background(), componenttest.NewNopExporterCreateSettings(), cfg) + exp, err := factory.CreateMetricsExporter(context.Background(), exportertest.NewNopCreateSettings(), cfg) require.NoError(t, err) require.NotNil(t, exp) host := componenttest.NewNopHost() @@ -193,7 +195,7 @@ func TestSendMetrics_NoBackend(t *testing.T) { Insecure: true, }, } - exp, err := factory.CreateMetricsExporter(context.Background(), componenttest.NewNopExporterCreateSettings(), cfg) + exp, err := factory.CreateMetricsExporter(context.Background(), exportertest.NewNopCreateSettings(), cfg) require.NoError(t, err) require.NotNil(t, exp) host := componenttest.NewNopHost() @@ -217,7 +219,7 @@ func TestSendMetrics_AfterStop(t *testing.T) { Insecure: true, }, } - exp, err := factory.CreateMetricsExporter(context.Background(), componenttest.NewNopExporterCreateSettings(), cfg) + exp, err := factory.CreateMetricsExporter(context.Background(), exportertest.NewNopCreateSettings(), cfg) require.NoError(t, err) require.NotNil(t, exp) host := componenttest.NewNopHost() diff --git a/exporter/parquetexporter/factory.go b/exporter/parquetexporter/factory.go index 4e95e946aea2f..9b82afc7e747b 100644 --- a/exporter/parquetexporter/factory.go +++ b/exporter/parquetexporter/factory.go @@ -19,6 +19,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" + "go.opentelemetry.io/collector/exporter" "go.opentelemetry.io/collector/exporter/exporterhelper" ) @@ -35,13 +36,13 @@ type Config struct { } // NewFactory creates a factory for the Parquet exporter. -func NewFactory() component.ExporterFactory { - return component.NewExporterFactory( +func NewFactory() exporter.Factory { + return exporter.NewFactory( typeStr, createDefaultConfig, - component.WithTracesExporter(createTracesExporter, stability), - component.WithMetricsExporter(createMetricsExporter, stability), - component.WithLogsExporter(createLogsExporter, stability)) + exporter.WithTraces(createTracesExporter, stability), + exporter.WithMetrics(createMetricsExporter, stability), + exporter.WithLogs(createLogsExporter, stability)) } func createDefaultConfig() component.Config { @@ -52,9 +53,9 @@ func createDefaultConfig() component.Config { func createTracesExporter( ctx context.Context, - set component.ExporterCreateSettings, + set exporter.CreateSettings, cfg component.Config, -) (component.TracesExporter, error) { +) (exporter.Traces, error) { fe := &parquetExporter{path: cfg.(*Config).Path} return exporterhelper.NewTracesExporter( ctx, @@ -68,9 +69,9 @@ func createTracesExporter( func createMetricsExporter( ctx context.Context, - set component.ExporterCreateSettings, + set exporter.CreateSettings, cfg component.Config, -) (component.MetricsExporter, error) { +) (exporter.Metrics, error) { fe := &parquetExporter{path: cfg.(*Config).Path} return exporterhelper.NewMetricsExporter( ctx, @@ -84,9 +85,9 @@ func createMetricsExporter( func createLogsExporter( ctx context.Context, - set component.ExporterCreateSettings, + set exporter.CreateSettings, cfg component.Config, -) (component.LogsExporter, error) { +) (exporter.Logs, error) { fe := &parquetExporter{path: cfg.(*Config).Path} return exporterhelper.NewLogsExporter( ctx, diff --git a/exporter/parquetexporter/go.mod b/exporter/parquetexporter/go.mod index d3b43983a1acd..cdd8f572a049c 100644 --- a/exporter/parquetexporter/go.mod +++ b/exporter/parquetexporter/go.mod @@ -3,9 +3,9 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/exporter/parque go 1.18 require ( - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector v0.67.0 + go.opentelemetry.io/collector/component v0.67.0 + go.opentelemetry.io/collector/pdata v1.0.0-rc1 ) require ( @@ -22,9 +22,9 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pelletier/go-toml v1.9.4 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a // indirect - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/confmap v0.67.0 // indirect + go.opentelemetry.io/collector/consumer v0.67.0 // indirect + go.opentelemetry.io/collector/featuregate v0.67.0 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/exporter/parquetexporter/go.sum b/exporter/parquetexporter/go.sum index 4a57eadcfa74f..5f1e5eeadd32c 100644 --- a/exporter/parquetexporter/go.sum +++ b/exporter/parquetexporter/go.sum @@ -278,18 +278,18 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/component v0.67.0 h1:GCBRZAqk4yNaT4L1uwlbbwophFHrxYccLZ4Uj1Ifs/M= +go.opentelemetry.io/collector/component v0.67.0/go.mod h1:Txa2lm9oe7xsGQN8u7GdUIrRpAHFIKsTO4Qi3/CSmKk= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/exporter/prometheusexporter/end_to_end_test.go b/exporter/prometheusexporter/end_to_end_test.go index fb64401f38747..8504e6f5a6c53 100644 --- a/exporter/prometheusexporter/end_to_end_test.go +++ b/exporter/prometheusexporter/end_to_end_test.go @@ -30,9 +30,10 @@ import ( promconfig "github.com/prometheus/prometheus/config" "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confighttp" + "go.opentelemetry.io/collector/exporter/exportertest" + "go.opentelemetry.io/collector/receiver/receivertest" "gopkg.in/yaml.v2" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver" @@ -78,7 +79,7 @@ func TestEndToEndSummarySupport(t *testing.T) { MetricExpiration: 2 * time.Hour, } exporterFactory := NewFactory() - set := componenttest.NewNopExporterCreateSettings() + set := exportertest.NewNopCreateSettings() exporter, err := exporterFactory.CreateMetricsExporter(ctx, set, exporterCfg) if err != nil { t.Fatal(err) @@ -107,7 +108,7 @@ func TestEndToEndSummarySupport(t *testing.T) { } receiverFactory := prometheusreceiver.NewFactory() - receiverCreateSet := componenttest.NewNopReceiverCreateSettings() + receiverCreateSet := receivertest.NewNopCreateSettings() rcvCfg := &prometheusreceiver.Config{ PrometheusConfig: receiverConfig, ReceiverSettings: config.NewReceiverSettings(component.NewID("prometheus")), diff --git a/exporter/prometheusexporter/factory.go b/exporter/prometheusexporter/factory.go index ad8b37245f15c..d67c035fe2db5 100644 --- a/exporter/prometheusexporter/factory.go +++ b/exporter/prometheusexporter/factory.go @@ -20,6 +20,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" + "go.opentelemetry.io/collector/exporter" "go.opentelemetry.io/collector/exporter/exporterhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry" @@ -33,11 +34,11 @@ const ( ) // NewFactory creates a new Prometheus exporter factory. -func NewFactory() component.ExporterFactory { - return component.NewExporterFactory( +func NewFactory() exporter.Factory { + return exporter.NewFactory( typeStr, createDefaultConfig, - component.WithMetricsExporter(createMetricsExporter, stability)) + exporter.WithMetrics(createMetricsExporter, stability)) } func createDefaultConfig() component.Config { @@ -52,9 +53,9 @@ func createDefaultConfig() component.Config { func createMetricsExporter( ctx context.Context, - set component.ExporterCreateSettings, + set exporter.CreateSettings, cfg component.Config, -) (component.MetricsExporter, error) { +) (exporter.Metrics, error) { pcfg := cfg.(*Config) prometheus, err := newPrometheusExporter(pcfg, set) @@ -75,12 +76,12 @@ func createMetricsExporter( } return &wrapMetricsExporter{ - MetricsExporter: resourcetotelemetry.WrapMetricsExporter(pcfg.ResourceToTelemetrySettings, exporter), - exporter: prometheus, + Metrics: resourcetotelemetry.WrapMetricsExporter(pcfg.ResourceToTelemetrySettings, exporter), + exporter: prometheus, }, nil } type wrapMetricsExporter struct { - component.MetricsExporter + exporter.Metrics exporter *prometheusExporter } diff --git a/exporter/prometheusexporter/factory_test.go b/exporter/prometheusexporter/factory_test.go index 9b20d1db38d6a..b549859e673c9 100644 --- a/exporter/prometheusexporter/factory_test.go +++ b/exporter/prometheusexporter/factory_test.go @@ -21,6 +21,7 @@ import ( "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) { @@ -35,7 +36,7 @@ func TestCreateMetricsExporter(t *testing.T) { oCfg.Endpoint = "" exp, err := createMetricsExporter( context.Background(), - componenttest.NewNopExporterCreateSettings(), + exportertest.NewNopCreateSettings(), cfg) require.Equal(t, errBlankPrometheusAddress, err) require.Nil(t, exp) @@ -47,7 +48,7 @@ func TestCreateMetricsExporterExportHelperError(t *testing.T) { cfg.Endpoint = "http://localhost:8889" - set := componenttest.NewNopExporterCreateSettings() + set := exportertest.NewNopCreateSettings() set.Logger = nil // Should give us an exporterhelper.errNilLogger diff --git a/exporter/prometheusexporter/go.mod b/exporter/prometheusexporter/go.mod index 7e41f39d25efb..7f6e2e05c7c36 100644 --- a/exporter/prometheusexporter/go.mod +++ b/exporter/prometheusexporter/go.mod @@ -3,20 +3,20 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/exporter/promet go 1.18 require ( - github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheus v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.66.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheus v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.67.0 github.com/prometheus/client_golang v1.14.0 github.com/prometheus/client_model v0.3.0 github.com/prometheus/common v0.37.0 github.com/prometheus/prometheus v0.40.5 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector v0.67.0 + go.opentelemetry.io/collector/component v0.67.0 + go.opentelemetry.io/collector/confmap v0.67.0 + go.opentelemetry.io/collector/pdata v1.0.0-rc1 + go.opentelemetry.io/collector/semconv v0.67.0 go.uber.org/zap v1.24.0 gopkg.in/yaml.v2 v2.4.0 ) @@ -128,8 +128,8 @@ require ( github.com/spf13/pflag v1.0.5 // indirect github.com/vultr/govultr/v2 v2.17.2 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/consumer v0.67.0 // indirect + go.opentelemetry.io/collector/featuregate v0.67.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect diff --git a/exporter/prometheusexporter/go.sum b/exporter/prometheusexporter/go.sum index f13c212f7cda4..92918fee39646 100644 --- a/exporter/prometheusexporter/go.sum +++ b/exporter/prometheusexporter/go.sum @@ -645,21 +645,21 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221202005155-1c54042beb70 h1:Y4e8NnVevonnAgmjX9Z7QIMA32yMqHAOnAlh8SzTS8c= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 h1:Q5L9Urod3c8as6ZYaoaqBjarx/HXxsxy34DFZIU2fO4= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/component v0.67.0 h1:GCBRZAqk4yNaT4L1uwlbbwophFHrxYccLZ4Uj1Ifs/M= +go.opentelemetry.io/collector/component v0.67.0/go.mod h1:Txa2lm9oe7xsGQN8u7GdUIrRpAHFIKsTO4Qi3/CSmKk= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= +go.opentelemetry.io/collector/processor/batchprocessor v0.67.0 h1:Qn4Ytth3q1trwTSAYYTzIRs4SBh9rz0xBou1nZB+Dko= +go.opentelemetry.io/collector/semconv v0.67.0 h1:zLAvcQa6Kgow52FFLrmk7/9ZVtEYyA73+xDtCcFG78Q= +go.opentelemetry.io/collector/semconv v0.67.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 h1:aUEBEdCa6iamGzg6fuYxDA8ThxvOG240mAvWDU+XLio= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4/go.mod h1:l2MdsbKTocpPS5nQZscqTR9jd8u96VYZdcpF8Sye7mA= go.opentelemetry.io/contrib/propagators/b3 v1.11.1 h1:icQ6ttRV+r/2fnU46BIo/g/mPu6Rs5Ug8Rtohe3KqzI= diff --git a/exporter/prometheusexporter/prometheus.go b/exporter/prometheusexporter/prometheus.go index 9650f2dfe9348..d1883f1e3297b 100644 --- a/exporter/prometheusexporter/prometheus.go +++ b/exporter/prometheusexporter/prometheus.go @@ -23,6 +23,7 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promhttp" "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/exporter" "go.opentelemetry.io/collector/pdata/pmetric" ) @@ -39,7 +40,7 @@ type prometheusExporter struct { var errBlankPrometheusAddress = errors.New("expecting a non-blank address to run the Prometheus metrics handler") -func newPrometheusExporter(config *Config, set component.ExporterCreateSettings) (*prometheusExporter, error) { +func newPrometheusExporter(config *Config, set exporter.CreateSettings) (*prometheusExporter, error) { addr := strings.TrimSpace(config.Endpoint) if strings.TrimSpace(config.Endpoint) == "" { return nil, errBlankPrometheusAddress diff --git a/exporter/prometheusexporter/prometheus_test.go b/exporter/prometheusexporter/prometheus_test.go index 619d06df78fe3..9e7f4db3d9e5d 100644 --- a/exporter/prometheusexporter/prometheus_test.go +++ b/exporter/prometheusexporter/prometheus_test.go @@ -30,6 +30,7 @@ import ( "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/config/configtls" + "go.opentelemetry.io/collector/exporter/exportertest" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" conventions "go.opentelemetry.io/collector/semconv/v1.6.1" @@ -77,7 +78,7 @@ func TestPrometheusExporter(t *testing.T) { } factory := NewFactory() - set := componenttest.NewNopExporterCreateSettings() + set := exportertest.NewNopCreateSettings() for _, tt := range tests { // Run it a few times to ensure that shutdowns exit cleanly. for j := 0; j < 3; j++ { @@ -131,7 +132,7 @@ func TestPrometheusExporter_WithTLS(t *testing.T) { }, } factory := NewFactory() - set := componenttest.NewNopExporterCreateSettings() + set := exportertest.NewNopCreateSettings() exp, err := factory.CreateMetricsExporter(context.Background(), set, cfg) require.NoError(t, err) @@ -207,7 +208,7 @@ func TestPrometheusExporter_endToEndMultipleTargets(t *testing.T) { } factory := NewFactory() - set := componenttest.NewNopExporterCreateSettings() + set := exportertest.NewNopCreateSettings() exp, err := factory.CreateMetricsExporter(context.Background(), set, cfg) assert.NoError(t, err) @@ -290,7 +291,7 @@ func TestPrometheusExporter_endToEnd(t *testing.T) { } factory := NewFactory() - set := componenttest.NewNopExporterCreateSettings() + set := exportertest.NewNopCreateSettings() exp, err := factory.CreateMetricsExporter(context.Background(), set, cfg) assert.NoError(t, err) @@ -368,7 +369,7 @@ func TestPrometheusExporter_endToEndWithTimestamps(t *testing.T) { } factory := NewFactory() - set := componenttest.NewNopExporterCreateSettings() + set := exportertest.NewNopCreateSettings() exp, err := factory.CreateMetricsExporter(context.Background(), set, cfg) assert.NoError(t, err) @@ -449,7 +450,7 @@ func TestPrometheusExporter_endToEndWithResource(t *testing.T) { } factory := NewFactory() - set := componenttest.NewNopExporterCreateSettings() + set := exportertest.NewNopCreateSettings() exp, err := factory.CreateMetricsExporter(context.Background(), set, cfg) assert.NoError(t, err) diff --git a/exporter/prometheusremotewriteexporter/exporter.go b/exporter/prometheusremotewriteexporter/exporter.go index 7b3726b6ef80c..e806d460f379e 100644 --- a/exporter/prometheusremotewriteexporter/exporter.go +++ b/exporter/prometheusremotewriteexporter/exporter.go @@ -32,6 +32,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/consumer/consumererror" + "go.opentelemetry.io/collector/exporter" "go.opentelemetry.io/collector/pdata/pmetric" "go.uber.org/multierr" @@ -59,7 +60,7 @@ type prwExporter struct { } // newPRWExporter initializes a new prwExporter instance and sets fields accordingly. -func newPRWExporter(cfg *Config, set component.ExporterCreateSettings) (*prwExporter, error) { +func newPRWExporter(cfg *Config, set exporter.CreateSettings) (*prwExporter, error) { sanitizedLabels, err := validateAndSanitizeExternalLabels(cfg) if err != nil { return nil, err diff --git a/exporter/prometheusremotewriteexporter/exporter_test.go b/exporter/prometheusremotewriteexporter/exporter_test.go index 14ab9a5565bca..49526da7289c1 100644 --- a/exporter/prometheusremotewriteexporter/exporter_test.go +++ b/exporter/prometheusremotewriteexporter/exporter_test.go @@ -35,7 +35,9 @@ import ( "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/config/configtls" + "go.opentelemetry.io/collector/exporter" "go.opentelemetry.io/collector/exporter/exporterhelper" + "go.opentelemetry.io/collector/exporter/exportertest" "go.opentelemetry.io/collector/pdata/pmetric" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal/testdata" @@ -58,7 +60,7 @@ func Test_NewPRWExporter(t *testing.T) { Description: "OpenTelemetry Collector", Version: "1.0", } - set := componenttest.NewNopExporterCreateSettings() + set := exportertest.NewNopCreateSettings() set.BuildInfo = buildInfo tests := []struct { @@ -69,7 +71,7 @@ func Test_NewPRWExporter(t *testing.T) { concurrency int externalLabels map[string]string returnErrorOnCreate bool - set component.ExporterCreateSettings + set exporter.CreateSettings }{ { name: "invalid_URL", @@ -152,7 +154,7 @@ func Test_Start(t *testing.T) { Description: "OpenTelemetry Collector", Version: "1.0", } - set := componenttest.NewNopExporterCreateSettings() + set := exportertest.NewNopCreateSettings() set.BuildInfo = buildInfo tests := []struct { name string @@ -161,7 +163,7 @@ func Test_Start(t *testing.T) { concurrency int externalLabels map[string]string returnErrorOnStartUp bool - set component.ExporterCreateSettings + set exporter.CreateSettings endpoint string clientSettings confighttp.HTTPClientSettings }{ @@ -355,7 +357,7 @@ func runExportPipeline(ts *prompb.TimeSeries, endpoint *url.URL) error { Description: "OpenTelemetry Collector", Version: "1.0", } - set := componenttest.NewNopExporterCreateSettings() + set := exportertest.NewNopCreateSettings() set.BuildInfo = buildInfo // after this, instantiate a CortexExporter with the current HTTP client and endpoint set to passed in endpoint prwe, err := newPRWExporter(cfg, set) @@ -667,7 +669,7 @@ func Test_PushMetrics(t *testing.T) { Description: "OpenTelemetry Collector", Version: "1.0", } - set := componenttest.NewNopExporterCreateSettings() + set := exportertest.NewNopCreateSettings() set.BuildInfo = buildInfo prwe, nErr := newPRWExporter(cfg, set) require.NoError(t, nErr) @@ -841,7 +843,7 @@ func TestWALOnExporterRoundTrip(t *testing.T) { }, } - set := componenttest.NewNopExporterCreateSettings() + set := exportertest.NewNopCreateSettings() set.BuildInfo = component.BuildInfo{ Description: "OpenTelemetry Collector", Version: "1.0", diff --git a/exporter/prometheusremotewriteexporter/factory.go b/exporter/prometheusremotewriteexporter/factory.go index 125520172037b..7b5ec8653f17f 100644 --- a/exporter/prometheusremotewriteexporter/factory.go +++ b/exporter/prometheusremotewriteexporter/factory.go @@ -22,6 +22,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confighttp" + "go.opentelemetry.io/collector/exporter" "go.opentelemetry.io/collector/exporter/exporterhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry" @@ -35,15 +36,15 @@ const ( ) // NewFactory creates a new Prometheus Remote Write exporter. -func NewFactory() component.ExporterFactory { - return component.NewExporterFactory( +func NewFactory() exporter.Factory { + return exporter.NewFactory( typeStr, createDefaultConfig, - component.WithMetricsExporter(createMetricsExporter, stability)) + exporter.WithMetrics(createMetricsExporter, stability)) } -func createMetricsExporter(ctx context.Context, set component.ExporterCreateSettings, - cfg component.Config) (component.MetricsExporter, error) { +func createMetricsExporter(ctx context.Context, set exporter.CreateSettings, + cfg component.Config) (exporter.Metrics, error) { prwCfg, ok := cfg.(*Config) if !ok { diff --git a/exporter/prometheusremotewriteexporter/factory_test.go b/exporter/prometheusremotewriteexporter/factory_test.go index fa693c32ef646..a978b892cf761 100644 --- a/exporter/prometheusremotewriteexporter/factory_test.go +++ b/exporter/prometheusremotewriteexporter/factory_test.go @@ -23,6 +23,8 @@ import ( "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/config/configtls" + "go.opentelemetry.io/collector/exporter" + "go.opentelemetry.io/collector/exporter/exportertest" ) // Tests whether or not the default Exporter factory can instantiate a properly interfaced Exporter with default conditions @@ -50,31 +52,31 @@ func Test_createMetricsExporter(t *testing.T) { tests := []struct { name string cfg component.Config - set component.ExporterCreateSettings + set exporter.CreateSettings returnErrorOnCreate bool returnErrorOnStart bool }{ {"success_case", createDefaultConfig(), - componenttest.NewNopExporterCreateSettings(), + exportertest.NewNopCreateSettings(), false, false, }, {"fail_case", nil, - componenttest.NewNopExporterCreateSettings(), + exportertest.NewNopCreateSettings(), true, false, }, {"invalid_config_case", invalidConfig, - componenttest.NewNopExporterCreateSettings(), + exportertest.NewNopCreateSettings(), true, false, }, {"invalid_tls_config_case", invalidTLSConfig, - componenttest.NewNopExporterCreateSettings(), + exportertest.NewNopCreateSettings(), false, true, }, diff --git a/exporter/prometheusremotewriteexporter/go.mod b/exporter/prometheusremotewriteexporter/go.mod index 3fac96248aed6..a0fc6dc31807d 100644 --- a/exporter/prometheusremotewriteexporter/go.mod +++ b/exporter/prometheusremotewriteexporter/go.mod @@ -6,18 +6,18 @@ require ( github.com/fsnotify/fsnotify v1.6.0 github.com/gogo/protobuf v1.3.2 github.com/golang/snappy v0.0.4 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheus v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheusremotewrite v0.66.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheus v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheusremotewrite v0.67.0 github.com/prometheus/prometheus v0.40.5 github.com/stretchr/testify v1.8.1 github.com/tidwall/wal v1.1.7 - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector v0.67.0 + go.opentelemetry.io/collector/component v0.67.0 + go.opentelemetry.io/collector/confmap v0.67.0 + go.opentelemetry.io/collector/consumer v0.67.0 + go.opentelemetry.io/collector/pdata v1.0.0-rc1 go.uber.org/atomic v1.10.0 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.24.0 @@ -46,8 +46,8 @@ require ( github.com/tidwall/pretty v1.2.0 // indirect github.com/tidwall/tinylru v1.1.0 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect - go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/featuregate v0.67.0 // indirect + go.opentelemetry.io/collector/semconv v0.67.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect diff --git a/exporter/prometheusremotewriteexporter/go.sum b/exporter/prometheusremotewriteexporter/go.sum index 557ff7bd15190..ec0eced400fbd 100644 --- a/exporter/prometheusremotewriteexporter/go.sum +++ b/exporter/prometheusremotewriteexporter/go.sum @@ -378,20 +378,20 @@ go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 h1:Q5L9Urod3c8as6ZYaoaqBjarx/HXxsxy34DFZIU2fO4= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/component v0.67.0 h1:GCBRZAqk4yNaT4L1uwlbbwophFHrxYccLZ4Uj1Ifs/M= +go.opentelemetry.io/collector/component v0.67.0/go.mod h1:Txa2lm9oe7xsGQN8u7GdUIrRpAHFIKsTO4Qi3/CSmKk= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= +go.opentelemetry.io/collector/semconv v0.67.0 h1:zLAvcQa6Kgow52FFLrmk7/9ZVtEYyA73+xDtCcFG78Q= +go.opentelemetry.io/collector/semconv v0.67.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 h1:aUEBEdCa6iamGzg6fuYxDA8ThxvOG240mAvWDU+XLio= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4/go.mod h1:l2MdsbKTocpPS5nQZscqTR9jd8u96VYZdcpF8Sye7mA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= diff --git a/exporter/pulsarexporter/factory.go b/exporter/pulsarexporter/factory.go index a44cc1d72cce7..44fc895060b03 100644 --- a/exporter/pulsarexporter/factory.go +++ b/exporter/pulsarexporter/factory.go @@ -20,6 +20,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer" + "go.opentelemetry.io/collector/exporter" "go.opentelemetry.io/collector/exporter/exporterhelper" ) @@ -48,7 +49,7 @@ func WithTracesMarshalers(tracesMarshalers ...TracesMarshaler) FactoryOption { } // NewFactory creates Pulsar exporter factory. -func NewFactory(options ...FactoryOption) component.ExporterFactory { +func NewFactory(options ...FactoryOption) exporter.Factory { f := &pulsarExporterFactory{ tracesMarshalers: tracesMarshalers(), metricsMarshalers: metricsMarshalers(), @@ -57,12 +58,12 @@ func NewFactory(options ...FactoryOption) component.ExporterFactory { for _, o := range options { o(f) } - return component.NewExporterFactory( + return exporter.NewFactory( typeStr, createDefaultConfig, - component.WithTracesExporter(f.createTracesExporter, stability), - component.WithMetricsExporter(f.createMetricsExporter, stability), - component.WithLogsExporter(f.createLogsExporter, stability), + exporter.WithTraces(f.createTracesExporter, stability), + exporter.WithMetrics(f.createMetricsExporter, stability), + exporter.WithLogs(f.createLogsExporter, stability), ) } @@ -88,9 +89,9 @@ type pulsarExporterFactory struct { func (f *pulsarExporterFactory) createTracesExporter( ctx context.Context, - set component.ExporterCreateSettings, + set exporter.CreateSettings, cfg component.Config, -) (component.TracesExporter, error) { +) (exporter.Traces, error) { oCfg := *(cfg.(*Config)) if oCfg.Topic == "" { oCfg.Topic = defaultTracesTopic @@ -118,9 +119,9 @@ func (f *pulsarExporterFactory) createTracesExporter( func (f *pulsarExporterFactory) createMetricsExporter( ctx context.Context, - set component.ExporterCreateSettings, + set exporter.CreateSettings, cfg component.Config, -) (component.MetricsExporter, error) { +) (exporter.Metrics, error) { oCfg := *(cfg.(*Config)) if oCfg.Topic == "" { oCfg.Topic = defaultMetricsTopic @@ -148,9 +149,9 @@ func (f *pulsarExporterFactory) createMetricsExporter( func (f *pulsarExporterFactory) createLogsExporter( ctx context.Context, - set component.ExporterCreateSettings, + set exporter.CreateSettings, cfg component.Config, -) (component.LogsExporter, error) { +) (exporter.Logs, error) { oCfg := *(cfg.(*Config)) if oCfg.Topic == "" { oCfg.Topic = defaultLogsTopic diff --git a/exporter/pulsarexporter/factory_test.go b/exporter/pulsarexporter/factory_test.go index 8437a9e54651f..1220a6922184c 100644 --- a/exporter/pulsarexporter/factory_test.go +++ b/exporter/pulsarexporter/factory_test.go @@ -21,9 +21,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/exporter/exporterhelper" + "go.opentelemetry.io/collector/exporter/exportertest" ) func Test_createDefaultConfig(t *testing.T) { @@ -46,7 +46,7 @@ func TestCreateTracesExporter_err(t *testing.T) { cfg.Endpoint = "" f := pulsarExporterFactory{tracesMarshalers: tracesMarshalers()} - r, err := f.createTracesExporter(context.Background(), componenttest.NewNopExporterCreateSettings(), cfg) + r, err := f.createTracesExporter(context.Background(), exportertest.NewNopCreateSettings(), cfg) // no available broker require.Error(t, err) assert.Nil(t, r) @@ -57,7 +57,7 @@ func TestCreateMetricsExporter_err(t *testing.T) { cfg.Endpoint = "" mf := pulsarExporterFactory{metricsMarshalers: metricsMarshalers()} - mr, err := mf.createMetricsExporter(context.Background(), componenttest.NewNopExporterCreateSettings(), cfg) + mr, err := mf.createMetricsExporter(context.Background(), exportertest.NewNopCreateSettings(), cfg) require.Error(t, err) assert.Nil(t, mr) } @@ -67,7 +67,7 @@ func TestCreateLogsExporter_err(t *testing.T) { cfg.Endpoint = "" mf := pulsarExporterFactory{logsMarshalers: logsMarshalers()} - mr, err := mf.createLogsExporter(context.Background(), componenttest.NewNopExporterCreateSettings(), cfg) + mr, err := mf.createLogsExporter(context.Background(), exportertest.NewNopCreateSettings(), cfg) require.Error(t, err) assert.Nil(t, mr) } diff --git a/exporter/pulsarexporter/go.mod b/exporter/pulsarexporter/go.mod index ed65886755b4c..319fe5d990a3c 100644 --- a/exporter/pulsarexporter/go.mod +++ b/exporter/pulsarexporter/go.mod @@ -6,15 +6,15 @@ require ( github.com/apache/pulsar-client-go v0.8.1 github.com/gogo/protobuf v1.3.2 github.com/jaegertracing/jaeger v1.39.1-0.20221110195127-14c11365a856 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.66.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.67.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector v0.67.0 + go.opentelemetry.io/collector/component v0.67.0 + go.opentelemetry.io/collector/confmap v0.67.0 + go.opentelemetry.io/collector/consumer v0.67.0 + go.opentelemetry.io/collector/pdata v1.0.0-rc1 + go.opentelemetry.io/collector/semconv v0.67.0 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.24.0 ) @@ -65,7 +65,7 @@ require ( github.com/uber/jaeger-client-go v2.30.0+incompatible // indirect github.com/uber/jaeger-lib v2.4.1+incompatible // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/featuregate v0.67.0 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/exporter/pulsarexporter/go.sum b/exporter/pulsarexporter/go.sum index ee5ae2ed79bf2..338a79b49773c 100644 --- a/exporter/pulsarexporter/go.sum +++ b/exporter/pulsarexporter/go.sum @@ -496,20 +496,20 @@ go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 h1:Q5L9Urod3c8as6ZYaoaqBjarx/HXxsxy34DFZIU2fO4= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/component v0.67.0 h1:GCBRZAqk4yNaT4L1uwlbbwophFHrxYccLZ4Uj1Ifs/M= +go.opentelemetry.io/collector/component v0.67.0/go.mod h1:Txa2lm9oe7xsGQN8u7GdUIrRpAHFIKsTO4Qi3/CSmKk= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= +go.opentelemetry.io/collector/semconv v0.67.0 h1:zLAvcQa6Kgow52FFLrmk7/9ZVtEYyA73+xDtCcFG78Q= +go.opentelemetry.io/collector/semconv v0.67.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/exporter/pulsarexporter/pulsar_exporter.go b/exporter/pulsarexporter/pulsar_exporter.go index 753867533e2b6..ede3d97a8161f 100644 --- a/exporter/pulsarexporter/pulsar_exporter.go +++ b/exporter/pulsarexporter/pulsar_exporter.go @@ -19,8 +19,8 @@ import ( "fmt" "github.com/apache/pulsar-client-go/pulsar" - "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/consumer/consumererror" + "go.opentelemetry.io/collector/exporter" "go.opentelemetry.io/collector/pdata/plog" "go.opentelemetry.io/collector/pdata/pmetric" "go.opentelemetry.io/collector/pdata/ptrace" @@ -153,7 +153,7 @@ func newPulsarProducer(config Config) (pulsar.Client, pulsar.Producer, error) { return client, producer, nil } -func newMetricsExporter(config Config, set component.ExporterCreateSettings, marshalers map[string]MetricsMarshaler) (*PulsarMetricsProducer, error) { +func newMetricsExporter(config Config, set exporter.CreateSettings, marshalers map[string]MetricsMarshaler) (*PulsarMetricsProducer, error) { marshaler := marshalers[config.Encoding] if marshaler == nil { return nil, errUnrecognizedEncoding @@ -173,7 +173,7 @@ func newMetricsExporter(config Config, set component.ExporterCreateSettings, mar } -func newTracesExporter(config Config, set component.ExporterCreateSettings, marshalers map[string]TracesMarshaler) (*PulsarTracesProducer, error) { +func newTracesExporter(config Config, set exporter.CreateSettings, marshalers map[string]TracesMarshaler) (*PulsarTracesProducer, error) { marshaler := marshalers[config.Encoding] if marshaler == nil { return nil, errUnrecognizedEncoding @@ -191,7 +191,7 @@ func newTracesExporter(config Config, set component.ExporterCreateSettings, mars }, nil } -func newLogsExporter(config Config, set component.ExporterCreateSettings, marshalers map[string]LogsMarshaler) (*PulsarLogsProducer, error) { +func newLogsExporter(config Config, set exporter.CreateSettings, marshalers map[string]LogsMarshaler) (*PulsarLogsProducer, error) { marshaler := marshalers[config.Encoding] if marshaler == nil { return nil, errUnrecognizedEncoding diff --git a/exporter/pulsarexporter/pulsar_exporter_test.go b/exporter/pulsarexporter/pulsar_exporter_test.go index 436b7d4668e9f..9344e9c974f22 100644 --- a/exporter/pulsarexporter/pulsar_exporter_test.go +++ b/exporter/pulsarexporter/pulsar_exporter_test.go @@ -21,8 +21,8 @@ import ( "github.com/apache/pulsar-client-go/pulsar" "github.com/stretchr/testify/assert" - "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/consumer/consumererror" + "go.opentelemetry.io/collector/exporter/exportertest" "go.opentelemetry.io/collector/pdata/ptrace" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal/testdata" @@ -30,14 +30,14 @@ import ( func TestNewMetricsExporter_err_encoding(t *testing.T) { c := Config{Encoding: "bar"} - mexp, err := newMetricsExporter(c, componenttest.NewNopExporterCreateSettings(), metricsMarshalers()) + mexp, err := newMetricsExporter(c, exportertest.NewNopCreateSettings(), metricsMarshalers()) assert.EqualError(t, err, errUnrecognizedEncoding.Error()) assert.Nil(t, mexp) } func TestNewMetricsExporter_err_traces_encoding(t *testing.T) { c := Config{Encoding: "jaeger_proto"} - mexp, err := newMetricsExporter(c, componenttest.NewNopExporterCreateSettings(), metricsMarshalers()) + mexp, err := newMetricsExporter(c, exportertest.NewNopCreateSettings(), metricsMarshalers()) assert.EqualError(t, err, errUnrecognizedEncoding.Error()) assert.Nil(t, mexp) @@ -45,14 +45,14 @@ func TestNewMetricsExporter_err_traces_encoding(t *testing.T) { func TestNewLogsExporter_err_encoding(t *testing.T) { c := Config{Encoding: "bar"} - mexp, err := newLogsExporter(c, componenttest.NewNopExporterCreateSettings(), logsMarshalers()) + mexp, err := newLogsExporter(c, exportertest.NewNopCreateSettings(), logsMarshalers()) assert.EqualError(t, err, errUnrecognizedEncoding.Error()) assert.Nil(t, mexp) } func TestNewLogsExporter_err_traces_encoding(t *testing.T) { c := Config{Encoding: "jaeger_proto"} - mexp, err := newLogsExporter(c, componenttest.NewNopExporterCreateSettings(), logsMarshalers()) + mexp, err := newLogsExporter(c, exportertest.NewNopCreateSettings(), logsMarshalers()) assert.EqualError(t, err, errUnrecognizedEncoding.Error()) assert.Nil(t, mexp) } diff --git a/exporter/sapmexporter/exporter.go b/exporter/sapmexporter/exporter.go index b65ab1581c89c..36bb58e24a35f 100644 --- a/exporter/sapmexporter/exporter.go +++ b/exporter/sapmexporter/exporter.go @@ -24,6 +24,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/consumer/consumererror" + "go.opentelemetry.io/collector/exporter" "go.opentelemetry.io/collector/exporter/exporterhelper" "go.opentelemetry.io/collector/pdata/ptrace" "go.uber.org/zap" @@ -51,7 +52,7 @@ func (se *sapmExporter) Shutdown(context.Context) error { return nil } -func newSAPMExporter(cfg *Config, params component.ExporterCreateSettings) (sapmExporter, error) { +func newSAPMExporter(cfg *Config, params exporter.CreateSettings) (sapmExporter, error) { err := cfg.validate() if err != nil { return sapmExporter{}, err @@ -69,7 +70,7 @@ func newSAPMExporter(cfg *Config, params component.ExporterCreateSettings) (sapm }, err } -func newSAPMTracesExporter(cfg *Config, set component.ExporterCreateSettings) (component.TracesExporter, error) { +func newSAPMTracesExporter(cfg *Config, set exporter.CreateSettings) (exporter.Traces, error) { se, err := newSAPMExporter(cfg, set) if err != nil { return nil, err diff --git a/exporter/sapmexporter/exporter_test.go b/exporter/sapmexporter/exporter_test.go index 34792b8369fc3..4e9907a292799 100644 --- a/exporter/sapmexporter/exporter_test.go +++ b/exporter/sapmexporter/exporter_test.go @@ -27,8 +27,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" + "go.opentelemetry.io/collector/exporter/exportertest" "go.opentelemetry.io/collector/pdata/ptrace" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/splunk" @@ -47,7 +47,7 @@ func TestCreateTracesExporter(t *testing.T) { AccessTokenPassthrough: true, }, } - params := componenttest.NewNopExporterCreateSettings() + params := exportertest.NewNopCreateSettings() te, err := newSAPMTracesExporter(cfg, params) assert.Nil(t, err) @@ -58,7 +58,7 @@ func TestCreateTracesExporter(t *testing.T) { func TestCreateTracesExporterWithInvalidConfig(t *testing.T) { cfg := &Config{} - params := componenttest.NewNopExporterCreateSettings() + params := exportertest.NewNopCreateSettings() te, err := newSAPMTracesExporter(cfg, params) require.Error(t, err) assert.Nil(t, te) @@ -210,7 +210,7 @@ func TestSAPMClientTokenUsageAndErrorMarshalling(t *testing.T) { AccessTokenPassthrough: tt.accessTokenPassthrough, }, } - params := componenttest.NewNopExporterCreateSettings() + params := exportertest.NewNopCreateSettings() se, err := newSAPMExporter(cfg, params) assert.Nil(t, err) diff --git a/exporter/sapmexporter/factory.go b/exporter/sapmexporter/factory.go index f0c7a26e3798d..d30a5a9461ed3 100644 --- a/exporter/sapmexporter/factory.go +++ b/exporter/sapmexporter/factory.go @@ -19,6 +19,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" + "go.opentelemetry.io/collector/exporter" "go.opentelemetry.io/collector/exporter/exporterhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/splunk" @@ -32,11 +33,11 @@ const ( ) // NewFactory creates a factory for SAPM exporter. -func NewFactory() component.ExporterFactory { - return component.NewExporterFactory( +func NewFactory() exporter.Factory { + return exporter.NewFactory( typeStr, createDefaultConfig, - component.WithTracesExporter(createTracesExporter, stability)) + exporter.WithTraces(createTracesExporter, stability)) } func createDefaultConfig() component.Config { @@ -54,9 +55,9 @@ func createDefaultConfig() component.Config { func createTracesExporter( _ context.Context, - params component.ExporterCreateSettings, + params exporter.CreateSettings, cfg component.Config, -) (component.TracesExporter, error) { +) (exporter.Traces, error) { eCfg := cfg.(*Config) return newSAPMTracesExporter(eCfg, params) } diff --git a/exporter/sapmexporter/factory_test.go b/exporter/sapmexporter/factory_test.go index cb67c8f63fe4b..b111790b1ec26 100644 --- a/exporter/sapmexporter/factory_test.go +++ b/exporter/sapmexporter/factory_test.go @@ -20,6 +20,7 @@ import ( "github.com/stretchr/testify/assert" "go.opentelemetry.io/collector/component/componenttest" + "go.opentelemetry.io/collector/exporter/exportertest" ) func TestCreateDefaultConfig(t *testing.T) { @@ -36,7 +37,7 @@ func TestCreateExporter(t *testing.T) { cfg := factory.CreateDefaultConfig() eCfg := cfg.(*Config) eCfg.Endpoint = "http://local" - params := componenttest.NewNopExporterCreateSettings() + params := exportertest.NewNopCreateSettings() te, err := factory.CreateTracesExporter(context.Background(), params, eCfg) assert.Nil(t, err) diff --git a/exporter/sapmexporter/go.mod b/exporter/sapmexporter/go.mod index 3badb24a00514..667fb115a250c 100644 --- a/exporter/sapmexporter/go.mod +++ b/exporter/sapmexporter/go.mod @@ -4,16 +4,16 @@ go 1.18 require ( github.com/jaegertracing/jaeger v1.39.1-0.20221110195127-14c11365a856 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/splunk v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchperresourceattr v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.66.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/splunk v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchperresourceattr v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.67.0 github.com/signalfx/sapm-proto v0.12.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector v0.67.0 + go.opentelemetry.io/collector/component v0.67.0 + go.opentelemetry.io/collector/confmap v0.67.0 + go.opentelemetry.io/collector/consumer v0.67.0 + go.opentelemetry.io/collector/pdata v1.0.0-rc1 go.uber.org/zap v1.24.0 ) @@ -33,14 +33,14 @@ require ( github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.66.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.67.0 // indirect github.com/opentracing/opentracing-go v1.2.0 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/uber/jaeger-client-go v2.30.0+incompatible // indirect github.com/uber/jaeger-lib v2.4.1+incompatible // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect - go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/featuregate v0.67.0 // indirect + go.opentelemetry.io/collector/semconv v0.67.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect diff --git a/exporter/sapmexporter/go.sum b/exporter/sapmexporter/go.sum index 6710e4ebd9df5..f2052ec3dd620 100644 --- a/exporter/sapmexporter/go.sum +++ b/exporter/sapmexporter/go.sum @@ -292,20 +292,20 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 h1:Q5L9Urod3c8as6ZYaoaqBjarx/HXxsxy34DFZIU2fO4= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/component v0.67.0 h1:GCBRZAqk4yNaT4L1uwlbbwophFHrxYccLZ4Uj1Ifs/M= +go.opentelemetry.io/collector/component v0.67.0/go.mod h1:Txa2lm9oe7xsGQN8u7GdUIrRpAHFIKsTO4Qi3/CSmKk= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= +go.opentelemetry.io/collector/semconv v0.67.0 h1:zLAvcQa6Kgow52FFLrmk7/9ZVtEYyA73+xDtCcFG78Q= +go.opentelemetry.io/collector/semconv v0.67.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 h1:aUEBEdCa6iamGzg6fuYxDA8ThxvOG240mAvWDU+XLio= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4/go.mod h1:l2MdsbKTocpPS5nQZscqTR9jd8u96VYZdcpF8Sye7mA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= diff --git a/exporter/sentryexporter/factory.go b/exporter/sentryexporter/factory.go index c1aaec096b0aa..81bf1eb802c9e 100644 --- a/exporter/sentryexporter/factory.go +++ b/exporter/sentryexporter/factory.go @@ -20,6 +20,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" + "go.opentelemetry.io/collector/exporter" ) const ( @@ -29,11 +30,11 @@ const ( ) // NewFactory creates a factory for Sentry exporter. -func NewFactory() component.ExporterFactory { - return component.NewExporterFactory( +func NewFactory() exporter.Factory { + return exporter.NewFactory( typeStr, createDefaultConfig, - component.WithTracesExporter(createTracesExporter, stability), + exporter.WithTraces(createTracesExporter, stability), ) } @@ -45,9 +46,9 @@ func createDefaultConfig() component.Config { func createTracesExporter( _ context.Context, - params component.ExporterCreateSettings, + params exporter.CreateSettings, config component.Config, -) (component.TracesExporter, error) { +) (exporter.Traces, error) { sentryConfig, ok := config.(*Config) if !ok { return nil, fmt.Errorf("unexpected config type: %T", config) diff --git a/exporter/sentryexporter/factory_test.go b/exporter/sentryexporter/factory_test.go index c5bff786ff8b8..87b37014ceaf0 100644 --- a/exporter/sentryexporter/factory_test.go +++ b/exporter/sentryexporter/factory_test.go @@ -20,6 +20,7 @@ import ( "github.com/stretchr/testify/assert" "go.opentelemetry.io/collector/component/componenttest" + "go.opentelemetry.io/collector/exporter/exportertest" ) func TestCreateDefaultConfig(t *testing.T) { @@ -35,7 +36,7 @@ func TestCreateExporter(t *testing.T) { cfg := factory.CreateDefaultConfig() eCfg := cfg.(*Config) - params := componenttest.NewNopExporterCreateSettings() + params := exportertest.NewNopCreateSettings() te, err := factory.CreateTracesExporter(context.Background(), params, eCfg) assert.Nil(t, err) diff --git a/exporter/sentryexporter/go.mod b/exporter/sentryexporter/go.mod index 8783b90da70fa..01172c1db9187 100644 --- a/exporter/sentryexporter/go.mod +++ b/exporter/sentryexporter/go.mod @@ -5,13 +5,13 @@ go 1.18 require ( github.com/getsentry/sentry-go v0.16.0 github.com/google/go-cmp v0.5.9 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.66.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.67.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector v0.67.0 + go.opentelemetry.io/collector/component v0.67.0 + go.opentelemetry.io/collector/confmap v0.67.0 + go.opentelemetry.io/collector/pdata v1.0.0-rc1 + go.opentelemetry.io/collector/semconv v0.67.0 ) require ( @@ -30,8 +30,8 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rogpeppe/go-internal v1.6.1 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/consumer v0.67.0 // indirect + go.opentelemetry.io/collector/featuregate v0.67.0 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/exporter/sentryexporter/go.sum b/exporter/sentryexporter/go.sum index 31a845c4abb5a..9506737abe40d 100644 --- a/exporter/sentryexporter/go.sum +++ b/exporter/sentryexporter/go.sum @@ -280,20 +280,20 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 h1:Q5L9Urod3c8as6ZYaoaqBjarx/HXxsxy34DFZIU2fO4= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/component v0.67.0 h1:GCBRZAqk4yNaT4L1uwlbbwophFHrxYccLZ4Uj1Ifs/M= +go.opentelemetry.io/collector/component v0.67.0/go.mod h1:Txa2lm9oe7xsGQN8u7GdUIrRpAHFIKsTO4Qi3/CSmKk= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= +go.opentelemetry.io/collector/semconv v0.67.0 h1:zLAvcQa6Kgow52FFLrmk7/9ZVtEYyA73+xDtCcFG78Q= +go.opentelemetry.io/collector/semconv v0.67.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/exporter/sentryexporter/sentry_exporter.go b/exporter/sentryexporter/sentry_exporter.go index d93ec7c870791..64aca107dd402 100644 --- a/exporter/sentryexporter/sentry_exporter.go +++ b/exporter/sentryexporter/sentry_exporter.go @@ -26,7 +26,7 @@ import ( "strings" "github.com/getsentry/sentry-go" - "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/exporter" "go.opentelemetry.io/collector/exporter/exporterhelper" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/ptrace" @@ -476,7 +476,7 @@ func generateEventID() sentry.EventID { } // CreateSentryExporter returns a new Sentry Exporter. -func CreateSentryExporter(config *Config, set component.ExporterCreateSettings) (component.TracesExporter, error) { +func CreateSentryExporter(config *Config, set exporter.CreateSettings) (exporter.Traces, error) { transport := newSentryTransport() clientOptions := sentry.ClientOptions{ diff --git a/exporter/signalfxexporter/exporter.go b/exporter/signalfxexporter/exporter.go index 1f83ea01fcff4..0b150c104640f 100644 --- a/exporter/signalfxexporter/exporter.go +++ b/exporter/signalfxexporter/exporter.go @@ -27,6 +27,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config/configtls" "go.opentelemetry.io/collector/consumer" + "go.opentelemetry.io/collector/exporter" "go.opentelemetry.io/collector/pdata/plog" "go.opentelemetry.io/collector/pdata/pmetric" "go.uber.org/zap" @@ -50,7 +51,7 @@ type baseLogsExporter struct { } type signalfMetadataExporter struct { - component.MetricsExporter + exporter.Metrics pushMetadata func(metadata []*metadata.MetadataUpdate) error } diff --git a/exporter/signalfxexporter/exporter_test.go b/exporter/signalfxexporter/exporter_test.go index 046e4e0474de8..b3c17ebf44467 100644 --- a/exporter/signalfxexporter/exporter_test.go +++ b/exporter/signalfxexporter/exporter_test.go @@ -40,6 +40,7 @@ import ( "go.opentelemetry.io/collector/config/configtls" "go.opentelemetry.io/collector/consumer/consumererror" "go.opentelemetry.io/collector/exporter/exporterhelper" + "go.opentelemetry.io/collector/exporter/exportertest" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/plog" "go.opentelemetry.io/collector/pdata/pmetric" @@ -425,7 +426,7 @@ func TestConsumeMetricsWithAccessTokenPassthrough(t *testing.T) { cfg.Headers["test_header_"] = tt.name cfg.AccessToken = fromHeaders cfg.AccessTokenPassthrough = tt.accessTokenPassthrough - sfxExp, err := NewFactory().CreateMetricsExporter(context.Background(), componenttest.NewNopExporterCreateSettings(), cfg) + sfxExp, err := NewFactory().CreateMetricsExporter(context.Background(), exportertest.NewNopCreateSettings(), cfg) require.NoError(t, err) require.NoError(t, sfxExp.Start(context.Background(), componenttest.NewNopHost())) defer func() { @@ -675,7 +676,7 @@ func TestConsumeLogsDataWithAccessTokenPassthrough(t *testing.T) { cfg.Headers["test_header_"] = tt.name cfg.AccessToken = fromHeaders cfg.AccessTokenPassthrough = tt.accessTokenPassthrough - sfxExp, err := NewFactory().CreateLogsExporter(context.Background(), componenttest.NewNopExporterCreateSettings(), cfg) + sfxExp, err := NewFactory().CreateLogsExporter(context.Background(), exportertest.NewNopCreateSettings(), cfg) require.NoError(t, err) require.NoError(t, sfxExp.Start(context.Background(), componenttest.NewNopHost())) defer func() { @@ -1044,7 +1045,7 @@ func TestSignalFxExporterConsumeMetadata(t *testing.T) { rCfg := cfg.(*Config) rCfg.AccessToken = "token" rCfg.Realm = "realm" - exp, err := f.CreateMetricsExporter(context.Background(), componenttest.NewNopExporterCreateSettings(), rCfg) + exp, err := f.CreateMetricsExporter(context.Background(), exportertest.NewNopCreateSettings(), rCfg) require.NoError(t, err) kme, ok := exp.(metadata.MetadataExporter) diff --git a/exporter/signalfxexporter/factory.go b/exporter/signalfxexporter/factory.go index 833460ee4f860..45024de74cebb 100644 --- a/exporter/signalfxexporter/factory.go +++ b/exporter/signalfxexporter/factory.go @@ -23,6 +23,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/confmap" + "go.opentelemetry.io/collector/exporter" "go.opentelemetry.io/collector/exporter/exporterhelper" "go.uber.org/zap" "gopkg.in/yaml.v2" @@ -44,13 +45,13 @@ const ( ) // NewFactory creates a factory for SignalFx exporter. -func NewFactory() component.ExporterFactory { - return component.NewExporterFactory( +func NewFactory() exporter.Factory { + return exporter.NewFactory( typeStr, createDefaultConfig, - component.WithMetricsExporter(createMetricsExporter, stability), - component.WithLogsExporter(createLogsExporter, stability), - component.WithTracesExporter(createTracesExporter, stability), + exporter.WithMetrics(createMetricsExporter, stability), + exporter.WithLogs(createLogsExporter, stability), + exporter.WithTraces(createTracesExporter, stability), ) } @@ -72,9 +73,9 @@ func createDefaultConfig() component.Config { func createTracesExporter( ctx context.Context, - set component.ExporterCreateSettings, + set exporter.CreateSettings, eCfg component.Config, -) (component.TracesExporter, error) { +) (exporter.Traces, error) { cfg := eCfg.(*Config) corrCfg := cfg.Correlation @@ -102,9 +103,9 @@ func createTracesExporter( func createMetricsExporter( ctx context.Context, - set component.ExporterCreateSettings, + set exporter.CreateSettings, config component.Config, -) (component.MetricsExporter, error) { +) (exporter.Metrics, error) { cfg := config.(*Config) @@ -142,8 +143,8 @@ func createMetricsExporter( } return &signalfMetadataExporter{ - MetricsExporter: me, - pushMetadata: exp.pushMetadata, + Metrics: me, + pushMetadata: exp.pushMetadata, }, nil } @@ -185,9 +186,9 @@ func loadConfig(bytes []byte) (Config, error) { func createLogsExporter( ctx context.Context, - set component.ExporterCreateSettings, + set exporter.CreateSettings, cfg component.Config, -) (component.LogsExporter, error) { +) (exporter.Logs, error) { expCfg := cfg.(*Config) exp, err := newEventExporter(expCfg, set.Logger) diff --git a/exporter/signalfxexporter/factory_test.go b/exporter/signalfxexporter/factory_test.go index 856e5ca39b916..d5b62614c0851 100644 --- a/exporter/signalfxexporter/factory_test.go +++ b/exporter/signalfxexporter/factory_test.go @@ -30,6 +30,7 @@ import ( "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/exporter/exporterhelper" + "go.opentelemetry.io/collector/exporter/exportertest" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" "go.uber.org/zap" @@ -50,7 +51,7 @@ func TestCreateMetricsExporter(t *testing.T) { c.AccessToken = "access_token" c.Realm = "us0" - _, err := createMetricsExporter(context.Background(), componenttest.NewNopExporterCreateSettings(), cfg) + _, err := createMetricsExporter(context.Background(), exportertest.NewNopCreateSettings(), cfg) assert.NoError(t, err) } @@ -60,7 +61,7 @@ func TestCreateTracesExporter(t *testing.T) { c.AccessToken = "access_token" c.Realm = "us0" - _, err := createTracesExporter(context.Background(), componenttest.NewNopExporterCreateSettings(), cfg) + _, err := createTracesExporter(context.Background(), exportertest.NewNopCreateSettings(), cfg) assert.NoError(t, err) } @@ -69,7 +70,7 @@ func TestCreateTracesExporterNoAccessToken(t *testing.T) { c := cfg.(*Config) c.Realm = "us0" - _, err := createTracesExporter(context.Background(), componenttest.NewNopExporterCreateSettings(), cfg) + _, err := createTracesExporter(context.Background(), exportertest.NewNopCreateSettings(), cfg) assert.EqualError(t, err, "access_token is required") } @@ -83,7 +84,7 @@ func TestCreateInstanceViaFactory(t *testing.T) { exp, err := factory.CreateMetricsExporter( context.Background(), - componenttest.NewNopExporterCreateSettings(), + exportertest.NewNopCreateSettings(), cfg) assert.NoError(t, err) assert.NotNil(t, exp) @@ -94,14 +95,14 @@ func TestCreateInstanceViaFactory(t *testing.T) { expCfg.Realm = "us1" exp, err = factory.CreateMetricsExporter( context.Background(), - componenttest.NewNopExporterCreateSettings(), + exportertest.NewNopCreateSettings(), cfg) assert.NoError(t, err) require.NotNil(t, exp) logExp, err := factory.CreateLogsExporter( context.Background(), - componenttest.NewNopExporterCreateSettings(), + exportertest.NewNopCreateSettings(), cfg) assert.NoError(t, err) require.NotNil(t, logExp) @@ -121,7 +122,7 @@ func TestCreateMetricsExporter_CustomConfig(t *testing.T) { TimeoutSettings: exporterhelper.TimeoutSettings{Timeout: 2 * time.Second}, } - te, err := createMetricsExporter(context.Background(), componenttest.NewNopExporterCreateSettings(), config) + te, err := createMetricsExporter(context.Background(), exportertest.NewNopCreateSettings(), config) assert.NoError(t, err) assert.NotNil(t, te) } @@ -174,7 +175,7 @@ func TestFactory_CreateMetricsExporterFails(t *testing.T) { } for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { - te, err := createMetricsExporter(context.Background(), componenttest.NewNopExporterCreateSettings(), tt.config) + te, err := createMetricsExporter(context.Background(), exportertest.NewNopCreateSettings(), tt.config) assert.EqualError(t, err, tt.errorMessage) assert.Nil(t, te) }) @@ -266,7 +267,7 @@ func TestCreateMetricsExporterWithDefaultExcludeMetrics(t *testing.T) { Realm: "us1", } - te, err := createMetricsExporter(context.Background(), componenttest.NewNopExporterCreateSettings(), config) + te, err := createMetricsExporter(context.Background(), exportertest.NewNopCreateSettings(), config) require.NoError(t, err) require.NotNil(t, te) @@ -286,7 +287,7 @@ func TestCreateMetricsExporterWithExcludeMetrics(t *testing.T) { }, } - te, err := createMetricsExporter(context.Background(), componenttest.NewNopExporterCreateSettings(), config) + te, err := createMetricsExporter(context.Background(), exportertest.NewNopCreateSettings(), config) require.NoError(t, err) require.NotNil(t, te) @@ -302,7 +303,7 @@ func TestCreateMetricsExporterWithEmptyExcludeMetrics(t *testing.T) { ExcludeMetrics: []dpfilters.MetricFilter{}, } - te, err := createMetricsExporter(context.Background(), componenttest.NewNopExporterCreateSettings(), config) + te, err := createMetricsExporter(context.Background(), exportertest.NewNopCreateSettings(), config) require.NoError(t, err) require.NotNil(t, te) diff --git a/exporter/signalfxexporter/go.mod b/exporter/signalfxexporter/go.mod index 0e9471eeee8ee..3fb5c853dc2da 100644 --- a/exporter/signalfxexporter/go.mod +++ b/exporter/signalfxexporter/go.mod @@ -5,22 +5,22 @@ go 1.18 require ( github.com/gobwas/glob v0.2.3 github.com/gogo/protobuf v1.3.2 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/splunk v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchperresourceattr v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/experimentalmetricmetadata v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/signalfx v0.66.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/splunk v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchperresourceattr v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/experimentalmetricmetadata v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/signalfx v0.67.0 github.com/shirou/gopsutil/v3 v3.22.10 github.com/signalfx/com_signalfx_metrics_protobuf v0.0.3 github.com/signalfx/signalfx-agent/pkg/apm v0.0.0-20220920175102-539ae8d8ba8e github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector v0.67.0 + go.opentelemetry.io/collector/component v0.67.0 + go.opentelemetry.io/collector/confmap v0.67.0 + go.opentelemetry.io/collector/consumer v0.67.0 + go.opentelemetry.io/collector/pdata v1.0.0-rc1 + go.opentelemetry.io/collector/semconv v0.67.0 go.uber.org/atomic v1.10.0 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.24.0 @@ -64,7 +64,7 @@ require ( github.com/uber/jaeger-lib v2.4.1+incompatible // indirect github.com/yusufpapurcu/wmi v1.2.2 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/featuregate v0.67.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect diff --git a/exporter/signalfxexporter/go.sum b/exporter/signalfxexporter/go.sum index 70e0acb57efe3..436e15c801558 100644 --- a/exporter/signalfxexporter/go.sum +++ b/exporter/signalfxexporter/go.sum @@ -1231,45 +1231,32 @@ go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= go.opentelemetry.io/collector v0.52.0/go.mod h1:a9GvaOhyc0nVOUzqvdv5mxyWghCSso/WRO2GgRl4I1g= go.opentelemetry.io/collector v0.54.0/go.mod h1:FgNzyfb4sAGb5cqusB5znETJ8Pz4OQUBGbOeGIZ2rlQ= go.opentelemetry.io/collector v0.57.2/go.mod h1:9TwWyMRhbFNzaaGLtm/6poWNDJw+etvQMS6Fy+8/8Xs= -go.opentelemetry.io/collector v0.65.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/component v0.65.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/consumer v0.65.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/extension/zpagesextension v0.65.0/go.mod h1:+IPas7AeffG0GMIXhZr8IzpTNhH1Ri/6S/9YFqbLsmQ= -go.opentelemetry.io/collector/extension/zpagesextension v0.66.0/go.mod h1:+IPas7AeffG0GMIXhZr8IzpTNhH1Ri/6S/9YFqbLsmQ= -go.opentelemetry.io/collector/featuregate v0.65.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/component v0.67.0 h1:GCBRZAqk4yNaT4L1uwlbbwophFHrxYccLZ4Uj1Ifs/M= +go.opentelemetry.io/collector/component v0.67.0/go.mod h1:Txa2lm9oe7xsGQN8u7GdUIrRpAHFIKsTO4Qi3/CSmKk= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/extension/zpagesextension v0.67.0/go.mod h1:let/Bt3vTou1cVKhfv+z6FTSk3JaYV11z9C4O/PDPrA= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= go.opentelemetry.io/collector/model v0.49.0/go.mod h1:nOYQv9KoFPs6ihJwOi24qB209EOhS9HkwhGj54YiEAw= go.opentelemetry.io/collector/pdata v0.49.0/go.mod h1:YwmKuiFhNgtmhRdpi8Q8FAWPa0AwJTCSlssSsAtuRcY= go.opentelemetry.io/collector/pdata v0.52.0/go.mod h1:GJUTfTv8mlYpHRjcmHXVbvJr48EW/q/P/HuBvpXAE58= go.opentelemetry.io/collector/pdata v0.54.0/go.mod h1:1nSelv/YqGwdHHaIKNW9ZOHSMqicDX7W4/7TjNCm6N8= go.opentelemetry.io/collector/pdata v0.56.0/go.mod h1:mYcCREWiIJyHss0dbU+GSiz2tmGZ6u09vtfkKTciog4= go.opentelemetry.io/collector/pdata v0.57.2/go.mod h1:RU9I8lwBUxucwOsSYzHEcHi15M9QaX78hgQ2PRdSxV0= -go.opentelemetry.io/collector/pdata v0.65.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/processor/batchprocessor v0.65.0/go.mod h1:XhGTsC1B/bq4gpg8IZ/QYBLXkzE4Gw3r7Xu2+ik8A1Q= -go.opentelemetry.io/collector/processor/batchprocessor v0.66.0/go.mod h1:XhGTsC1B/bq4gpg8IZ/QYBLXkzE4Gw3r7Xu2+ik8A1Q= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= +go.opentelemetry.io/collector/processor/batchprocessor v0.67.0/go.mod h1:+ZXCkUG9tlwbbVLi+PT9DjQ7vz+lfFSQqvW45snLYno= go.opentelemetry.io/collector/semconv v0.52.0/go.mod h1:SxK0rUnUP7YeDakexzbE/vhimTOHwE6m/4aKKd9e27Q= go.opentelemetry.io/collector/semconv v0.54.0/go.mod h1:HAGkPKNMhc4kEHevEqVIEtUuvsRQMIbUWBb8yBrqEwk= go.opentelemetry.io/collector/semconv v0.56.0/go.mod h1:EH1wbDvTyqKpKBBpoMIe0KQk2plCcFS66Mo17WtR7CQ= go.opentelemetry.io/collector/semconv v0.57.2/go.mod h1:84YnUjmm+nhGu4YTDLnHCbxnL74ooWpismPG79tFD7w= -go.opentelemetry.io/collector/semconv v0.65.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= -go.opentelemetry.io/collector/semconv v0.66.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 h1:Q5L9Urod3c8as6ZYaoaqBjarx/HXxsxy34DFZIU2fO4= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector/semconv v0.67.0 h1:zLAvcQa6Kgow52FFLrmk7/9ZVtEYyA73+xDtCcFG78Q= +go.opentelemetry.io/collector/semconv v0.67.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.32.0/go.mod h1:J0dBVrt7dPS/lKJyQoW0xzQiUr4r2Ik1VwPjAUWnofI= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.33.0/go.mod h1:y/SlJpJQPd2UzfBCj0E9Flk9FDCtTyqUmaCB41qFrWI= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4/go.mod h1:05eWWy6ZWzmpeImD3UowLTB3VjDMU1yxQ+ENuVWDM3c= @@ -1336,7 +1323,6 @@ go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= go.uber.org/zap v1.19.1/go.mod h1:j3DNczoxDZroyBnOT1L/Q79cfUMGZxlv/9dzN7SM1rI= go.uber.org/zap v1.21.0/go.mod h1:wjWOCqI0f2ZZrJF/UufIOkiC8ii6tm1iqIsLo76RfJw= go.uber.org/zap v1.22.0/go.mod h1:H4siCOZOrAolnUPJEkfaSjDqyP+BDS0DdDWzwcgt3+U= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= diff --git a/exporter/signalfxexporter/internal/correlation/correlation.go b/exporter/signalfxexporter/internal/correlation/correlation.go index 8ec4fa460e8b2..37c6bb23d6809 100644 --- a/exporter/signalfxexporter/internal/correlation/correlation.go +++ b/exporter/signalfxexporter/internal/correlation/correlation.go @@ -23,6 +23,7 @@ import ( "github.com/signalfx/signalfx-agent/pkg/apm/correlations" "github.com/signalfx/signalfx-agent/pkg/apm/tracetracker" "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/exporter" "go.opentelemetry.io/collector/pdata/ptrace" "go.uber.org/zap" @@ -35,7 +36,7 @@ type Tracker struct { once sync.Once log *zap.Logger cfg *Config - params component.ExporterCreateSettings + params exporter.CreateSettings traceTracker *tracetracker.ActiveServiceTracker pTicker timeutils.TTicker correlation *correlationContext @@ -48,7 +49,7 @@ type correlationContext struct { } // NewTracker creates a new tracker instance for correlation. -func NewTracker(cfg *Config, accessToken string, params component.ExporterCreateSettings) *Tracker { +func NewTracker(cfg *Config, accessToken string, params exporter.CreateSettings) *Tracker { return &Tracker{ log: params.Logger, cfg: cfg, @@ -57,7 +58,7 @@ func NewTracker(cfg *Config, accessToken string, params component.ExporterCreate } } -func newCorrelationClient(cfg *Config, accessToken string, params component.ExporterCreateSettings, host component.Host) ( +func newCorrelationClient(cfg *Config, accessToken string, params exporter.CreateSettings, host component.Host) ( *correlationContext, error, ) { corrURL, err := url.Parse(cfg.Endpoint) diff --git a/exporter/signalfxexporter/internal/correlation/correlation_test.go b/exporter/signalfxexporter/internal/correlation/correlation_test.go index d73b206ba99f0..0a7340fcbe277 100644 --- a/exporter/signalfxexporter/internal/correlation/correlation_test.go +++ b/exporter/signalfxexporter/internal/correlation/correlation_test.go @@ -23,6 +23,7 @@ import ( "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/config/configtls" + "go.opentelemetry.io/collector/exporter/exportertest" "go.opentelemetry.io/collector/pdata/ptrace" ) @@ -30,7 +31,7 @@ func TestTrackerAddSpans(t *testing.T) { tracker := NewTracker( DefaultConfig(), "abcd", - componenttest.NewNopExporterCreateSettings(), + exportertest.NewNopCreateSettings(), ) err := tracker.Start(context.Background(), componenttest.NewNopHost()) @@ -83,7 +84,7 @@ func TestTrackerStart(t *testing.T) { tracker := NewTracker( tt.config, "abcd", - componenttest.NewNopExporterCreateSettings(), + exportertest.NewNopCreateSettings(), ) err := tracker.Start(context.Background(), componenttest.NewNopHost()) diff --git a/exporter/skywalkingexporter/factory.go b/exporter/skywalkingexporter/factory.go index 6fdb66bb086ad..cab119e65e2e2 100644 --- a/exporter/skywalkingexporter/factory.go +++ b/exporter/skywalkingexporter/factory.go @@ -21,6 +21,7 @@ import ( "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/configgrpc" "go.opentelemetry.io/collector/consumer" + "go.opentelemetry.io/collector/exporter" "go.opentelemetry.io/collector/exporter/exporterhelper" ) @@ -32,12 +33,12 @@ const ( ) // NewFactory creates a factory for Skywalking exporter. -func NewFactory() component.ExporterFactory { - return component.NewExporterFactory( +func NewFactory() exporter.Factory { + return exporter.NewFactory( typeStr, createDefaultConfig, - component.WithLogsExporter(createLogsExporter, stability), - component.WithMetricsExporter(createMetricsExporter, stability)) + exporter.WithLogs(createLogsExporter, stability), + exporter.WithMetrics(createMetricsExporter, stability)) } func createDefaultConfig() component.Config { @@ -57,9 +58,9 @@ func createDefaultConfig() component.Config { func createLogsExporter( ctx context.Context, - set component.ExporterCreateSettings, + set exporter.CreateSettings, cfg component.Config, -) (component.LogsExporter, error) { +) (exporter.Logs, error) { oCfg := cfg.(*Config) oce := newLogsExporter(ctx, oCfg, set.TelemetrySettings) return exporterhelper.NewLogsExporter( @@ -76,7 +77,7 @@ func createLogsExporter( ) } -func createMetricsExporter(ctx context.Context, set component.ExporterCreateSettings, cfg component.Config) (component.MetricsExporter, error) { +func createMetricsExporter(ctx context.Context, set exporter.CreateSettings, cfg component.Config) (exporter.Metrics, error) { oCfg := cfg.(*Config) oce := newMetricsExporter(ctx, oCfg, set.TelemetrySettings) return exporterhelper.NewMetricsExporter( diff --git a/exporter/skywalkingexporter/factory_test.go b/exporter/skywalkingexporter/factory_test.go index cee19f629961e..57caf415e07a0 100644 --- a/exporter/skywalkingexporter/factory_test.go +++ b/exporter/skywalkingexporter/factory_test.go @@ -26,6 +26,7 @@ import ( "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/configgrpc" "go.opentelemetry.io/collector/config/configtls" + "go.opentelemetry.io/collector/exporter/exportertest" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/common/testutil" ) @@ -147,7 +148,7 @@ func TestCreateTracesExporter(t *testing.T) { for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { - set := componenttest.NewNopExporterCreateSettings() + set := exportertest.NewNopCreateSettings() tExporter, tErr := createLogsExporter(context.Background(), set, &tt.config) checkErrorsAndStartAndShutdown(t, tExporter, tErr, tt.mustFailOnCreate, tt.mustFailOnStart) tExporter2, tErr2 := createMetricsExporter(context.Background(), set, &tt.config) diff --git a/exporter/skywalkingexporter/go.mod b/exporter/skywalkingexporter/go.mod index 8c5267627cfff..2d36782073af4 100644 --- a/exporter/skywalkingexporter/go.mod +++ b/exporter/skywalkingexporter/go.mod @@ -3,15 +3,15 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/exporter/skywal go 1.18 require ( - github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.66.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.67.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector v0.67.0 + go.opentelemetry.io/collector/component v0.67.0 + go.opentelemetry.io/collector/confmap v0.67.0 + go.opentelemetry.io/collector/consumer v0.67.0 + go.opentelemetry.io/collector/pdata v1.0.0-rc1 + go.opentelemetry.io/collector/semconv v0.67.0 go.uber.org/atomic v1.10.0 google.golang.org/grpc v1.51.0 skywalking.apache.org/repo/goapi v0.0.0-20211122071111-ffc517fbfe21 @@ -37,7 +37,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rogpeppe/go-internal v1.8.0 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/featuregate v0.67.0 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect diff --git a/exporter/skywalkingexporter/go.sum b/exporter/skywalkingexporter/go.sum index c5087868cf874..897ae2bbb4866 100644 --- a/exporter/skywalkingexporter/go.sum +++ b/exporter/skywalkingexporter/go.sum @@ -303,20 +303,20 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 h1:Q5L9Urod3c8as6ZYaoaqBjarx/HXxsxy34DFZIU2fO4= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/component v0.67.0 h1:GCBRZAqk4yNaT4L1uwlbbwophFHrxYccLZ4Uj1Ifs/M= +go.opentelemetry.io/collector/component v0.67.0/go.mod h1:Txa2lm9oe7xsGQN8u7GdUIrRpAHFIKsTO4Qi3/CSmKk= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= +go.opentelemetry.io/collector/semconv v0.67.0 h1:zLAvcQa6Kgow52FFLrmk7/9ZVtEYyA73+xDtCcFG78Q= +go.opentelemetry.io/collector/semconv v0.67.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4 h1:PRXhsszxTt5bbPriTjmaweWUsAnJYeWBhUMLRetUgBU= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4/go.mod h1:05eWWy6ZWzmpeImD3UowLTB3VjDMU1yxQ+ENuVWDM3c= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= diff --git a/exporter/skywalkingexporter/skywalking_benchmark_test.go b/exporter/skywalkingexporter/skywalking_benchmark_test.go index 82150e7ac92b7..0be98932ce722 100644 --- a/exporter/skywalkingexporter/skywalking_benchmark_test.go +++ b/exporter/skywalkingexporter/skywalking_benchmark_test.go @@ -32,6 +32,7 @@ import ( "go.opentelemetry.io/collector/config/configtls" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/exporter/exporterhelper" + "go.opentelemetry.io/collector/exporter/exportertest" "go.uber.org/atomic" "google.golang.org/grpc" v3 "skywalking.apache.org/repo/goapi/collect/common/v3" @@ -150,7 +151,7 @@ func doInit(numStream int, t *testing.T) (*swExporter, *grpc.Server, *mockLogHan oce := newLogsExporter(context.Background(), tt, componenttest.NewNopTelemetrySettings()) got, err := exporterhelper.NewLogsExporter( context.Background(), - componenttest.NewNopExporterCreateSettings(), + exportertest.NewNopCreateSettings(), tt, oce.pushLogs, exporterhelper.WithCapabilities(consumer.Capabilities{MutatesData: false}), diff --git a/exporter/skywalkingexporter/skywalking_test.go b/exporter/skywalkingexporter/skywalking_test.go index e3651bc90a536..dccf70d1577b8 100644 --- a/exporter/skywalkingexporter/skywalking_test.go +++ b/exporter/skywalkingexporter/skywalking_test.go @@ -31,6 +31,7 @@ import ( "go.opentelemetry.io/collector/config/configtls" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/exporter/exporterhelper" + "go.opentelemetry.io/collector/exporter/exportertest" "google.golang.org/grpc" v3 "skywalking.apache.org/repo/goapi/collect/common/v3" metricpb "skywalking.apache.org/repo/goapi/collect/language/agent/v3" @@ -55,7 +56,7 @@ func TestSwExporter(t *testing.T) { oce := newLogsExporter(context.Background(), tt, componenttest.NewNopTelemetrySettings()) got, err := exporterhelper.NewLogsExporter( context.Background(), - componenttest.NewNopExporterCreateSettings(), + exportertest.NewNopCreateSettings(), tt, oce.pushLogs, exporterhelper.WithCapabilities(consumer.Capabilities{MutatesData: false}), @@ -129,7 +130,7 @@ func TestSwExporter(t *testing.T) { oce = newMetricsExporter(context.Background(), tt, componenttest.NewNopTelemetrySettings()) got2, err2 := exporterhelper.NewMetricsExporter( context.Background(), - componenttest.NewNopExporterCreateSettings(), + exportertest.NewNopCreateSettings(), tt, oce.pushMetrics, exporterhelper.WithCapabilities(consumer.Capabilities{MutatesData: false}), diff --git a/exporter/splunkhecexporter/client_test.go b/exporter/splunkhecexporter/client_test.go index 931f75c577687..60b494c50c9dd 100644 --- a/exporter/splunkhecexporter/client_test.go +++ b/exporter/splunkhecexporter/client_test.go @@ -37,6 +37,7 @@ import ( "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/pcommon" "go.opentelemetry.io/collector/pdata/plog" "go.opentelemetry.io/collector/pdata/pmetric" @@ -223,7 +224,7 @@ func runMetricsExport(cfg *Config, metrics pmetric.Metrics, expectedBatchesNum i } }() - params := componenttest.NewNopExporterCreateSettings() + params := exportertest.NewNopCreateSettings() exporter, err := factory.CreateMetricsExporter(context.Background(), params, cfg) assert.NoError(t, err) assert.NoError(t, exporter.Start(context.Background(), componenttest.NewNopHost())) @@ -275,7 +276,7 @@ func runTraceExport(testConfig *Config, traces ptrace.Traces, expectedBatchesNum } }() - params := componenttest.NewNopExporterCreateSettings() + params := exportertest.NewNopCreateSettings() exporter, err := factory.CreateTracesExporter(context.Background(), params, cfg) assert.NoError(t, err) assert.NoError(t, exporter.Start(context.Background(), componenttest.NewNopHost())) @@ -334,7 +335,7 @@ func runLogExport(cfg *Config, ld plog.Logs, expectedBatchesNum int, t *testing. } }() - params := componenttest.NewNopExporterCreateSettings() + params := exportertest.NewNopCreateSettings() exporter, err := NewFactory().CreateLogsExporter(context.Background(), params, cfg) assert.NoError(t, err) assert.NoError(t, exporter.Start(context.Background(), componenttest.NewNopHost())) @@ -853,7 +854,7 @@ func TestErrorReceived(t *testing.T) { cfg.DisableCompression = true cfg.Token = "1234-1234" - params := componenttest.NewNopExporterCreateSettings() + params := exportertest.NewNopCreateSettings() exporter, err := factory.CreateTracesExporter(context.Background(), params, cfg) assert.NoError(t, err) assert.NoError(t, exporter.Start(context.Background(), componenttest.NewNopHost())) @@ -895,7 +896,7 @@ func TestInvalidURL(t *testing.T) { cfg.RetrySettings.Enabled = false cfg.Endpoint = "ftp://example.com:134" cfg.Token = "1234-1234" - params := componenttest.NewNopExporterCreateSettings() + params := exportertest.NewNopCreateSettings() exporter, err := factory.CreateTracesExporter(context.Background(), params, cfg) assert.NoError(t, err) assert.NoError(t, exporter.Start(context.Background(), componenttest.NewNopHost())) diff --git a/exporter/splunkhecexporter/factory.go b/exporter/splunkhecexporter/factory.go index 7216d78e35efa..725bbf387beb5 100644 --- a/exporter/splunkhecexporter/factory.go +++ b/exporter/splunkhecexporter/factory.go @@ -22,6 +22,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer" + "go.opentelemetry.io/collector/exporter" "go.opentelemetry.io/collector/exporter/exporterhelper" conventions "go.opentelemetry.io/collector/semconv/v1.6.1" @@ -51,13 +52,13 @@ type baseLogsExporter struct { } // NewFactory creates a factory for Splunk HEC exporter. -func NewFactory() component.ExporterFactory { - return component.NewExporterFactory( +func NewFactory() exporter.Factory { + return exporter.NewFactory( typeStr, createDefaultConfig, - component.WithTracesExporter(createTracesExporter, stability), - component.WithMetricsExporter(createMetricsExporter, stability), - component.WithLogsExporter(createLogsExporter, stability)) + exporter.WithTraces(createTracesExporter, stability), + exporter.WithMetrics(createMetricsExporter, stability), + exporter.WithLogs(createLogsExporter, stability)) } func createDefaultConfig() component.Config { @@ -92,9 +93,9 @@ func createDefaultConfig() component.Config { func createTracesExporter( ctx context.Context, - set component.ExporterCreateSettings, + set exporter.CreateSettings, config component.Config, -) (component.TracesExporter, error) { +) (exporter.Traces, error) { if config == nil { return nil, errors.New("nil config") } @@ -120,9 +121,9 @@ func createTracesExporter( func createMetricsExporter( ctx context.Context, - set component.ExporterCreateSettings, + set exporter.CreateSettings, config component.Config, -) (component.MetricsExporter, error) { +) (exporter.Metrics, error) { if config == nil { return nil, errors.New("nil config") } @@ -158,9 +159,9 @@ func createMetricsExporter( func createLogsExporter( ctx context.Context, - set component.ExporterCreateSettings, + set exporter.CreateSettings, config component.Config, -) (exporter component.LogsExporter, err error) { +) (exporter exporter.Logs, err error) { if config == nil { return nil, errors.New("nil config") } diff --git a/exporter/splunkhecexporter/factory_test.go b/exporter/splunkhecexporter/factory_test.go index 12be9b0b9fce2..2183e603a170b 100644 --- a/exporter/splunkhecexporter/factory_test.go +++ b/exporter/splunkhecexporter/factory_test.go @@ -23,6 +23,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" + "go.opentelemetry.io/collector/exporter/exportertest" ) func TestCreateDefaultConfig(t *testing.T) { @@ -36,13 +37,13 @@ func TestCreateMetricsExporter(t *testing.T) { cfg.Endpoint = "https://example.com:8088/services/collector" cfg.Token = "1234-1234" - params := componenttest.NewNopExporterCreateSettings() + params := exportertest.NewNopCreateSettings() _, err := createMetricsExporter(context.Background(), params, cfg) assert.NoError(t, err) } func TestCreateMetricsExporterNoConfig(t *testing.T) { - params := componenttest.NewNopExporterCreateSettings() + params := exportertest.NewNopCreateSettings() _, err := createMetricsExporter(context.Background(), params, nil) assert.Error(t, err) } @@ -52,13 +53,13 @@ func TestCreateTracesExporter(t *testing.T) { cfg.Endpoint = "https://example.com:8088/services/collector" cfg.Token = "1234-1234" - params := componenttest.NewNopExporterCreateSettings() + params := exportertest.NewNopCreateSettings() _, err := createTracesExporter(context.Background(), params, cfg) assert.NoError(t, err) } func TestCreateTracesExporterNoConfig(t *testing.T) { - params := componenttest.NewNopExporterCreateSettings() + params := exportertest.NewNopCreateSettings() _, err := createTracesExporter(context.Background(), params, nil) assert.Error(t, err) } @@ -66,7 +67,7 @@ func TestCreateTracesExporterNoConfig(t *testing.T) { func TestCreateTracesExporterInvalidEndpoint(t *testing.T) { cfg := createDefaultConfig().(*Config) cfg.Endpoint = "urn:something:12345" - params := componenttest.NewNopExporterCreateSettings() + params := exportertest.NewNopCreateSettings() _, err := createTracesExporter(context.Background(), params, cfg) assert.Error(t, err) } @@ -76,13 +77,13 @@ func TestCreateLogsExporter(t *testing.T) { cfg.Endpoint = "https://example.com:8088/services/collector" cfg.Token = "1234-1234" - params := componenttest.NewNopExporterCreateSettings() + params := exportertest.NewNopCreateSettings() _, err := createLogsExporter(context.Background(), params, cfg) assert.NoError(t, err) } func TestCreateLogsExporterNoConfig(t *testing.T) { - params := componenttest.NewNopExporterCreateSettings() + params := exportertest.NewNopCreateSettings() _, err := createLogsExporter(context.Background(), params, nil) assert.Error(t, err) } @@ -90,7 +91,7 @@ func TestCreateLogsExporterNoConfig(t *testing.T) { func TestCreateLogsExporterInvalidEndpoint(t *testing.T) { cfg := createDefaultConfig().(*Config) cfg.Endpoint = "urn:something:12345" - params := componenttest.NewNopExporterCreateSettings() + params := exportertest.NewNopCreateSettings() _, err := createLogsExporter(context.Background(), params, cfg) assert.Error(t, err) } @@ -101,7 +102,7 @@ func TestCreateInstanceViaFactory(t *testing.T) { cfg := factory.CreateDefaultConfig().(*Config) cfg.Endpoint = "https://example.com:8088/services/collector" cfg.Token = "1234-1234" - params := componenttest.NewNopExporterCreateSettings() + params := exportertest.NewNopCreateSettings() exp, err := factory.CreateMetricsExporter( context.Background(), params, cfg) @@ -127,7 +128,7 @@ func TestFactory_CreateMetricsExporter(t *testing.T) { Endpoint: "https://example.com:8000", } - params := componenttest.NewNopExporterCreateSettings() + params := exportertest.NewNopCreateSettings() te, err := createMetricsExporter(context.Background(), params, config) assert.NoError(t, err) assert.NotNil(t, te) @@ -158,7 +159,7 @@ func TestFactory_CreateMetricsExporterFails(t *testing.T) { } for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { - params := componenttest.NewNopExporterCreateSettings() + params := exportertest.NewNopCreateSettings() te, err := createMetricsExporter(context.Background(), params, tt.config) assert.EqualError(t, err, tt.errorMessage) assert.Nil(t, te) diff --git a/exporter/splunkhecexporter/go.mod b/exporter/splunkhecexporter/go.mod index 9de176ac5806c..ceb8742be7080 100644 --- a/exporter/splunkhecexporter/go.mod +++ b/exporter/splunkhecexporter/go.mod @@ -4,16 +4,16 @@ go 1.18 require ( github.com/json-iterator/go v1.1.12 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/splunk v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchperresourceattr v0.66.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/splunk v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchperresourceattr v0.67.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector v0.67.0 + go.opentelemetry.io/collector/component v0.67.0 + go.opentelemetry.io/collector/confmap v0.67.0 + go.opentelemetry.io/collector/consumer v0.67.0 + go.opentelemetry.io/collector/pdata v1.0.0-rc1 + go.opentelemetry.io/collector/semconv v0.67.0 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.24.0 ) @@ -34,7 +34,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rogpeppe/go-internal v1.8.1 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/featuregate v0.67.0 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/exporter/splunkhecexporter/go.sum b/exporter/splunkhecexporter/go.sum index f86250c7d87f9..d7737b41db030 100644 --- a/exporter/splunkhecexporter/go.sum +++ b/exporter/splunkhecexporter/go.sum @@ -277,20 +277,20 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 h1:Q5L9Urod3c8as6ZYaoaqBjarx/HXxsxy34DFZIU2fO4= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/component v0.67.0 h1:GCBRZAqk4yNaT4L1uwlbbwophFHrxYccLZ4Uj1Ifs/M= +go.opentelemetry.io/collector/component v0.67.0/go.mod h1:Txa2lm9oe7xsGQN8u7GdUIrRpAHFIKsTO4Qi3/CSmKk= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= +go.opentelemetry.io/collector/semconv v0.67.0 h1:zLAvcQa6Kgow52FFLrmk7/9ZVtEYyA73+xDtCcFG78Q= +go.opentelemetry.io/collector/semconv v0.67.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/exporter/sumologicexporter/exporter.go b/exporter/sumologicexporter/exporter.go index 0ddd3a02f10df..a09ee548fefea 100644 --- a/exporter/sumologicexporter/exporter.go +++ b/exporter/sumologicexporter/exporter.go @@ -21,6 +21,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/consumer/consumererror" + "go.opentelemetry.io/collector/exporter" "go.opentelemetry.io/collector/exporter/exporterhelper" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/plog" @@ -68,8 +69,8 @@ func initExporter(cfg *Config, settings component.TelemetrySettings) (*sumologic func newLogsExporter( cfg *Config, - set component.ExporterCreateSettings, -) (component.LogsExporter, error) { + set exporter.CreateSettings, +) (exporter.Logs, error) { se, err := initExporter(cfg, set.TelemetrySettings) if err != nil { return nil, fmt.Errorf("failed to initialize the logs exporter: %w", err) @@ -91,8 +92,8 @@ func newLogsExporter( func newMetricsExporter( cfg *Config, - set component.ExporterCreateSettings, -) (component.MetricsExporter, error) { + set exporter.CreateSettings, +) (exporter.Metrics, error) { se, err := initExporter(cfg, set.TelemetrySettings) if err != nil { return nil, err diff --git a/exporter/sumologicexporter/factory.go b/exporter/sumologicexporter/factory.go index 7f53f047b430b..07940224e49b8 100644 --- a/exporter/sumologicexporter/factory.go +++ b/exporter/sumologicexporter/factory.go @@ -20,6 +20,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" + "go.opentelemetry.io/collector/exporter" "go.opentelemetry.io/collector/exporter/exporterhelper" ) @@ -31,12 +32,12 @@ const ( ) // NewFactory returns a new factory for the sumologic exporter. -func NewFactory() component.ExporterFactory { - return component.NewExporterFactory( +func NewFactory() exporter.Factory { + return exporter.NewFactory( typeStr, createDefaultConfig, - component.WithLogsExporter(createLogsExporter, stability), - component.WithMetricsExporter(createMetricsExporter, stability), + exporter.WithLogs(createLogsExporter, stability), + exporter.WithMetrics(createMetricsExporter, stability), ) } @@ -65,9 +66,9 @@ func createDefaultConfig() component.Config { func createLogsExporter( _ context.Context, - params component.ExporterCreateSettings, + params exporter.CreateSettings, cfg component.Config, -) (component.LogsExporter, error) { +) (exporter.Logs, error) { exp, err := newLogsExporter(cfg.(*Config), params) if err != nil { return nil, fmt.Errorf("failed to create the logs exporter: %w", err) @@ -78,9 +79,9 @@ func createLogsExporter( func createMetricsExporter( _ context.Context, - params component.ExporterCreateSettings, + params exporter.CreateSettings, cfg component.Config, -) (component.MetricsExporter, error) { +) (exporter.Metrics, error) { exp, err := newMetricsExporter(cfg.(*Config), params) if err != nil { return nil, fmt.Errorf("failed to create the metrics exporter: %w", err) diff --git a/exporter/sumologicexporter/go.mod b/exporter/sumologicexporter/go.mod index 598062e418b87..019c8d30127fc 100644 --- a/exporter/sumologicexporter/go.mod +++ b/exporter/sumologicexporter/go.mod @@ -4,10 +4,10 @@ go 1.18 require ( github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector v0.67.0 + go.opentelemetry.io/collector/component v0.67.0 + go.opentelemetry.io/collector/consumer v0.67.0 + go.opentelemetry.io/collector/pdata v1.0.0-rc1 go.uber.org/atomic v1.10.0 go.uber.org/multierr v1.8.0 ) @@ -35,8 +35,8 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rs/cors v1.8.2 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/confmap v0.67.0 // indirect + go.opentelemetry.io/collector/featuregate v0.67.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect diff --git a/exporter/sumologicexporter/go.sum b/exporter/sumologicexporter/go.sum index b4e340b2b2ce3..e76fe12d2d37e 100644 --- a/exporter/sumologicexporter/go.sum +++ b/exporter/sumologicexporter/go.sum @@ -297,18 +297,18 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/component v0.67.0 h1:GCBRZAqk4yNaT4L1uwlbbwophFHrxYccLZ4Uj1Ifs/M= +go.opentelemetry.io/collector/component v0.67.0/go.mod h1:Txa2lm9oe7xsGQN8u7GdUIrRpAHFIKsTO4Qi3/CSmKk= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 h1:aUEBEdCa6iamGzg6fuYxDA8ThxvOG240mAvWDU+XLio= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4/go.mod h1:l2MdsbKTocpPS5nQZscqTR9jd8u96VYZdcpF8Sye7mA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= diff --git a/exporter/tanzuobservabilityexporter/config_test.go b/exporter/tanzuobservabilityexporter/config_test.go index a40a3ea16474a..adffe763b4f28 100644 --- a/exporter/tanzuobservabilityexporter/config_test.go +++ b/exporter/tanzuobservabilityexporter/config_test.go @@ -26,7 +26,7 @@ import ( "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/exporter/exporterhelper" - "go.opentelemetry.io/collector/service/servicetest" + "go.opentelemetry.io/collector/otelcol/otelcoltest" ) func TestLoadConfig(t *testing.T) { @@ -35,7 +35,7 @@ func TestLoadConfig(t *testing.T) { factory := NewFactory() factories.Exporters[exporterType] = factory - cfg, err := servicetest.LoadConfigAndValidate(filepath.Join("testdata", "config.yaml"), factories) + cfg, err := otelcoltest.LoadConfigAndValidate(filepath.Join("testdata", "config.yaml"), factories) require.NoError(t, err) require.NotNil(t, cfg) diff --git a/exporter/tanzuobservabilityexporter/factory.go b/exporter/tanzuobservabilityexporter/factory.go index b8911fecb4da7..756fec7e18139 100644 --- a/exporter/tanzuobservabilityexporter/factory.go +++ b/exporter/tanzuobservabilityexporter/factory.go @@ -20,6 +20,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" + "go.opentelemetry.io/collector/exporter" "go.opentelemetry.io/collector/exporter/exporterhelper" ) @@ -30,12 +31,12 @@ const ( ) // NewFactory creates a factory for the exporter. -func NewFactory() component.ExporterFactory { - return component.NewExporterFactory( +func NewFactory() exporter.Factory { + return exporter.NewFactory( exporterType, createDefaultConfig, - component.WithTracesExporter(createTracesExporter, stability), - component.WithMetricsExporter(createMetricsExporter, stability), + exporter.WithTraces(createTracesExporter, stability), + exporter.WithMetrics(createMetricsExporter, stability), ) } @@ -51,9 +52,9 @@ func createDefaultConfig() component.Config { // an exporter for traces using this configuration func createTracesExporter( ctx context.Context, - set component.ExporterCreateSettings, + set exporter.CreateSettings, cfg component.Config, -) (component.TracesExporter, error) { +) (exporter.Traces, error) { exp, err := newTracesExporter(set, cfg) if err != nil { return nil, err @@ -77,9 +78,9 @@ func createTracesExporter( func createMetricsExporter( ctx context.Context, - set component.ExporterCreateSettings, + set exporter.CreateSettings, cfg component.Config, -) (component.MetricsExporter, error) { +) (exporter.Metrics, error) { tobsCfg, ok := cfg.(*Config) if !ok { return nil, fmt.Errorf("invalid config: %#v", cfg) diff --git a/exporter/tanzuobservabilityexporter/factory_test.go b/exporter/tanzuobservabilityexporter/factory_test.go index 9b857bb65bb9b..e4fca01630073 100644 --- a/exporter/tanzuobservabilityexporter/factory_test.go +++ b/exporter/tanzuobservabilityexporter/factory_test.go @@ -21,6 +21,7 @@ import ( "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) { @@ -39,7 +40,7 @@ func TestCreateDefaultConfig(t *testing.T) { func TestCreateExporter(t *testing.T) { defaultConfig := createDefaultConfig() cfg := defaultConfig.(*Config) - params := componenttest.NewNopExporterCreateSettings() + params := exportertest.NewNopCreateSettings() cfg.Traces.Endpoint = "http://localhost:30001" te, err := createTracesExporter(context.Background(), params, cfg) assert.Nil(t, err) @@ -49,7 +50,7 @@ func TestCreateExporter(t *testing.T) { func TestCreateMetricsExporter(t *testing.T) { defaultConfig := createDefaultConfig() cfg := defaultConfig.(*Config) - params := componenttest.NewNopExporterCreateSettings() + params := exportertest.NewNopCreateSettings() cfg.Metrics.Endpoint = "http://localhost:2878" te, err := createMetricsExporter(context.Background(), params, cfg) assert.NoError(t, err) @@ -57,19 +58,19 @@ func TestCreateMetricsExporter(t *testing.T) { } func TestCreateTraceExporterNilConfigError(t *testing.T) { - params := componenttest.NewNopExporterCreateSettings() + params := exportertest.NewNopCreateSettings() _, err := createTracesExporter(context.Background(), params, nil) assert.Error(t, err) } func TestCreateMetricsExporterNilConfigError(t *testing.T) { - params := componenttest.NewNopExporterCreateSettings() + params := exportertest.NewNopCreateSettings() _, err := createMetricsExporter(context.Background(), params, nil) assert.Error(t, err) } func TestCreateTraceExporterInvalidEndpointError(t *testing.T) { - params := componenttest.NewNopExporterCreateSettings() + params := exportertest.NewNopCreateSettings() defaultConfig := createDefaultConfig() cfg := defaultConfig.(*Config) cfg.Traces.Endpoint = "http:#$%^&#$%&#" @@ -78,7 +79,7 @@ func TestCreateTraceExporterInvalidEndpointError(t *testing.T) { } func TestCreateMetricsExporterInvalidEndpointError(t *testing.T) { - params := componenttest.NewNopExporterCreateSettings() + params := exportertest.NewNopCreateSettings() defaultConfig := createDefaultConfig() cfg := defaultConfig.(*Config) cfg.Metrics.Endpoint = "http:#$%^&#$%&#" @@ -87,7 +88,7 @@ func TestCreateMetricsExporterInvalidEndpointError(t *testing.T) { } func TestCreateTraceExporterMissingPortError(t *testing.T) { - params := componenttest.NewNopExporterCreateSettings() + params := exportertest.NewNopCreateSettings() defaultConfig := createDefaultConfig() cfg := defaultConfig.(*Config) cfg.Traces.Endpoint = "http://localhost" @@ -96,7 +97,7 @@ func TestCreateTraceExporterMissingPortError(t *testing.T) { } func TestCreateMetricsExporterMissingPortError(t *testing.T) { - params := componenttest.NewNopExporterCreateSettings() + params := exportertest.NewNopCreateSettings() defaultConfig := createDefaultConfig() cfg := defaultConfig.(*Config) cfg.Metrics.Endpoint = "http://localhost" @@ -105,7 +106,7 @@ func TestCreateMetricsExporterMissingPortError(t *testing.T) { } func TestCreateTraceExporterInvalidPortError(t *testing.T) { - params := componenttest.NewNopExporterCreateSettings() + params := exportertest.NewNopCreateSettings() defaultConfig := createDefaultConfig() cfg := defaultConfig.(*Config) cfg.Traces.Endpoint = "http://localhost:c42a" @@ -114,7 +115,7 @@ func TestCreateTraceExporterInvalidPortError(t *testing.T) { } func TestCreateMetricsExporterInvalidPortError(t *testing.T) { - params := componenttest.NewNopExporterCreateSettings() + params := exportertest.NewNopCreateSettings() defaultConfig := createDefaultConfig() cfg := defaultConfig.(*Config) cfg.Metrics.Endpoint = "http://localhost:c42a" diff --git a/exporter/tanzuobservabilityexporter/go.mod b/exporter/tanzuobservabilityexporter/go.mod index 06fb915eee81e..6ca757297c302 100644 --- a/exporter/tanzuobservabilityexporter/go.mod +++ b/exporter/tanzuobservabilityexporter/go.mod @@ -4,13 +4,13 @@ go 1.18 require ( github.com/google/uuid v1.3.0 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.66.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.67.0 github.com/stretchr/testify v1.8.1 github.com/wavefronthq/wavefront-sdk-go v0.11.0 - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector v0.67.0 + go.opentelemetry.io/collector/component v0.67.0 + go.opentelemetry.io/collector/pdata v1.0.0-rc1 + go.opentelemetry.io/collector/semconv v0.67.0 go.uber.org/atomic v1.10.0 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.24.0 @@ -61,10 +61,10 @@ require ( github.com/tklauser/numcpus v0.6.0 // indirect github.com/yusufpapurcu/wmi v1.2.2 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a // indirect - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect - go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/confmap v0.67.0 // indirect + go.opentelemetry.io/collector/consumer v0.67.0 // indirect + go.opentelemetry.io/collector/featuregate v0.67.0 // indirect + go.opentelemetry.io/collector/processor/batchprocessor v0.67.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 // indirect go.opentelemetry.io/contrib/propagators/b3 v1.11.1 // indirect go.opentelemetry.io/otel v1.11.1 // indirect diff --git a/exporter/tanzuobservabilityexporter/go.sum b/exporter/tanzuobservabilityexporter/go.sum index 911da22c901a3..b52b120bd2be1 100644 --- a/exporter/tanzuobservabilityexporter/go.sum +++ b/exporter/tanzuobservabilityexporter/go.sum @@ -413,23 +413,23 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/extension/zpagesextension v0.66.0 h1:tPqSKH5K3VhTT0XXVoWL3woWBSTJqnXZQRt0ZLSCoCc= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221202005155-1c54042beb70 h1:Y4e8NnVevonnAgmjX9Z7QIMA32yMqHAOnAlh8SzTS8c= -go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:Pi1CsKDQFoDrUP1i3+VdE6s2Xuji7bOGFBgqHK0J32E= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 h1:Q5L9Urod3c8as6ZYaoaqBjarx/HXxsxy34DFZIU2fO4= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/component v0.67.0 h1:GCBRZAqk4yNaT4L1uwlbbwophFHrxYccLZ4Uj1Ifs/M= +go.opentelemetry.io/collector/component v0.67.0/go.mod h1:Txa2lm9oe7xsGQN8u7GdUIrRpAHFIKsTO4Qi3/CSmKk= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/extension/zpagesextension v0.67.0 h1:TRW8vZwE+/h2vJqqMDmyQO9X0sxcYCSXf5MyXozSLas= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= +go.opentelemetry.io/collector/processor/batchprocessor v0.67.0 h1:Qn4Ytth3q1trwTSAYYTzIRs4SBh9rz0xBou1nZB+Dko= +go.opentelemetry.io/collector/processor/batchprocessor v0.67.0/go.mod h1:+ZXCkUG9tlwbbVLi+PT9DjQ7vz+lfFSQqvW45snLYno= +go.opentelemetry.io/collector/semconv v0.67.0 h1:zLAvcQa6Kgow52FFLrmk7/9ZVtEYyA73+xDtCcFG78Q= +go.opentelemetry.io/collector/semconv v0.67.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 h1:aUEBEdCa6iamGzg6fuYxDA8ThxvOG240mAvWDU+XLio= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4/go.mod h1:l2MdsbKTocpPS5nQZscqTR9jd8u96VYZdcpF8Sye7mA= go.opentelemetry.io/contrib/propagators/b3 v1.11.1 h1:icQ6ttRV+r/2fnU46BIo/g/mPu6Rs5Ug8Rtohe3KqzI= diff --git a/exporter/tanzuobservabilityexporter/metrics_exporter.go b/exporter/tanzuobservabilityexporter/metrics_exporter.go index b6c26873bd7f4..d09413ddb3115 100644 --- a/exporter/tanzuobservabilityexporter/metrics_exporter.go +++ b/exporter/tanzuobservabilityexporter/metrics_exporter.go @@ -20,6 +20,7 @@ import ( "github.com/wavefronthq/wavefront-sdk-go/senders" "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/exporter" "go.opentelemetry.io/collector/pdata/pmetric" ) @@ -52,7 +53,7 @@ func createMetricsConsumer(config MetricsConfig, settings component.TelemetrySet type metricsConsumerCreator func(config MetricsConfig, settings component.TelemetrySettings, otelVersion string) ( *metricsConsumer, error) -func newMetricsExporter(settings component.ExporterCreateSettings, c component.Config, creator metricsConsumerCreator) (*metricsExporter, error) { +func newMetricsExporter(settings exporter.CreateSettings, c component.Config, creator metricsConsumerCreator) (*metricsExporter, error) { cfg, ok := c.(*Config) if !ok { return nil, fmt.Errorf("invalid config: %#v", c) diff --git a/exporter/tanzuobservabilityexporter/metrics_exporter_test.go b/exporter/tanzuobservabilityexporter/metrics_exporter_test.go index f8254e4290ebe..5361e5d89bd4e 100644 --- a/exporter/tanzuobservabilityexporter/metrics_exporter_test.go +++ b/exporter/tanzuobservabilityexporter/metrics_exporter_test.go @@ -22,8 +22,9 @@ import ( "github.com/stretchr/testify/assert" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/component/componenttest" + "go.opentelemetry.io/collector/exporter" "go.opentelemetry.io/collector/exporter/exporterhelper" + "go.opentelemetry.io/collector/exporter/exportertest" "go.opentelemetry.io/collector/pdata/pmetric" ) @@ -58,7 +59,7 @@ func verifyPushMetricsData(t *testing.T, errorOnSend bool) error { } func createMockMetricsExporter( - sender *mockMetricSender) (component.MetricsExporter, error) { + sender *mockMetricSender) (exporter.Metrics, error) { exporterConfig := createDefaultConfig() tobsConfig := exporterConfig.(*Config) tobsConfig.Metrics.Endpoint = "http://localhost:2878" @@ -74,13 +75,13 @@ func createMockMetricsExporter( ), nil } - exp, err := newMetricsExporter(componenttest.NewNopExporterCreateSettings(), exporterConfig, creator) + exp, err := newMetricsExporter(exportertest.NewNopCreateSettings(), exporterConfig, creator) if err != nil { return nil, err } return exporterhelper.NewMetricsExporter( context.Background(), - componenttest.NewNopExporterCreateSettings(), + exportertest.NewNopCreateSettings(), exporterConfig, exp.pushMetricsData, exporterhelper.WithShutdown(exp.shutdown), diff --git a/exporter/tanzuobservabilityexporter/trace_exporter.go b/exporter/tanzuobservabilityexporter/trace_exporter.go index f94cf845fa09d..639fc921f082a 100644 --- a/exporter/tanzuobservabilityexporter/trace_exporter.go +++ b/exporter/tanzuobservabilityexporter/trace_exporter.go @@ -22,6 +22,7 @@ import ( "github.com/google/uuid" "github.com/wavefronthq/wavefront-sdk-go/senders" "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/exporter" "go.opentelemetry.io/collector/pdata/ptrace" "go.uber.org/multierr" "go.uber.org/zap" @@ -63,7 +64,7 @@ type tracesExporter struct { logger *zap.Logger } -func newTracesExporter(settings component.ExporterCreateSettings, c component.Config) (*tracesExporter, error) { +func newTracesExporter(settings exporter.CreateSettings, c component.Config) (*tracesExporter, error) { cfg, ok := c.(*Config) if !ok { return nil, fmt.Errorf("invalid config: %#v", c) diff --git a/exporter/tanzuobservabilityexporter/trace_exporter_test.go b/exporter/tanzuobservabilityexporter/trace_exporter_test.go index fcc194307d123..e5975af11c979 100644 --- a/exporter/tanzuobservabilityexporter/trace_exporter_test.go +++ b/exporter/tanzuobservabilityexporter/trace_exporter_test.go @@ -23,8 +23,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "github.com/wavefronthq/wavefront-sdk-go/senders" - "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/exporter/exporterhelper" + "go.opentelemetry.io/collector/exporter/exportertest" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/ptrace" conventions "go.opentelemetry.io/collector/semconv/v1.6.1" @@ -234,7 +234,7 @@ func TestExportTraceDataRespectsContext(t *testing.T) { } mockOTelTracesExporter, err := exporterhelper.NewTracesExporter( context.Background(), - componenttest.NewNopExporterCreateSettings(), + exportertest.NewNopCreateSettings(), cfg, exp.pushTraceData, exporterhelper.WithShutdown(exp.shutdown), @@ -285,7 +285,7 @@ func consumeTraces(ptrace ptrace.Traces) ([]*span, error) { } mockOTelTracesExporter, err := exporterhelper.NewTracesExporter( context.Background(), - componenttest.NewNopExporterCreateSettings(), + exportertest.NewNopCreateSettings(), cfg, exp.pushTraceData, exporterhelper.WithShutdown(exp.shutdown), diff --git a/exporter/tencentcloudlogserviceexporter/factory.go b/exporter/tencentcloudlogserviceexporter/factory.go index be35740af1b59..383e6493b920c 100644 --- a/exporter/tencentcloudlogserviceexporter/factory.go +++ b/exporter/tencentcloudlogserviceexporter/factory.go @@ -19,6 +19,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" + "go.opentelemetry.io/collector/exporter" ) const ( @@ -29,11 +30,11 @@ const ( ) // NewFactory creates a factory for tencentcloud LogService exporter. -func NewFactory() component.ExporterFactory { - return component.NewExporterFactory( +func NewFactory() exporter.Factory { + return exporter.NewFactory( typeStr, createDefaultConfig, - component.WithLogsExporter(createLogsExporter, stability)) + exporter.WithLogs(createLogsExporter, stability)) } // CreateDefaultConfig creates the default configuration for exporter. @@ -45,8 +46,8 @@ func createDefaultConfig() component.Config { func createLogsExporter( _ context.Context, - set component.ExporterCreateSettings, + set exporter.CreateSettings, cfg component.Config, -) (exp component.LogsExporter, err error) { +) (exp exporter.Logs, err error) { return newLogsExporter(set, cfg) } diff --git a/exporter/tencentcloudlogserviceexporter/go.mod b/exporter/tencentcloudlogserviceexporter/go.mod index e21714f98b2b5..132daeea2f86b 100644 --- a/exporter/tencentcloudlogserviceexporter/go.mod +++ b/exporter/tencentcloudlogserviceexporter/go.mod @@ -3,15 +3,15 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/exporter/tencen go 1.18 require ( - github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.66.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.67.0 github.com/pierrec/lz4 v2.6.1+incompatible github.com/stretchr/testify v1.8.1 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.553 - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector v0.67.0 + go.opentelemetry.io/collector/component v0.67.0 + go.opentelemetry.io/collector/confmap v0.67.0 + go.opentelemetry.io/collector/pdata v1.0.0-rc1 + go.opentelemetry.io/collector/semconv v0.67.0 go.uber.org/zap v1.24.0 google.golang.org/protobuf v1.28.1 ) @@ -31,8 +31,8 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/consumer v0.67.0 // indirect + go.opentelemetry.io/collector/featuregate v0.67.0 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/exporter/tencentcloudlogserviceexporter/go.sum b/exporter/tencentcloudlogserviceexporter/go.sum index c0618db7be536..93d9cb82d44db 100644 --- a/exporter/tencentcloudlogserviceexporter/go.sum +++ b/exporter/tencentcloudlogserviceexporter/go.sum @@ -282,20 +282,20 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 h1:Q5L9Urod3c8as6ZYaoaqBjarx/HXxsxy34DFZIU2fO4= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/component v0.67.0 h1:GCBRZAqk4yNaT4L1uwlbbwophFHrxYccLZ4Uj1Ifs/M= +go.opentelemetry.io/collector/component v0.67.0/go.mod h1:Txa2lm9oe7xsGQN8u7GdUIrRpAHFIKsTO4Qi3/CSmKk= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= +go.opentelemetry.io/collector/semconv v0.67.0 h1:zLAvcQa6Kgow52FFLrmk7/9ZVtEYyA73+xDtCcFG78Q= +go.opentelemetry.io/collector/semconv v0.67.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/exporter/tencentcloudlogserviceexporter/logs_exporter.go b/exporter/tencentcloudlogserviceexporter/logs_exporter.go index d5811d82e5060..f33d08b06118d 100644 --- a/exporter/tencentcloudlogserviceexporter/logs_exporter.go +++ b/exporter/tencentcloudlogserviceexporter/logs_exporter.go @@ -18,13 +18,14 @@ import ( "context" "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/exporter" "go.opentelemetry.io/collector/exporter/exporterhelper" "go.opentelemetry.io/collector/pdata/plog" "go.uber.org/zap" ) // newLogsExporter return a new LogService logs exporter. -func newLogsExporter(set component.ExporterCreateSettings, cfg component.Config) (component.LogsExporter, error) { +func newLogsExporter(set exporter.CreateSettings, cfg component.Config) (exporter.Logs, error) { l := &logServiceLogsSender{ logger: set.Logger, } diff --git a/exporter/tencentcloudlogserviceexporter/logs_exporter_test.go b/exporter/tencentcloudlogserviceexporter/logs_exporter_test.go index 85bd9c2fb15f4..accff5c53f80d 100644 --- a/exporter/tencentcloudlogserviceexporter/logs_exporter_test.go +++ b/exporter/tencentcloudlogserviceexporter/logs_exporter_test.go @@ -22,8 +22,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" + "go.opentelemetry.io/collector/exporter/exportertest" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/plog" conventions "go.opentelemetry.io/collector/semconv/v1.6.1" @@ -52,7 +52,7 @@ func createSimpleLogData(numberOfLogs int) plog.Logs { } func TestNewLogsExporter(t *testing.T) { - got, err := newLogsExporter(componenttest.NewNopExporterCreateSettings(), &Config{ + got, err := newLogsExporter(exportertest.NewNopCreateSettings(), &Config{ ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), Region: "ap-beijing", LogSet: "demo-logset", @@ -67,7 +67,7 @@ func TestNewLogsExporter(t *testing.T) { } func TestNewFailsWithEmptyLogsExporterName(t *testing.T) { - got, err := newLogsExporter(componenttest.NewNopExporterCreateSettings(), &Config{}) + got, err := newLogsExporter(exportertest.NewNopCreateSettings(), &Config{}) assert.NoError(t, err) require.NotNil(t, got) } diff --git a/exporter/zipkinexporter/factory.go b/exporter/zipkinexporter/factory.go index 9bd21c63446c9..fedd1c8ab210a 100644 --- a/exporter/zipkinexporter/factory.go +++ b/exporter/zipkinexporter/factory.go @@ -22,6 +22,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confighttp" + "go.opentelemetry.io/collector/exporter" "go.opentelemetry.io/collector/exporter/exporterhelper" ) @@ -39,11 +40,11 @@ const ( ) // NewFactory creates a factory for Zipkin exporter. -func NewFactory() component.ExporterFactory { - return component.NewExporterFactory( +func NewFactory() exporter.Factory { + return exporter.NewFactory( typeStr, createDefaultConfig, - component.WithTracesExporter(createTracesExporter, stability)) + exporter.WithTraces(createTracesExporter, stability)) } func createDefaultConfig() component.Config { @@ -63,9 +64,9 @@ func createDefaultConfig() component.Config { func createTracesExporter( ctx context.Context, - set component.ExporterCreateSettings, + set exporter.CreateSettings, cfg component.Config, -) (component.TracesExporter, error) { +) (exporter.Traces, error) { zc := cfg.(*Config) if zc.Endpoint == "" { diff --git a/exporter/zipkinexporter/factory_test.go b/exporter/zipkinexporter/factory_test.go index 9d4581f61299f..9821c52fd6027 100644 --- a/exporter/zipkinexporter/factory_test.go +++ b/exporter/zipkinexporter/factory_test.go @@ -20,6 +20,7 @@ import ( "github.com/stretchr/testify/assert" "go.opentelemetry.io/collector/component/componenttest" + "go.opentelemetry.io/collector/exporter/exportertest" ) func TestCreateDefaultConfig(t *testing.T) { @@ -33,14 +34,14 @@ func TestCreateInstanceViaFactory(t *testing.T) { // Default config doesn't have default endpoint so creating from it should // fail. - ze, err := createTracesExporter(context.Background(), componenttest.NewNopExporterCreateSettings(), cfg) + ze, err := createTracesExporter(context.Background(), exportertest.NewNopCreateSettings(), cfg) assert.Error(t, err) assert.Nil(t, ze) // URL doesn't have a default value so set it directly. zeCfg := cfg.(*Config) zeCfg.Endpoint = "http://some.location.org:9411/api/v2/spans" - ze, err = createTracesExporter(context.Background(), componenttest.NewNopExporterCreateSettings(), cfg) + ze, err = createTracesExporter(context.Background(), exportertest.NewNopCreateSettings(), cfg) assert.NoError(t, err) assert.NotNil(t, ze) } diff --git a/exporter/zipkinexporter/go.mod b/exporter/zipkinexporter/go.mod index 8d2e193df7114..7b694ed0c8a1c 100644 --- a/exporter/zipkinexporter/go.mod +++ b/exporter/zipkinexporter/go.mod @@ -3,16 +3,16 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/exporter/zipkin go 1.18 require ( - github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/zipkin v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver v0.66.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/zipkin v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver v0.67.0 github.com/openzipkin/zipkin-go v0.4.1 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector v0.67.0 + go.opentelemetry.io/collector/component v0.67.0 + go.opentelemetry.io/collector/confmap v0.67.0 + go.opentelemetry.io/collector/consumer v0.67.0 + go.opentelemetry.io/collector/pdata v1.0.0-rc1 ) require ( @@ -34,15 +34,15 @@ 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/internal/coreinternal v0.66.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.67.0 // indirect github.com/opentracing/opentracing-go v1.2.0 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rs/cors v1.8.2 // indirect github.com/uber/jaeger-client-go v2.30.0+incompatible // indirect github.com/uber/jaeger-lib v2.4.1+incompatible // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect - go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/featuregate v0.67.0 // indirect + go.opentelemetry.io/collector/semconv v0.67.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect diff --git a/exporter/zipkinexporter/go.sum b/exporter/zipkinexporter/go.sum index 0134546029755..f9b21383240c4 100644 --- a/exporter/zipkinexporter/go.sum +++ b/exporter/zipkinexporter/go.sum @@ -298,20 +298,20 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 h1:Q5L9Urod3c8as6ZYaoaqBjarx/HXxsxy34DFZIU2fO4= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/component v0.67.0 h1:GCBRZAqk4yNaT4L1uwlbbwophFHrxYccLZ4Uj1Ifs/M= +go.opentelemetry.io/collector/component v0.67.0/go.mod h1:Txa2lm9oe7xsGQN8u7GdUIrRpAHFIKsTO4Qi3/CSmKk= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= +go.opentelemetry.io/collector/semconv v0.67.0 h1:zLAvcQa6Kgow52FFLrmk7/9ZVtEYyA73+xDtCcFG78Q= +go.opentelemetry.io/collector/semconv v0.67.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 h1:aUEBEdCa6iamGzg6fuYxDA8ThxvOG240mAvWDU+XLio= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4/go.mod h1:l2MdsbKTocpPS5nQZscqTR9jd8u96VYZdcpF8Sye7mA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= diff --git a/exporter/zipkinexporter/zipkin_test.go b/exporter/zipkinexporter/zipkin_test.go index 3b653899243a8..9616286505998 100644 --- a/exporter/zipkinexporter/zipkin_test.go +++ b/exporter/zipkinexporter/zipkin_test.go @@ -33,6 +33,8 @@ import ( "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confighttp" + "go.opentelemetry.io/collector/exporter/exportertest" + "go.opentelemetry.io/collector/receiver/receivertest" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/common/testutil" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver" @@ -64,7 +66,7 @@ func TestZipkinExporter_roundtripJSON(t *testing.T) { }, Format: "json", } - zexp, err := NewFactory().CreateTracesExporter(context.Background(), componenttest.NewNopExporterCreateSettings(), cfg) + zexp, err := NewFactory().CreateTracesExporter(context.Background(), exportertest.NewNopCreateSettings(), cfg) assert.NoError(t, err) require.NotNil(t, zexp) @@ -82,7 +84,7 @@ func TestZipkinExporter_roundtripJSON(t *testing.T) { Endpoint: addr, }, } - zi, err := zipkinreceiver.NewFactory().CreateTracesReceiver(context.Background(), componenttest.NewNopReceiverCreateSettings(), recvCfg, zexp) + zi, err := zipkinreceiver.NewFactory().CreateTracesReceiver(context.Background(), receivertest.NewNopCreateSettings(), recvCfg, zexp) assert.NoError(t, err) require.NotNil(t, zi) @@ -289,7 +291,7 @@ func TestZipkinExporter_invalidFormat(t *testing.T) { Format: "foobar", } f := NewFactory() - set := componenttest.NewNopExporterCreateSettings() + set := exportertest.NewNopCreateSettings() _, err := f.CreateTracesExporter(context.Background(), set, config) require.Error(t, err) } @@ -312,7 +314,7 @@ func TestZipkinExporter_roundtripProto(t *testing.T) { }, Format: "proto", } - zexp, err := NewFactory().CreateTracesExporter(context.Background(), componenttest.NewNopExporterCreateSettings(), cfg) + zexp, err := NewFactory().CreateTracesExporter(context.Background(), exportertest.NewNopCreateSettings(), cfg) require.NoError(t, err) require.NoError(t, zexp.Start(context.Background(), componenttest.NewNopHost())) @@ -331,7 +333,7 @@ func TestZipkinExporter_roundtripProto(t *testing.T) { Endpoint: addr, }, } - zi, err := zipkinreceiver.NewFactory().CreateTracesReceiver(context.Background(), componenttest.NewNopReceiverCreateSettings(), recvCfg, zexp) + zi, err := zipkinreceiver.NewFactory().CreateTracesReceiver(context.Background(), receivertest.NewNopCreateSettings(), recvCfg, zexp) require.NoError(t, err) err = zi.Start(context.Background(), componenttest.NewNopHost()) diff --git a/extension/asapauthextension/go.mod b/extension/asapauthextension/go.mod index 533b1e27fa4d4..0d0a7fd364dd8 100644 --- a/extension/asapauthextension/go.mod +++ b/extension/asapauthextension/go.mod @@ -6,9 +6,9 @@ require ( bitbucket.org/atlassian/go-asap/v2 v2.6.0 github.com/SermoDigital/jose v0.9.2-0.20161205224733-f6df55f235c2 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a + go.opentelemetry.io/collector v0.67.0 + go.opentelemetry.io/collector/component v0.67.0 + go.opentelemetry.io/collector/confmap v0.67.0 go.uber.org/multierr v1.8.0 google.golang.org/grpc v1.51.0 ) @@ -31,9 +31,9 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/pquerna/cachecontrol v0.1.0 // indirect github.com/vincent-petithory/dataurl v1.0.0 // indirect - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/consumer v0.67.0 // indirect + go.opentelemetry.io/collector/featuregate v0.67.0 // indirect + go.opentelemetry.io/collector/pdata v1.0.0-rc1 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/extension/asapauthextension/go.sum b/extension/asapauthextension/go.sum index 27b0e0de5b8ed..310f2f69ac141 100644 --- a/extension/asapauthextension/go.sum +++ b/extension/asapauthextension/go.sum @@ -276,18 +276,18 @@ github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1 go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A= go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/component v0.67.0 h1:GCBRZAqk4yNaT4L1uwlbbwophFHrxYccLZ4Uj1Ifs/M= +go.opentelemetry.io/collector/component v0.67.0/go.mod h1:Txa2lm9oe7xsGQN8u7GdUIrRpAHFIKsTO4Qi3/CSmKk= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/metric v0.33.0 h1:xQAyl7uGEYvrLAiV/09iTJlp1pZnQ9Wl793qbVvED1E= diff --git a/extension/awsproxy/go.mod b/extension/awsproxy/go.mod index 45771ba5d2dd2..052b20a7532ba 100644 --- a/extension/awsproxy/go.mod +++ b/extension/awsproxy/go.mod @@ -3,12 +3,12 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/extension/awspr go 1.18 require ( - github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/proxy v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.66.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/proxy v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.67.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a + go.opentelemetry.io/collector v0.67.0 + go.opentelemetry.io/collector/component v0.67.0 + go.opentelemetry.io/collector/confmap v0.67.0 go.uber.org/zap v1.24.0 ) @@ -27,9 +27,9 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rogpeppe/go-internal v1.8.0 // indirect - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/consumer v0.67.0 // indirect + go.opentelemetry.io/collector/featuregate v0.67.0 // indirect + go.opentelemetry.io/collector/pdata v1.0.0-rc1 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/extension/awsproxy/go.sum b/extension/awsproxy/go.sum index 8a749ba9f777c..e67b40fa55e06 100644 --- a/extension/awsproxy/go.sum +++ b/extension/awsproxy/go.sum @@ -265,18 +265,18 @@ github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5t go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A= go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/component v0.67.0 h1:GCBRZAqk4yNaT4L1uwlbbwophFHrxYccLZ4Uj1Ifs/M= +go.opentelemetry.io/collector/component v0.67.0/go.mod h1:Txa2lm9oe7xsGQN8u7GdUIrRpAHFIKsTO4Qi3/CSmKk= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/metric v0.33.0 h1:xQAyl7uGEYvrLAiV/09iTJlp1pZnQ9Wl793qbVvED1E= diff --git a/extension/basicauthextension/go.mod b/extension/basicauthextension/go.mod index b9723dfe621e0..8b7111decfbfd 100644 --- a/extension/basicauthextension/go.mod +++ b/extension/basicauthextension/go.mod @@ -5,9 +5,9 @@ go 1.18 require ( github.com/stretchr/testify v1.8.1 github.com/tg123/go-htpasswd v1.2.0 - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a + go.opentelemetry.io/collector v0.67.0 + go.opentelemetry.io/collector/component v0.67.0 + go.opentelemetry.io/collector/confmap v0.67.0 google.golang.org/grpc v1.51.0 ) @@ -27,9 +27,9 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pelletier/go-toml v1.9.4 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/consumer v0.67.0 // indirect + go.opentelemetry.io/collector/featuregate v0.67.0 // indirect + go.opentelemetry.io/collector/pdata v1.0.0-rc1 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/extension/basicauthextension/go.sum b/extension/basicauthextension/go.sum index 8b277d8bd36c7..4f034fd543bc5 100644 --- a/extension/basicauthextension/go.sum +++ b/extension/basicauthextension/go.sum @@ -269,18 +269,18 @@ github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1 go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A= go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/component v0.67.0 h1:GCBRZAqk4yNaT4L1uwlbbwophFHrxYccLZ4Uj1Ifs/M= +go.opentelemetry.io/collector/component v0.67.0/go.mod h1:Txa2lm9oe7xsGQN8u7GdUIrRpAHFIKsTO4Qi3/CSmKk= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/metric v0.33.0 h1:xQAyl7uGEYvrLAiV/09iTJlp1pZnQ9Wl793qbVvED1E= diff --git a/extension/bearertokenauthextension/go.mod b/extension/bearertokenauthextension/go.mod index 0825d74b0b057..d2ace93fec392 100644 --- a/extension/bearertokenauthextension/go.mod +++ b/extension/bearertokenauthextension/go.mod @@ -5,9 +5,9 @@ go 1.18 require ( github.com/fsnotify/fsnotify v1.6.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a + go.opentelemetry.io/collector v0.67.0 + go.opentelemetry.io/collector/component v0.67.0 + go.opentelemetry.io/collector/confmap v0.67.0 go.uber.org/zap v1.24.0 google.golang.org/grpc v1.51.0 ) @@ -27,9 +27,9 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pelletier/go-toml v1.9.4 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/consumer v0.67.0 // indirect + go.opentelemetry.io/collector/featuregate v0.67.0 // indirect + go.opentelemetry.io/collector/pdata v1.0.0-rc1 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/extension/bearertokenauthextension/go.sum b/extension/bearertokenauthextension/go.sum index a48f699ce35e4..4824cb16bd658 100644 --- a/extension/bearertokenauthextension/go.sum +++ b/extension/bearertokenauthextension/go.sum @@ -266,18 +266,18 @@ github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1 go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A= go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/component v0.67.0 h1:GCBRZAqk4yNaT4L1uwlbbwophFHrxYccLZ4Uj1Ifs/M= +go.opentelemetry.io/collector/component v0.67.0/go.mod h1:Txa2lm9oe7xsGQN8u7GdUIrRpAHFIKsTO4Qi3/CSmKk= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/metric v0.33.0 h1:xQAyl7uGEYvrLAiV/09iTJlp1pZnQ9Wl793qbVvED1E= diff --git a/extension/fluentbitextension/go.mod b/extension/fluentbitextension/go.mod index ccaa4cebba171..116b3fe4c9ae0 100644 --- a/extension/fluentbitextension/go.mod +++ b/extension/fluentbitextension/go.mod @@ -7,9 +7,9 @@ require ( github.com/davecgh/go-spew v1.1.1 github.com/shirou/gopsutil/v3 v3.22.10 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a + go.opentelemetry.io/collector v0.67.0 + go.opentelemetry.io/collector/component v0.67.0 + go.opentelemetry.io/collector/confmap v0.67.0 go.uber.org/zap v1.24.0 ) @@ -33,9 +33,9 @@ require ( github.com/tklauser/go-sysconf v0.3.11 // indirect github.com/tklauser/numcpus v0.6.0 // indirect github.com/yusufpapurcu/wmi v1.2.2 // indirect - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/consumer v0.67.0 // indirect + go.opentelemetry.io/collector/featuregate v0.67.0 // indirect + go.opentelemetry.io/collector/pdata v1.0.0-rc1 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/extension/fluentbitextension/go.sum b/extension/fluentbitextension/go.sum index cdf9f63181db4..6ac7fc363ccbf 100644 --- a/extension/fluentbitextension/go.sum +++ b/extension/fluentbitextension/go.sum @@ -282,18 +282,18 @@ github.com/yusufpapurcu/wmi v1.2.2/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQ go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A= go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/component v0.67.0 h1:GCBRZAqk4yNaT4L1uwlbbwophFHrxYccLZ4Uj1Ifs/M= +go.opentelemetry.io/collector/component v0.67.0/go.mod h1:Txa2lm9oe7xsGQN8u7GdUIrRpAHFIKsTO4Qi3/CSmKk= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/metric v0.33.0 h1:xQAyl7uGEYvrLAiV/09iTJlp1pZnQ9Wl793qbVvED1E= diff --git a/extension/headerssetterextension/go.mod b/extension/headerssetterextension/go.mod index ab97a3510c718..35954ff783044 100644 --- a/extension/headerssetterextension/go.mod +++ b/extension/headerssetterextension/go.mod @@ -4,9 +4,9 @@ go 1.18 require ( github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a + go.opentelemetry.io/collector v0.67.0 + go.opentelemetry.io/collector/component v0.67.0 + go.opentelemetry.io/collector/confmap v0.67.0 google.golang.org/grpc v1.51.0 ) @@ -22,9 +22,9 @@ require ( github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/consumer v0.67.0 // indirect + go.opentelemetry.io/collector/featuregate v0.67.0 // indirect + go.opentelemetry.io/collector/pdata v1.0.0-rc1 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/extension/headerssetterextension/go.sum b/extension/headerssetterextension/go.sum index 764af4a7bede2..276111f44b896 100644 --- a/extension/headerssetterextension/go.sum +++ b/extension/headerssetterextension/go.sum @@ -257,18 +257,18 @@ github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1 go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A= go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/component v0.67.0 h1:GCBRZAqk4yNaT4L1uwlbbwophFHrxYccLZ4Uj1Ifs/M= +go.opentelemetry.io/collector/component v0.67.0/go.mod h1:Txa2lm9oe7xsGQN8u7GdUIrRpAHFIKsTO4Qi3/CSmKk= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/metric v0.33.0 h1:xQAyl7uGEYvrLAiV/09iTJlp1pZnQ9Wl793qbVvED1E= diff --git a/extension/healthcheckextension/go.mod b/extension/healthcheckextension/go.mod index 4bd758d44df84..f724ec4c9bba9 100644 --- a/extension/healthcheckextension/go.mod +++ b/extension/healthcheckextension/go.mod @@ -4,12 +4,12 @@ go 1.18 require ( github.com/jaegertracing/jaeger v1.39.1-0.20221110195127-14c11365a856 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.66.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.67.0 github.com/stretchr/testify v1.8.1 go.opencensus.io v0.24.0 - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a + go.opentelemetry.io/collector v0.67.0 + go.opentelemetry.io/collector/component v0.67.0 + go.opentelemetry.io/collector/confmap v0.67.0 go.uber.org/zap v1.24.0 ) @@ -31,9 +31,9 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rs/cors v1.8.2 // indirect - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/consumer v0.67.0 // indirect + go.opentelemetry.io/collector/featuregate v0.67.0 // indirect + go.opentelemetry.io/collector/pdata v1.0.0-rc1 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect diff --git a/extension/healthcheckextension/go.sum b/extension/healthcheckextension/go.sum index 8acf98af26d55..93c02661369ed 100644 --- a/extension/healthcheckextension/go.sum +++ b/extension/healthcheckextension/go.sum @@ -272,18 +272,18 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/component v0.67.0 h1:GCBRZAqk4yNaT4L1uwlbbwophFHrxYccLZ4Uj1Ifs/M= +go.opentelemetry.io/collector/component v0.67.0/go.mod h1:Txa2lm9oe7xsGQN8u7GdUIrRpAHFIKsTO4Qi3/CSmKk= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 h1:aUEBEdCa6iamGzg6fuYxDA8ThxvOG240mAvWDU+XLio= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4/go.mod h1:l2MdsbKTocpPS5nQZscqTR9jd8u96VYZdcpF8Sye7mA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= diff --git a/extension/httpforwarder/go.mod b/extension/httpforwarder/go.mod index adaf0a1d06305..04bc66954f27e 100644 --- a/extension/httpforwarder/go.mod +++ b/extension/httpforwarder/go.mod @@ -3,11 +3,11 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/extension/httpf go 1.18 require ( - github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.66.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.67.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a + go.opentelemetry.io/collector v0.67.0 + go.opentelemetry.io/collector/component v0.67.0 + go.opentelemetry.io/collector/confmap v0.67.0 go.uber.org/zap v1.24.0 ) @@ -33,9 +33,9 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rogpeppe/go-internal v1.8.0 // indirect github.com/rs/cors v1.8.2 // indirect - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/consumer v0.67.0 // indirect + go.opentelemetry.io/collector/featuregate v0.67.0 // indirect + go.opentelemetry.io/collector/pdata v1.0.0-rc1 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect diff --git a/extension/httpforwarder/go.sum b/extension/httpforwarder/go.sum index dbeeff260bc3b..d3b8634e2fa42 100644 --- a/extension/httpforwarder/go.sum +++ b/extension/httpforwarder/go.sum @@ -279,18 +279,18 @@ github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1 go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A= go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/component v0.67.0 h1:GCBRZAqk4yNaT4L1uwlbbwophFHrxYccLZ4Uj1Ifs/M= +go.opentelemetry.io/collector/component v0.67.0/go.mod h1:Txa2lm9oe7xsGQN8u7GdUIrRpAHFIKsTO4Qi3/CSmKk= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 h1:aUEBEdCa6iamGzg6fuYxDA8ThxvOG240mAvWDU+XLio= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4/go.mod h1:l2MdsbKTocpPS5nQZscqTR9jd8u96VYZdcpF8Sye7mA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= diff --git a/extension/jaegerremotesampling/go.mod b/extension/jaegerremotesampling/go.mod index f4ce69f1816b0..4b268dbe91779 100644 --- a/extension/jaegerremotesampling/go.mod +++ b/extension/jaegerremotesampling/go.mod @@ -5,9 +5,9 @@ go 1.18 require ( github.com/jaegertracing/jaeger v1.39.1-0.20221110195127-14c11365a856 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a + go.opentelemetry.io/collector v0.67.0 + go.opentelemetry.io/collector/component v0.67.0 + go.opentelemetry.io/collector/confmap v0.67.0 go.uber.org/zap v1.24.0 google.golang.org/grpc v1.51.0 ) @@ -47,9 +47,9 @@ require ( github.com/subosito/gotenv v1.4.1 // indirect github.com/uber/jaeger-client-go v2.30.0+incompatible // indirect github.com/uber/jaeger-lib v2.4.1+incompatible // indirect - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/consumer v0.67.0 // indirect + go.opentelemetry.io/collector/featuregate v0.67.0 // indirect + go.opentelemetry.io/collector/pdata v1.0.0-rc1 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 // indirect go.opentelemetry.io/otel v1.11.1 // indirect diff --git a/extension/jaegerremotesampling/go.sum b/extension/jaegerremotesampling/go.sum index 23b9ec4010ea9..c343dbd95f37c 100644 --- a/extension/jaegerremotesampling/go.sum +++ b/extension/jaegerremotesampling/go.sum @@ -423,18 +423,18 @@ go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/component v0.67.0 h1:GCBRZAqk4yNaT4L1uwlbbwophFHrxYccLZ4Uj1Ifs/M= +go.opentelemetry.io/collector/component v0.67.0/go.mod h1:Txa2lm9oe7xsGQN8u7GdUIrRpAHFIKsTO4Qi3/CSmKk= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4 h1:PRXhsszxTt5bbPriTjmaweWUsAnJYeWBhUMLRetUgBU= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4/go.mod h1:05eWWy6ZWzmpeImD3UowLTB3VjDMU1yxQ+ENuVWDM3c= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 h1:aUEBEdCa6iamGzg6fuYxDA8ThxvOG240mAvWDU+XLio= diff --git a/extension/oauth2clientauthextension/go.mod b/extension/oauth2clientauthextension/go.mod index 29e83fbb817ca..4e3213dfc2dfe 100644 --- a/extension/oauth2clientauthextension/go.mod +++ b/extension/oauth2clientauthextension/go.mod @@ -4,9 +4,9 @@ go 1.18 require ( github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a + go.opentelemetry.io/collector v0.67.0 + go.opentelemetry.io/collector/component v0.67.0 + go.opentelemetry.io/collector/confmap v0.67.0 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.24.0 golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 @@ -36,9 +36,9 @@ require ( github.com/pelletier/go-toml v1.9.4 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rs/cors v1.8.2 // indirect - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/consumer v0.67.0 // indirect + go.opentelemetry.io/collector/featuregate v0.67.0 // indirect + go.opentelemetry.io/collector/pdata v1.0.0-rc1 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect diff --git a/extension/oauth2clientauthextension/go.sum b/extension/oauth2clientauthextension/go.sum index 1431cd4b3179f..9199387a89a04 100644 --- a/extension/oauth2clientauthextension/go.sum +++ b/extension/oauth2clientauthextension/go.sum @@ -276,18 +276,18 @@ github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1 go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A= go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/component v0.67.0 h1:GCBRZAqk4yNaT4L1uwlbbwophFHrxYccLZ4Uj1Ifs/M= +go.opentelemetry.io/collector/component v0.67.0/go.mod h1:Txa2lm9oe7xsGQN8u7GdUIrRpAHFIKsTO4Qi3/CSmKk= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 h1:aUEBEdCa6iamGzg6fuYxDA8ThxvOG240mAvWDU+XLio= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4/go.mod h1:l2MdsbKTocpPS5nQZscqTR9jd8u96VYZdcpF8Sye7mA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= diff --git a/extension/observer/dockerobserver/go.mod b/extension/observer/dockerobserver/go.mod index 7ae91e2b9e48c..ea18b9081902e 100644 --- a/extension/observer/dockerobserver/go.mod +++ b/extension/observer/dockerobserver/go.mod @@ -5,14 +5,14 @@ go 1.18 require ( github.com/docker/docker v20.10.21+incompatible github.com/docker/go-connections v0.4.1-0.20210727194412-58542c764a11 - github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/docker v0.66.0 + github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/docker v0.67.0 github.com/stretchr/testify v1.8.1 github.com/testcontainers/testcontainers-go v0.15.0 - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a + go.opentelemetry.io/collector v0.67.0 + go.opentelemetry.io/collector/component v0.67.0 + go.opentelemetry.io/collector/confmap v0.67.0 go.uber.org/zap v1.24.0 ) @@ -53,9 +53,9 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/sirupsen/logrus v1.8.1 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/consumer v0.67.0 // indirect + go.opentelemetry.io/collector/featuregate v0.67.0 // indirect + go.opentelemetry.io/collector/pdata v1.0.0-rc1 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/extension/observer/dockerobserver/go.sum b/extension/observer/dockerobserver/go.sum index 6d5dd8f445a05..4f905f3f07b5e 100644 --- a/extension/observer/dockerobserver/go.sum +++ b/extension/observer/dockerobserver/go.sum @@ -813,18 +813,18 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/component v0.67.0 h1:GCBRZAqk4yNaT4L1uwlbbwophFHrxYccLZ4Uj1Ifs/M= +go.opentelemetry.io/collector/component v0.67.0/go.mod h1:Txa2lm9oe7xsGQN8u7GdUIrRpAHFIKsTO4Qi3/CSmKk= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/metric v0.33.0 h1:xQAyl7uGEYvrLAiV/09iTJlp1pZnQ9Wl793qbVvED1E= diff --git a/extension/observer/ecsobserver/go.mod b/extension/observer/ecsobserver/go.mod index 201f93812a7b3..12ce31d6fabdb 100644 --- a/extension/observer/ecsobserver/go.mod +++ b/extension/observer/ecsobserver/go.mod @@ -6,9 +6,9 @@ require ( github.com/aws/aws-sdk-go v1.44.155 github.com/hashicorp/golang-lru v0.5.4 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a + go.opentelemetry.io/collector v0.67.0 + go.opentelemetry.io/collector/component v0.67.0 + go.opentelemetry.io/collector/confmap v0.67.0 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.24.0 gopkg.in/yaml.v2 v2.4.0 @@ -30,9 +30,9 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pelletier/go-toml v1.9.4 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/consumer v0.67.0 // indirect + go.opentelemetry.io/collector/featuregate v0.67.0 // indirect + go.opentelemetry.io/collector/pdata v1.0.0-rc1 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/extension/observer/ecsobserver/go.sum b/extension/observer/ecsobserver/go.sum index 56a86f80f411b..468e3af46b035 100644 --- a/extension/observer/ecsobserver/go.sum +++ b/extension/observer/ecsobserver/go.sum @@ -272,18 +272,18 @@ github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5t go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A= go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/component v0.67.0 h1:GCBRZAqk4yNaT4L1uwlbbwophFHrxYccLZ4Uj1Ifs/M= +go.opentelemetry.io/collector/component v0.67.0/go.mod h1:Txa2lm9oe7xsGQN8u7GdUIrRpAHFIKsTO4Qi3/CSmKk= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/metric v0.33.0 h1:xQAyl7uGEYvrLAiV/09iTJlp1pZnQ9Wl793qbVvED1E= diff --git a/extension/observer/ecstaskobserver/go.mod b/extension/observer/ecstaskobserver/go.mod index 9c50308d491fc..a257aad4eb503 100644 --- a/extension/observer/ecstaskobserver/go.mod +++ b/extension/observer/ecstaskobserver/go.mod @@ -3,13 +3,13 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/extension/obser go 1.18 require ( - github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/ecsutil v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.66.0 + github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/ecsutil v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.67.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a + go.opentelemetry.io/collector v0.67.0 + go.opentelemetry.io/collector/component v0.67.0 + go.opentelemetry.io/collector/confmap v0.67.0 go.uber.org/zap v1.24.0 ) @@ -31,9 +31,9 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rs/cors v1.8.2 // indirect - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/consumer v0.67.0 // indirect + go.opentelemetry.io/collector/featuregate v0.67.0 // indirect + go.opentelemetry.io/collector/pdata v1.0.0-rc1 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect diff --git a/extension/observer/ecstaskobserver/go.sum b/extension/observer/ecstaskobserver/go.sum index 39ca154f30641..97a390fd484e4 100644 --- a/extension/observer/ecstaskobserver/go.sum +++ b/extension/observer/ecstaskobserver/go.sum @@ -272,18 +272,18 @@ github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1 go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A= go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/component v0.67.0 h1:GCBRZAqk4yNaT4L1uwlbbwophFHrxYccLZ4Uj1Ifs/M= +go.opentelemetry.io/collector/component v0.67.0/go.mod h1:Txa2lm9oe7xsGQN8u7GdUIrRpAHFIKsTO4Qi3/CSmKk= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 h1:aUEBEdCa6iamGzg6fuYxDA8ThxvOG240mAvWDU+XLio= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4/go.mod h1:l2MdsbKTocpPS5nQZscqTR9jd8u96VYZdcpF8Sye7mA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= diff --git a/extension/observer/hostobserver/go.mod b/extension/observer/hostobserver/go.mod index 1f5cb384391a2..1ac18e7e9ab6c 100644 --- a/extension/observer/hostobserver/go.mod +++ b/extension/observer/hostobserver/go.mod @@ -3,12 +3,12 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/extension/obser go 1.18 require ( - github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer v0.66.0 + github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer v0.67.0 github.com/shirou/gopsutil/v3 v3.22.10 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a + go.opentelemetry.io/collector v0.67.0 + go.opentelemetry.io/collector/component v0.67.0 + go.opentelemetry.io/collector/confmap v0.67.0 go.uber.org/zap v1.24.0 ) @@ -34,9 +34,9 @@ require ( github.com/tklauser/go-sysconf v0.3.11 // indirect github.com/tklauser/numcpus v0.6.0 // indirect github.com/yusufpapurcu/wmi v1.2.2 // indirect - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/consumer v0.67.0 // indirect + go.opentelemetry.io/collector/featuregate v0.67.0 // indirect + go.opentelemetry.io/collector/pdata v1.0.0-rc1 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/extension/observer/hostobserver/go.sum b/extension/observer/hostobserver/go.sum index 3b770579d6c7d..692d8f1d348b0 100644 --- a/extension/observer/hostobserver/go.sum +++ b/extension/observer/hostobserver/go.sum @@ -284,18 +284,18 @@ github.com/yusufpapurcu/wmi v1.2.2/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQ go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A= go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/component v0.67.0 h1:GCBRZAqk4yNaT4L1uwlbbwophFHrxYccLZ4Uj1Ifs/M= +go.opentelemetry.io/collector/component v0.67.0/go.mod h1:Txa2lm9oe7xsGQN8u7GdUIrRpAHFIKsTO4Qi3/CSmKk= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/metric v0.33.0 h1:xQAyl7uGEYvrLAiV/09iTJlp1pZnQ9Wl793qbVvED1E= diff --git a/extension/observer/k8sobserver/go.mod b/extension/observer/k8sobserver/go.mod index 5a50702b482f6..853e21172387c 100644 --- a/extension/observer/k8sobserver/go.mod +++ b/extension/observer/k8sobserver/go.mod @@ -3,12 +3,12 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/extension/obser go 1.18 require ( - github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.66.0 + github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.67.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a + go.opentelemetry.io/collector v0.67.0 + go.opentelemetry.io/collector/component v0.67.0 + go.opentelemetry.io/collector/confmap v0.67.0 go.uber.org/zap v1.24.0 k8s.io/api v0.25.4 k8s.io/apimachinery v0.25.4 @@ -47,9 +47,9 @@ require ( github.com/pelletier/go-toml v1.9.4 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/spf13/pflag v1.0.5 // indirect - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/consumer v0.67.0 // indirect + go.opentelemetry.io/collector/featuregate v0.67.0 // indirect + go.opentelemetry.io/collector/pdata v1.0.0-rc1 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/extension/observer/k8sobserver/go.sum b/extension/observer/k8sobserver/go.sum index c5fb64fd54f64..eb4e5e9f5ebc3 100644 --- a/extension/observer/k8sobserver/go.sum +++ b/extension/observer/k8sobserver/go.sum @@ -432,18 +432,18 @@ 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 v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/component v0.67.0 h1:GCBRZAqk4yNaT4L1uwlbbwophFHrxYccLZ4Uj1Ifs/M= +go.opentelemetry.io/collector/component v0.67.0/go.mod h1:Txa2lm9oe7xsGQN8u7GdUIrRpAHFIKsTO4Qi3/CSmKk= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/metric v0.33.0 h1:xQAyl7uGEYvrLAiV/09iTJlp1pZnQ9Wl793qbVvED1E= diff --git a/extension/oidcauthextension/go.mod b/extension/oidcauthextension/go.mod index dbfb14c908f91..2c2029c6d858e 100644 --- a/extension/oidcauthextension/go.mod +++ b/extension/oidcauthextension/go.mod @@ -5,8 +5,8 @@ go 1.18 require ( github.com/coreos/go-oidc v2.2.1+incompatible github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector v0.67.0 + go.opentelemetry.io/collector/component v0.67.0 go.uber.org/zap v1.24.0 ) @@ -26,10 +26,10 @@ require ( github.com/pelletier/go-toml v1.9.4 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/pquerna/cachecontrol v0.1.0 // indirect - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a // indirect - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/confmap v0.67.0 // indirect + go.opentelemetry.io/collector/consumer v0.67.0 // indirect + go.opentelemetry.io/collector/featuregate v0.67.0 // indirect + go.opentelemetry.io/collector/pdata v1.0.0-rc1 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/extension/oidcauthextension/go.sum b/extension/oidcauthextension/go.sum index 974a8b4bacfce..72a43a9c4fd03 100644 --- a/extension/oidcauthextension/go.sum +++ b/extension/oidcauthextension/go.sum @@ -345,18 +345,18 @@ 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 v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/component v0.67.0 h1:GCBRZAqk4yNaT4L1uwlbbwophFHrxYccLZ4Uj1Ifs/M= +go.opentelemetry.io/collector/component v0.67.0/go.mod h1:Txa2lm9oe7xsGQN8u7GdUIrRpAHFIKsTO4Qi3/CSmKk= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/metric v0.33.0 h1:xQAyl7uGEYvrLAiV/09iTJlp1pZnQ9Wl793qbVvED1E= diff --git a/extension/pprofextension/go.mod b/extension/pprofextension/go.mod index 6e1cb808b97bc..832bbe4fd5e7e 100644 --- a/extension/pprofextension/go.mod +++ b/extension/pprofextension/go.mod @@ -3,11 +3,11 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/extension/pprof go 1.18 require ( - github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.66.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.67.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a + go.opentelemetry.io/collector v0.67.0 + go.opentelemetry.io/collector/component v0.67.0 + go.opentelemetry.io/collector/confmap v0.67.0 go.uber.org/atomic v1.10.0 go.uber.org/zap v1.24.0 ) @@ -28,9 +28,9 @@ require ( github.com/pelletier/go-toml v1.9.4 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rogpeppe/go-internal v1.8.0 // indirect - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/consumer v0.67.0 // indirect + go.opentelemetry.io/collector/featuregate v0.67.0 // indirect + go.opentelemetry.io/collector/pdata v1.0.0-rc1 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/extension/pprofextension/go.sum b/extension/pprofextension/go.sum index a0ac7f5279f0d..c18055a3fefc1 100644 --- a/extension/pprofextension/go.sum +++ b/extension/pprofextension/go.sum @@ -266,18 +266,18 @@ github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1 go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A= go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/component v0.67.0 h1:GCBRZAqk4yNaT4L1uwlbbwophFHrxYccLZ4Uj1Ifs/M= +go.opentelemetry.io/collector/component v0.67.0/go.mod h1:Txa2lm9oe7xsGQN8u7GdUIrRpAHFIKsTO4Qi3/CSmKk= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/metric v0.33.0 h1:xQAyl7uGEYvrLAiV/09iTJlp1pZnQ9Wl793qbVvED1E= diff --git a/extension/sigv4authextension/go.mod b/extension/sigv4authextension/go.mod index f69081f94753b..d1b7355c16fe5 100644 --- a/extension/sigv4authextension/go.mod +++ b/extension/sigv4authextension/go.mod @@ -8,9 +8,9 @@ require ( github.com/aws/aws-sdk-go-v2/credentials v1.13.4 github.com/aws/aws-sdk-go-v2/service/sts v1.17.6 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a + go.opentelemetry.io/collector v0.67.0 + go.opentelemetry.io/collector/component v0.67.0 + go.opentelemetry.io/collector/confmap v0.67.0 go.uber.org/zap v1.24.0 google.golang.org/grpc v1.51.0 ) @@ -35,9 +35,9 @@ require ( github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/consumer v0.67.0 // indirect + go.opentelemetry.io/collector/featuregate v0.67.0 // indirect + go.opentelemetry.io/collector/pdata v1.0.0-rc1 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/extension/sigv4authextension/go.sum b/extension/sigv4authextension/go.sum index df9a921005b38..06b43a0a92023 100644 --- a/extension/sigv4authextension/go.sum +++ b/extension/sigv4authextension/go.sum @@ -282,18 +282,18 @@ github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1 go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A= go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/component v0.67.0 h1:GCBRZAqk4yNaT4L1uwlbbwophFHrxYccLZ4Uj1Ifs/M= +go.opentelemetry.io/collector/component v0.67.0/go.mod h1:Txa2lm9oe7xsGQN8u7GdUIrRpAHFIKsTO4Qi3/CSmKk= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/metric v0.33.0 h1:xQAyl7uGEYvrLAiV/09iTJlp1pZnQ9Wl793qbVvED1E= diff --git a/extension/storage/go.mod b/extension/storage/go.mod index ed80679d59723..36b4cfc80ea58 100644 --- a/extension/storage/go.mod +++ b/extension/storage/go.mod @@ -7,9 +7,9 @@ require ( github.com/mattn/go-sqlite3 v2.0.3+incompatible github.com/stretchr/testify v1.8.1 go.etcd.io/bbolt v1.3.6 - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a + go.opentelemetry.io/collector v0.67.0 + go.opentelemetry.io/collector/component v0.67.0 + go.opentelemetry.io/collector/confmap v0.67.0 go.uber.org/zap v1.24.0 ) @@ -35,9 +35,9 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pelletier/go-toml v1.9.4 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/consumer v0.67.0 // indirect + go.opentelemetry.io/collector/featuregate v0.67.0 // indirect + go.opentelemetry.io/collector/pdata v1.0.0-rc1 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/extension/storage/go.sum b/extension/storage/go.sum index ef6e42b75fd46..ef7fc5d40de1d 100644 --- a/extension/storage/go.sum +++ b/extension/storage/go.sum @@ -347,18 +347,18 @@ go.etcd.io/bbolt v1.3.6/go.mod h1:qXsaaIqmgQH0T+OPdb99Bf+PKfBBQVAdyD6TY9G8XM4= go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A= go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/component v0.67.0 h1:GCBRZAqk4yNaT4L1uwlbbwophFHrxYccLZ4Uj1Ifs/M= +go.opentelemetry.io/collector/component v0.67.0/go.mod h1:Txa2lm9oe7xsGQN8u7GdUIrRpAHFIKsTO4Qi3/CSmKk= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/metric v0.33.0 h1:xQAyl7uGEYvrLAiV/09iTJlp1pZnQ9Wl793qbVvED1E= diff --git a/go.mod b/go.mod index 1d7cc686a6e96..f6f55b8b90422 100644 --- a/go.mod +++ b/go.mod @@ -3,177 +3,174 @@ module github.com/open-telemetry/opentelemetry-collector-contrib go 1.18 require ( - github.com/grafana/loki v1.6.2-0.20221206154352-fee23745328c - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/alibabacloudlogserviceexporter v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awscloudwatchlogsexporter v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsemfexporter v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awskinesisexporter v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsxrayexporter v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/azuredataexplorerexporter v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/azuremonitorexporter v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/carbonexporter v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/clickhouseexporter v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/coralogixexporter v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/datadogexporter v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/dynatraceexporter v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/elasticsearchexporter v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/f5cloudexporter v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/fileexporter v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/googlecloudexporter v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/googlecloudpubsubexporter v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/googlemanagedprometheusexporter v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/humioexporter v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/influxdbexporter v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/instanaexporter v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/jaegerexporter v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/jaegerthrifthttpexporter v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/kafkaexporter v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/loadbalancingexporter v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/logzioexporter v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/lokiexporter v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/mezmoexporter v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/opencensusexporter v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/parquetexporter v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusexporter v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusremotewriteexporter v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/pulsarexporter v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/sapmexporter v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/sentryexporter v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/signalfxexporter v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/skywalkingexporter v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/splunkhecexporter v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/sumologicexporter v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/tanzuobservabilityexporter v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/tencentcloudlogserviceexporter v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/zipkinexporter v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/extension/asapauthextension v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/extension/awsproxy v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/extension/basicauthextension v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/extension/bearertokenauthextension v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/extension/fluentbitextension v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/extension/headerssetterextension v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/extension/httpforwarder v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/extension/oauth2clientauthextension v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/ecstaskobserver v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/hostobserver v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/k8sobserver v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/extension/oidcauthextension v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/extension/pprofextension v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/extension/sigv4authextension v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/processor/cumulativetodeltaprocessor v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/processor/deltatorateprocessor v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/processor/filterprocessor v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/processor/groupbyattrsprocessor v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/processor/groupbytraceprocessor v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/processor/k8sattributesprocessor v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/processor/metricsgenerationprocessor v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/processor/metricstransformprocessor v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/processor/probabilisticsamplerprocessor v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourceprocessor v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/processor/routingprocessor v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/processor/servicegraphprocessor v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/processor/spanmetricsprocessor v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/processor/spanprocessor v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/processor/tailsamplingprocessor v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/processor/transformprocessor v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/activedirectorydsreceiver v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/aerospikereceiver v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/apachereceiver v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awscloudwatchreceiver v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsecscontainermetricsreceiver v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsfirehosereceiver v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsxrayreceiver v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/azureeventhubreceiver v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/bigipreceiver v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/carbonreceiver v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/chronyreceiver v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/cloudfoundryreceiver v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/collectdreceiver v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/couchdbreceiver v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/dockerstatsreceiver v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/dotnetdiagnosticsreceiver v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/elasticsearchreceiver v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/expvarreceiver v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/filelogreceiver v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/flinkmetricsreceiver v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/fluentforwardreceiver v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/googlecloudpubsubreceiver v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/googlecloudspannerreceiver v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/httpcheckreceiver v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/iisreceiver v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/influxdbreceiver v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jmxreceiver v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/journaldreceiver v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8sclusterreceiver v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8seventsreceiver v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8sobjectsreceiver v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkametricsreceiver v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkareceiver v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kubeletstatsreceiver v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/memcachedreceiver v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/mongodbatlasreceiver v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/mongodbreceiver v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/mysqlreceiver v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/nginxreceiver v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/nsxtreceiver v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/opencensusreceiver v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/oracledbreceiver v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/otlpjsonfilereceiver v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/podmanreceiver v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/postgresqlreceiver v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusexecreceiver v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/promtailreceiver v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/pulsarreceiver v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/purefareceiver v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/rabbitmqreceiver v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/receivercreator v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/redisreceiver v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/riakreceiver v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/saphanareceiver v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/sapmreceiver v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/signalfxreceiver v0.0.0-00010101000000-000000000000 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/simpleprometheusreceiver v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/skywalkingreceiver v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/snmpreceiver v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/solacereceiver v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/splunkhecreceiver v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/sqlqueryreceiver v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/sqlserverreceiver v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/statsdreceiver v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/syslogreceiver v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/tcplogreceiver v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/udplogreceiver v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/vcenterreceiver v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/wavefrontreceiver v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/windowseventlogreceiver v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/windowsperfcountersreceiver v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zookeeperreceiver v0.66.0 - github.com/prometheus/common v0.37.0 + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/alibabacloudlogserviceexporter v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awscloudwatchlogsexporter v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsemfexporter v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awskinesisexporter v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsxrayexporter v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/azuredataexplorerexporter v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/azuremonitorexporter v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/carbonexporter v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/clickhouseexporter v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/coralogixexporter v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/datadogexporter v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/dynatraceexporter v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/elasticsearchexporter v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/f5cloudexporter v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/fileexporter v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/googlecloudexporter v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/googlecloudpubsubexporter v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/googlemanagedprometheusexporter v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/humioexporter v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/influxdbexporter v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/instanaexporter v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/jaegerexporter v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/jaegerthrifthttpexporter v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/kafkaexporter v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/loadbalancingexporter v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/logzioexporter v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/lokiexporter v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/mezmoexporter v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/opencensusexporter v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/parquetexporter v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusexporter v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusremotewriteexporter v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/pulsarexporter v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/sapmexporter v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/sentryexporter v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/signalfxexporter v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/skywalkingexporter v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/splunkhecexporter v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/sumologicexporter v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/tanzuobservabilityexporter v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/tencentcloudlogserviceexporter v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/zipkinexporter v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/extension/asapauthextension v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/extension/awsproxy v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/extension/basicauthextension v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/extension/bearertokenauthextension v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/extension/fluentbitextension v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/extension/headerssetterextension v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/extension/httpforwarder v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/extension/oauth2clientauthextension v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/ecstaskobserver v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/hostobserver v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/k8sobserver v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/extension/oidcauthextension v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/extension/pprofextension v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/extension/sigv4authextension v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/processor/cumulativetodeltaprocessor v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/processor/deltatorateprocessor v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/processor/filterprocessor v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/processor/groupbyattrsprocessor v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/processor/groupbytraceprocessor v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/processor/k8sattributesprocessor v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/processor/metricsgenerationprocessor v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/processor/metricstransformprocessor v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/processor/probabilisticsamplerprocessor v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourceprocessor v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/processor/routingprocessor v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/processor/servicegraphprocessor v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/processor/spanmetricsprocessor v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/processor/spanprocessor v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/processor/tailsamplingprocessor v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/processor/transformprocessor v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/activedirectorydsreceiver v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/aerospikereceiver v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/apachereceiver v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awscloudwatchreceiver v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsecscontainermetricsreceiver v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsfirehosereceiver v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsxrayreceiver v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/azureeventhubreceiver v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/bigipreceiver v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/carbonreceiver v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/chronyreceiver v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/cloudfoundryreceiver v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/collectdreceiver v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/couchdbreceiver v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/dockerstatsreceiver v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/dotnetdiagnosticsreceiver v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/elasticsearchreceiver v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/expvarreceiver v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/filelogreceiver v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/flinkmetricsreceiver v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/fluentforwardreceiver v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/googlecloudpubsubreceiver v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/googlecloudspannerreceiver v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/httpcheckreceiver v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/iisreceiver v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/influxdbreceiver v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jmxreceiver v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/journaldreceiver v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8sclusterreceiver v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8seventsreceiver v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8sobjectsreceiver v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkametricsreceiver v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkareceiver v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kubeletstatsreceiver v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/memcachedreceiver v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/mongodbatlasreceiver v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/mongodbreceiver v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/mysqlreceiver v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/nginxreceiver v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/nsxtreceiver v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/opencensusreceiver v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/oracledbreceiver v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/otlpjsonfilereceiver v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/podmanreceiver v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/postgresqlreceiver v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusexecreceiver v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/pulsarreceiver v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/purefareceiver v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/rabbitmqreceiver v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/receivercreator v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/redisreceiver v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/riakreceiver v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/saphanareceiver v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/sapmreceiver v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/signalfxreceiver v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/simpleprometheusreceiver v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/skywalkingreceiver v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/snmpreceiver v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/solacereceiver v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/splunkhecreceiver v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/sqlqueryreceiver v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/sqlserverreceiver v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/statsdreceiver v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/syslogreceiver v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/tcplogreceiver v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/udplogreceiver v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/vcenterreceiver v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/wavefrontreceiver v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/windowseventlogreceiver v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/windowsperfcountersreceiver v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zookeeperreceiver v0.67.0 github.com/prometheus/prometheus v0.40.5 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/exporter/loggingexporter v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/exporter/otlpexporter v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/exporter/otlphttpexporter v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/extension/ballastextension v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/extension/zpagesextension v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/receiver/otlpreceiver v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector v0.67.0 + go.opentelemetry.io/collector/component v0.67.0 + go.opentelemetry.io/collector/consumer v0.67.0 + go.opentelemetry.io/collector/exporter/loggingexporter v0.67.0 + go.opentelemetry.io/collector/exporter/otlpexporter v0.67.0 + go.opentelemetry.io/collector/exporter/otlphttpexporter v0.67.0 + go.opentelemetry.io/collector/extension/ballastextension v0.67.0 + go.opentelemetry.io/collector/extension/zpagesextension v0.67.0 + go.opentelemetry.io/collector/processor/batchprocessor v0.67.0 + go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.67.0 + go.opentelemetry.io/collector/receiver/otlpreceiver v0.67.0 golang.org/x/sys v0.3.0 ) @@ -241,9 +238,6 @@ require ( github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector/googlemanagedprometheus v0.34.3-0.20221202192616-0186b89ba914 // indirect github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.10.2 // indirect github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.34.3-0.20221202192616-0186b89ba914 // indirect - github.com/Masterminds/goutils v1.1.1 // indirect - github.com/Masterminds/semver/v3 v3.1.1 // indirect - github.com/Masterminds/sprig/v3 v3.2.2 // indirect github.com/Microsoft/go-winio v0.5.2 // indirect github.com/ReneKroon/ttlcache/v2 v2.11.0 // indirect github.com/SAP/go-hdb v0.111.5 // indirect @@ -262,7 +256,6 @@ require ( github.com/apache/thrift v0.17.0 // indirect github.com/ardielle/ardielle-go v1.5.2 // indirect github.com/armon/go-metrics v0.4.0 // indirect - github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d // indirect github.com/aws/aws-sdk-go v1.44.155 // indirect github.com/aws/aws-sdk-go-v2 v1.17.2 // indirect github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.4.10 // indirect @@ -286,21 +279,15 @@ require ( github.com/aws/smithy-go v1.13.5 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/blang/semver v3.5.1+incompatible // indirect - github.com/bmatcuk/doublestar v1.2.2 // indirect github.com/bmatcuk/doublestar/v4 v4.4.0 // indirect - github.com/bradfitz/gomemcache v0.0.0-20190913173617-a41fca850d0b // indirect - github.com/buger/jsonparser v1.1.1 // indirect - github.com/c2h5oh/datasize v0.0.0-20200112174442-28bbd4740fee // indirect github.com/caio/go-tdigest v3.1.0+incompatible // indirect github.com/cenkalti/backoff v2.2.1+incompatible // indirect github.com/cenkalti/backoff/v4 v4.2.0 // indirect github.com/census-instrumentation/opencensus-proto v0.4.1 // indirect - github.com/cespare/xxhash v1.1.0 // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect github.com/checkpoint-restore/go-criu/v5 v5.3.0 // indirect github.com/cihub/seelog v0.0.0-20170130134532-f561c5e57575 // indirect github.com/cilium/ebpf v0.8.1 // indirect - github.com/cloudflare/cloudflare-go v0.27.0 // indirect github.com/cloudfoundry-incubator/uaago v0.0.0-20190307164349-8136b7bbe76e // indirect github.com/cncf/udpa/go v0.0.0-20210930031921-04548b0d99d4 // indirect github.com/cncf/xds/go v0.0.0-20220314180256-7f1daf1720fc // indirect @@ -308,8 +295,6 @@ require ( github.com/containerd/console v1.0.3 // indirect github.com/containerd/ttrpc v1.1.0 // indirect github.com/coreos/go-oidc v2.2.1+incompatible // indirect - github.com/coreos/go-semver v0.3.0 // indirect - github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf // indirect github.com/coreos/go-systemd/v22 v22.4.0 // indirect github.com/cyphar/filepath-securejoin v0.2.3 // indirect github.com/danieljoos/wincred v1.1.2 // indirect @@ -318,7 +303,6 @@ require ( github.com/dennwc/varint v1.0.0 // indirect github.com/devigned/tab v0.1.1 // indirect github.com/dgraph-io/ristretto v0.1.1 // indirect - github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect github.com/digitalocean/godo v1.88.0 // indirect github.com/dimchansky/utfbom v1.1.1 // indirect github.com/docker/distribution v2.8.1+incompatible // indirect @@ -331,7 +315,6 @@ require ( github.com/eapache/go-resiliency v1.3.0 // indirect github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21 // indirect github.com/eapache/queue v1.1.0 // indirect - github.com/edsrzf/mmap-go v1.1.0 // indirect github.com/elastic/elastic-transport-go/v8 v8.1.0 // indirect github.com/elastic/go-elasticsearch/v8 v8.5.0 // indirect github.com/elastic/go-structform v0.0.10 // indirect @@ -340,7 +323,6 @@ require ( github.com/envoyproxy/protoc-gen-validate v0.6.13 // indirect github.com/euank/go-kmsg-parser v2.0.0+incompatible // indirect github.com/facebook/time v0.0.0-20220713225404-f7a0d7702d50 // indirect - github.com/facette/natsort v0.0.0-20181210072756-2cd4dd1e2dcb // indirect github.com/fatih/color v1.13.0 // indirect github.com/felixge/httpsnoop v1.0.3 // indirect github.com/form3tech-oss/jwt-go v3.2.5+incompatible // indirect @@ -355,17 +337,10 @@ require ( github.com/go-logr/logr v1.2.3 // indirect github.com/go-logr/stdr v1.2.2 // indirect github.com/go-ole/go-ole v1.2.6 // indirect - github.com/go-openapi/analysis v0.21.2 // indirect - github.com/go-openapi/errors v0.20.2 // indirect github.com/go-openapi/jsonpointer v0.19.5 // indirect github.com/go-openapi/jsonreference v0.20.0 // indirect - github.com/go-openapi/loads v0.21.1 // indirect - github.com/go-openapi/spec v0.20.6 // indirect - github.com/go-openapi/strfmt v0.21.3 // indirect github.com/go-openapi/swag v0.22.1 // indirect - github.com/go-openapi/validate v0.22.0 // indirect github.com/go-redis/redis/v7 v7.4.1 // indirect - github.com/go-redis/redis/v8 v8.11.5 // indirect github.com/go-resty/resty/v2 v2.1.1-0.20191201195748-d7b97669fe48 // indirect github.com/go-sql-driver/mysql v1.7.0 // indirect github.com/go-stack/stack v1.8.1 // indirect @@ -376,7 +351,6 @@ require ( github.com/gofrs/uuid v4.2.0+incompatible // indirect github.com/gogo/googleapis v1.4.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect - github.com/gogo/status v1.1.1 // indirect github.com/golang-jwt/jwt v3.2.2+incompatible // indirect github.com/golang-jwt/jwt/v4 v4.4.2 // indirect github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe // indirect @@ -385,14 +359,12 @@ require ( github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect github.com/golang/protobuf v1.5.2 // indirect github.com/golang/snappy v0.0.4 // indirect - github.com/google/btree v1.0.1 // indirect github.com/google/cadvisor v0.46.0 // indirect github.com/google/flatbuffers v2.0.8+incompatible // indirect github.com/google/gnostic v0.5.7-v3refs // 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/renameio/v2 v2.0.0 // indirect github.com/google/uuid v1.3.0 // indirect github.com/googleapis/enterprise-certificate-proxy v0.2.0 // indirect github.com/googleapis/gax-go/v2 v2.7.0 // indirect @@ -400,11 +372,8 @@ require ( github.com/gorilla/mux v1.8.0 // indirect github.com/gorilla/websocket v1.5.0 // indirect github.com/gosnmp/gosnmp v1.35.0 // indirect - github.com/grafana/dskit v0.0.0-20220928083349-b1b307db4f30 // indirect - github.com/grafana/go-gelf/v2 v2.0.1 // indirect github.com/grafana/regexp v0.0.0-20221005093135-b4c2bcb0a4b6 // indirect github.com/grobie/gomemcache v0.0.0-20180201122607-1f779c573665 // indirect - github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 // indirect github.com/grpc-ecosystem/grpc-gateway/v2 v2.14.0 // indirect github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c // indirect github.com/hashicorp/consul/api v1.18.0 // indirect @@ -413,21 +382,15 @@ require ( github.com/hashicorp/go-cleanhttp v0.5.2 // indirect github.com/hashicorp/go-hclog v1.3.1 // indirect github.com/hashicorp/go-immutable-radix v1.3.1 // indirect - github.com/hashicorp/go-msgpack v0.5.5 // indirect github.com/hashicorp/go-multierror v1.1.1 // indirect github.com/hashicorp/go-retryablehttp v0.7.1 // indirect github.com/hashicorp/go-rootcerts v1.0.2 // indirect - github.com/hashicorp/go-sockaddr v1.0.2 // indirect github.com/hashicorp/go-uuid v1.0.3 // indirect github.com/hashicorp/go-version v1.6.0 // indirect github.com/hashicorp/golang-lru v0.5.4 // indirect - github.com/hashicorp/memberlist v0.5.0 // indirect github.com/hashicorp/nomad/api v0.0.0-20221102143410-8a95f1239005 // indirect github.com/hashicorp/serf v0.10.1 // indirect - github.com/heroku/x v0.0.50 // indirect github.com/hetznercloud/hcloud-go v1.35.3 // indirect - github.com/hpcloud/tail v1.0.0 // indirect - github.com/huandu/xstrings v1.3.1 // indirect github.com/iancoleman/strcase v0.2.0 // indirect github.com/imdario/mergo v0.3.12 // indirect github.com/inconshreveable/mousetrap v1.0.1 // indirect @@ -436,7 +399,6 @@ require ( github.com/influxdata/influxdb-observability/influx2otel v0.2.32 // indirect github.com/influxdata/influxdb-observability/otel2influx v0.2.32 // indirect github.com/influxdata/line-protocol/v2 v2.2.1 // indirect - github.com/influxdata/telegraf v1.16.3 // indirect github.com/ionos-cloud/sdk-go/v6 v6.1.3 // indirect github.com/jackc/chunkreader/v2 v2.0.1 // indirect github.com/jackc/pgconn v1.13.0 // indirect @@ -456,7 +418,6 @@ require ( github.com/josharian/intern v1.0.0 // indirect github.com/jpillora/backoff v1.0.0 // indirect github.com/json-iterator/go v1.1.12 // indirect - github.com/julienschmidt/httprouter v1.3.0 // indirect github.com/karrick/godirwalk v1.17.0 // indirect github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect github.com/klauspost/compress v1.15.12 // indirect @@ -498,36 +459,35 @@ require ( github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f // indirect github.com/nginxinc/nginx-prometheus-exporter v0.8.1-0.20201110005315-f5a5f8086c19 // indirect github.com/observiq/ctimefmt v1.0.0 // indirect - github.com/oklog/ulid v1.3.1 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/containerinsight v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/cwlogs v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/ecsutil v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/k8s v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/metrics v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/proxy v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/internal/docker v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/internal/filter v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/internal/kubelet v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/internal/metadataproviders v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/internal/splunk v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchperresourceattr v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchpersignal v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/experimentalmetricmetadata v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/loki v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheus v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheusremotewrite v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/signalfx v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/zipkin v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/winperfcounters v0.66.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/containerinsight v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/cwlogs v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/ecsutil v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/k8s v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/metrics v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/proxy v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/internal/docker v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/internal/filter v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/internal/kubelet v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/internal/metadataproviders v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/internal/splunk v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchperresourceattr v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchpersignal v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/experimentalmetricmetadata v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/loki v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheus v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheusremotewrite v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/signalfx v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/zipkin v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/winperfcounters v0.67.0 // indirect github.com/opencontainers/go-digest v1.0.0 // indirect github.com/opencontainers/image-spec v1.0.3-0.20211202183452-c5a74bcca799 // indirect github.com/opencontainers/runc v1.1.4 // indirect @@ -536,8 +496,6 @@ require ( github.com/openlyinc/pointy v1.2.0 // indirect github.com/openshift/api v0.0.0-20210521075222-e273a339932a // indirect github.com/openshift/client-go v0.0.0-20210521082421-73d9475a9142 // indirect - github.com/opentracing-contrib/go-grpc v0.0.0-20210225150812-73cb765af46e // indirect - github.com/opentracing-contrib/go-stdlib v1.0.0 // indirect github.com/opentracing/opentracing-go v1.2.0 // indirect github.com/openzipkin/zipkin-go v0.4.1 // indirect github.com/ovh/go-ovh v1.3.0 // indirect @@ -551,22 +509,19 @@ require ( github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect github.com/power-devops/perfstat v0.0.0-20220216144756-c35f1ee13d7c // indirect github.com/pquerna/cachecontrol v0.1.0 // indirect - github.com/prometheus/alertmanager v0.24.0 // indirect github.com/prometheus/client_golang v1.14.0 // indirect github.com/prometheus/client_model v0.3.0 // indirect + github.com/prometheus/common v0.37.0 // indirect github.com/prometheus/common/sigv4 v0.1.0 // indirect - github.com/prometheus/exporter-toolkit v0.8.2 // indirect github.com/prometheus/procfs v0.8.0 // indirect github.com/prometheus/statsd_exporter v0.22.7 // indirect github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect github.com/relvacode/iso8601 v1.1.0 // indirect github.com/rs/cors v1.8.2 // indirect github.com/scaleway/scaleway-sdk-go v1.0.0-beta.9 // indirect - github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529 // indirect github.com/seccomp/libseccomp-golang v0.9.2-0.20220502022130-f33da4d89646 // indirect github.com/secure-systems-lab/go-securesystemslib v0.4.0 // indirect github.com/segmentio/asm v1.2.0 // indirect - github.com/sercand/kuberesolver v2.4.0+incompatible // indirect github.com/shirou/gopsutil/v3 v3.22.10 // indirect github.com/shopspring/decimal v1.3.1 // indirect github.com/signalfx/com_signalfx_metrics_protobuf v0.0.3 // indirect @@ -578,9 +533,7 @@ require ( github.com/sirupsen/logrus v1.9.0 // indirect github.com/snowflakedb/gosnowflake v1.6.15 // indirect github.com/soheilhy/cmux v0.1.5 // indirect - github.com/sony/gobreaker v0.5.0 // indirect github.com/spaolacci/murmur3 v1.1.0 // indirect - github.com/spf13/afero v1.9.2 // indirect github.com/spf13/cast v1.5.0 // indirect github.com/spf13/cobra v1.6.1 // indirect github.com/spf13/pflag v1.0.5 // indirect @@ -588,7 +541,6 @@ require ( github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635 // indirect github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.553 // indirect github.com/tg123/go-htpasswd v1.2.0 // indirect - github.com/thanos-io/thanos v0.28.0 // indirect github.com/theupdateframework/go-tuf v0.3.0 // indirect github.com/tidwall/gjson v1.14.3 // indirect github.com/tidwall/match v1.1.1 // indirect @@ -608,8 +560,6 @@ require ( github.com/vmware/govmomi v0.29.0 // indirect github.com/vultr/govultr/v2 v2.17.2 // indirect github.com/wavefronthq/wavefront-sdk-go v0.11.0 // indirect - github.com/weaveworks/common v0.0.0-20221201103051-7c2720a9024d // indirect - github.com/weaveworks/promrus v1.2.0 // indirect github.com/xdg-go/pbkdf2 v1.0.0 // indirect github.com/xdg-go/scram v1.1.1 // indirect github.com/xdg-go/stringprep v1.0.3 // indirect @@ -617,16 +567,13 @@ require ( github.com/yuin/gopher-lua v0.0.0-20220504180219-658193537a64 // indirect github.com/yusufpapurcu/wmi v1.2.2 // indirect go.etcd.io/bbolt v1.3.6 // indirect - go.etcd.io/etcd/api/v3 v3.5.5 // indirect - go.etcd.io/etcd/client/pkg/v3 v3.5.5 // indirect - go.etcd.io/etcd/client/v3 v3.5.5 // indirect go.mongodb.org/atlas v0.19.0 // indirect go.mongodb.org/mongo-driver v1.10.3 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 // indirect - go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/confmap v0.67.0 // indirect + go.opentelemetry.io/collector/featuregate v0.67.0 // indirect + go.opentelemetry.io/collector/pdata v1.0.0-rc1 // indirect + go.opentelemetry.io/collector/semconv v0.67.0 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 // indirect go.opentelemetry.io/contrib/propagators/b3 v1.11.1 // indirect @@ -641,8 +588,6 @@ require ( go.uber.org/goleak v1.2.0 // indirect go.uber.org/multierr v1.8.0 // indirect go.uber.org/zap v1.24.0 // indirect - go4.org/intern v0.0.0-20211027215823-ae77deb06f29 // indirect - go4.org/unsafe/assume-no-moving-gc v0.0.0-20220617031537-928513b29760 // indirect golang.org/x/crypto v0.3.0 // indirect golang.org/x/exp v0.0.0-20221205204356-47842c84f3db // indirect golang.org/x/mod v0.7.0 // indirect @@ -660,17 +605,13 @@ require ( google.golang.org/genproto v0.0.0-20221206210731-b1a01be3a5f6 // indirect google.golang.org/grpc v1.51.0 // indirect google.golang.org/protobuf v1.28.1 // indirect - gopkg.in/fsnotify.v1 v1.4.7 // indirect - gopkg.in/fsnotify/fsnotify.v1 v1.4.7 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect gopkg.in/square/go-jose.v2 v2.5.1 // indirect - gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect gopkg.in/zorkian/go-datadog-api.v2 v2.30.0 // indirect - inet.af/netaddr v0.0.0-20211027220019-c74959edd3b6 // indirect k8s.io/api v0.25.4 // indirect k8s.io/apimachinery v0.25.4 // indirect k8s.io/client-go v0.25.4 // indirect diff --git a/go.sum b/go.sum index 8cb03e68bafba..f202d27eb8f4f 100644 --- a/go.sum +++ b/go.sum @@ -3,7 +3,6 @@ bitbucket.org/atlassian/go-asap/v2 v2.6.0 h1:KiLw3IgbzFLqNxCrVZoKUDJKMxUGoOd+NEO bitbucket.org/atlassian/go-asap/v2 v2.6.0/go.mod h1:cuRgWb7eeGtsocKmqY2kPlMMlwpkeNh+QOIkjAMlUBc= cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= -cloud.google.com/go v0.37.4/go.mod h1:NHPJ89PdicEuT9hdPXMROBD91xc5uRDxsMtSB16k7hw= 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= @@ -168,7 +167,6 @@ cloud.google.com/go/iap v1.4.0/go.mod h1:RGFwRJdihTINIe4wZ2iCP0zF/qu18ZwyKxrhMhy cloud.google.com/go/ids v1.1.0/go.mod h1:WIuwCaYVOzHIj2OhN9HAwvW+DBdmUAdcWlFxRl+KubM= cloud.google.com/go/iot v1.3.0/go.mod h1:r7RGh2B61+B8oz0AGE+J72AhA0G7tdXItODWsaA2oLs= cloud.google.com/go/kms v1.5.0/go.mod h1:QJS2YY0eJGBg3mnDfuaCyLauWwBJiHRboYxJ++1xJNg= -cloud.google.com/go/kms v1.6.0 h1:OWRZzrPmOZUzurjI2FBGtgY2mB1WaJkqhw6oIwSj0Yg= cloud.google.com/go/language v1.4.0/go.mod h1:F9dRpNFQmJbkaop6g0JhSBXCNlO90e1KWx5iDdxbWic= cloud.google.com/go/language v1.6.0/go.mod h1:6dJ8t3B+lUYfStgls25GusK04NLh3eDLQnWM3mdEbhI= cloud.google.com/go/language v1.7.0/go.mod h1:DJ6dYN/W+SQOjF8e1hLQXMF21AkH2w9wiPzPCJa2MIE= @@ -308,8 +306,6 @@ code.cloudfoundry.org/go-loggregator v7.4.0+incompatible h1:KqZYloMQWM5Zg/BQKunO code.cloudfoundry.org/go-loggregator v7.4.0+incompatible/go.mod h1:KPBTRqj+y738Nhf1+g4JHFaBU8j7dedirR5ETNHvMXU= code.cloudfoundry.org/rfc5424 v0.0.0-20201103192249-000122071b78 h1:mrZQaZmuDIPhSp6b96b+CRKC2uH44ifa5cjDV2epKis= code.cloudfoundry.org/rfc5424 v0.0.0-20201103192249-000122071b78/go.mod h1:tkZo8GtzBjySJ7USvxm4E36lNQw1D3xM6oKHGqdaAJ4= -collectd.org v0.3.0/go.mod h1:A/8DzQBkF6abtvrT2j/AU/4tiBgJWYyh0y/oB/4MlWE= -contrib.go.opencensus.io/exporter/ocagent v0.6.0/go.mod h1:zmKjrJcdo0aYcVS7bmEeSEBLPA9YJp5bjrofdU3pIXs= contrib.go.opencensus.io/exporter/prometheus v0.4.1/go.mod h1:t9wvfitlUjGXG2IXAZsuFq26mDGid/JwCEXp+gTG/9U= contrib.go.opencensus.io/exporter/prometheus v0.4.2 h1:sqfsYl5GIY/L570iT+l93ehxaWJs2/OwXtiWwew3oAg= contrib.go.opencensus.io/exporter/prometheus v0.4.2/go.mod h1:dvEHbiKmgvbr5pjaF9fpw1KeYcjrnC1J8B+JKjsZyRQ= @@ -325,19 +321,15 @@ github.com/99designs/keyring v1.2.1/go.mod h1:fc+wB5KTk9wQ9sDx0kFXB3A0MaeGHM9AwR github.com/AndreasBriese/bbloom v0.0.0-20190825152654-46b345b51c96/go.mod h1:bOvUY6CB00SOBii9/FifXqc0awNKxLFCL/+pkDPuyl8= github.com/AthenZ/athenz v1.10.39 h1:mtwHTF/v62ewY2Z5KWhuZgVXftBej1/Tn80zx4DcawY= github.com/AthenZ/athenz v1.10.39/go.mod h1:3Tg8HLsiQZp81BJY58JBeU2BR6B/H4/0MQGfCwhHNEA= -github.com/Azure/azure-amqp-common-go/v3 v3.0.0/go.mod h1:SY08giD/XbhTz07tJdpw1SoxQXHPN30+DI3Z04SYqyg= github.com/Azure/azure-amqp-common-go/v3 v3.2.3 h1:uDF62mbd9bypXWi19V1bN5NZEO84JqgmI5G73ibAmrk= github.com/Azure/azure-amqp-common-go/v3 v3.2.3/go.mod h1:7rPmbSfszeovxGfc5fSAXE4ehlXQZHpMja2OtxC2Tas= -github.com/Azure/azure-event-hubs-go/v3 v3.2.0/go.mod h1:BPIIJNH/l/fVHYq3Rm6eg4clbrULrQ3q7+icmqHyyLc= github.com/Azure/azure-event-hubs-go/v3 v3.3.20 h1:LRAy00JlV5aDqd0LFXwfwFReYzl03CtH/kD91OHrT94= github.com/Azure/azure-event-hubs-go/v3 v3.3.20/go.mod h1:5GkwDWncbqGCPjf76khiylOAD2NjkrUrLFb/S99BiA8= github.com/Azure/azure-kusto-go v0.9.2 h1:AP0bNhGyvc51XHi6nBMABDjCqgJb/KGrCrcm7KvYFyk= github.com/Azure/azure-kusto-go v0.9.2/go.mod h1:i7WCtgt4XeHge3+Oi5sq84HYhneNi7VY7hr35wsUdrg= github.com/Azure/azure-pipeline-go v0.1.8/go.mod h1:XA1kFWRVhSK+KNFiOhfv83Fv8L9achrP7OxIzeTn1Yg= -github.com/Azure/azure-pipeline-go v0.1.9/go.mod h1:XA1kFWRVhSK+KNFiOhfv83Fv8L9achrP7OxIzeTn1Yg= github.com/Azure/azure-pipeline-go v0.2.3 h1:7U9HBg1JFK3jHl5qmo4CTZKFTVgMwdFHMVtCdfBE21U= github.com/Azure/azure-pipeline-go v0.2.3/go.mod h1:x841ezTBIMG6O3lAcl8ATHnsOPVl2bqk7S3ta6S6u4k= -github.com/Azure/azure-sdk-for-go v37.1.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= github.com/Azure/azure-sdk-for-go v61.2.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= github.com/Azure/azure-sdk-for-go v65.0.0+incompatible h1:HzKLt3kIwMm4KeJYTdx9EbjRYTySD/t8i1Ee/W5EGXw= github.com/Azure/azure-sdk-for-go v65.0.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= @@ -350,17 +342,13 @@ github.com/Azure/azure-sdk-for-go/sdk/internal v0.8.3 h1:E+m3SkZCN0Bf5q7YdTs5lSm github.com/Azure/azure-sdk-for-go/sdk/internal v0.8.3/go.mod h1:KLF4gFr6DcKFZwSuH8w8yEK6DpFl3LP5rhdvAb7Yz5I= github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v0.3.0 h1:Px2UA+2RvSSvv+RvJNuUB6n7rs5Wsel4dXLe90Um2n4= github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v0.3.0/go.mod h1:tPaiy8S5bQ+S5sOiDlINkp7+Ef339+Nz5L5XO+cnOHo= -github.com/Azure/azure-storage-blob-go v0.6.0/go.mod h1:oGfmITT1V6x//CswqY2gtAHND+xIP64/qL7a5QJix0Y= github.com/Azure/azure-storage-blob-go v0.15.0 h1:rXtgp8tN1p29GvpGgfJetavIG0V7OgcSXPpwp3tx6qk= github.com/Azure/azure-storage-blob-go v0.15.0/go.mod h1:vbjsVbX0dlxnRc4FFMPsS9BsJWPcne7GB7onqlPvz58= -github.com/Azure/azure-storage-queue-go v0.0.0-20181215014128-6ed74e755687/go.mod h1:K6am8mT+5iFXgingS9LUc7TmbsW6XBw3nxaRyaMyWc8= github.com/Azure/azure-storage-queue-go v0.0.0-20191125232315-636801874cdd h1:b3wyxBl3vvr15tUAziPBPK354y+LSdfPCpex5oBttHo= github.com/Azure/azure-storage-queue-go v0.0.0-20191125232315-636801874cdd/go.mod h1:K6am8mT+5iFXgingS9LUc7TmbsW6XBw3nxaRyaMyWc8= -github.com/Azure/go-amqp v0.12.6/go.mod h1:qApuH6OFTSKZFmCOxccvAv5rLizBQf4v8pRmG138DPo= github.com/Azure/go-amqp v0.17.0/go.mod h1:9YJ3RhxRT1gquYnzpZO1vcYMMpAdJT+QEg6fwmw9Zlg= github.com/Azure/go-amqp v0.17.5 h1:7Lsi9H9ijCAfqOaMiNmQ4c+GL9bdrpCjebNKhV/eQ+c= github.com/Azure/go-amqp v0.17.5/go.mod h1:9YJ3RhxRT1gquYnzpZO1vcYMMpAdJT+QEg6fwmw9Zlg= -github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8= github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 h1:UQHMgLO+TxOElx5B5HZ4hJQsoJ/PvUvKRhJHDQXO8P8= github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E= github.com/Azure/go-autorest v14.2.0+incompatible h1:V5VMDjClD3GiElqLWO7mz2MxNAK/vTfRHdAubSIPRgs= @@ -396,10 +384,8 @@ github.com/Azure/go-autorest/autorest/mocks v0.3.0/go.mod h1:a8FDP3DYzQ4RYfVAxAN github.com/Azure/go-autorest/autorest/mocks v0.4.1/go.mod h1:LTp+uSrOhSkaKrUy935gNZuuIPPVsHlr9DSOxSayd+k= github.com/Azure/go-autorest/autorest/mocks v0.4.2 h1:PGN4EDXnuQbojHbU0UWoNvmu9AGVwYHG9/fkDYhtAfw= github.com/Azure/go-autorest/autorest/mocks v0.4.2/go.mod h1:Vy7OitM9Kei0i1Oj+LvyAWMXJHeKH1MVlzFugfVrmyU= -github.com/Azure/go-autorest/autorest/to v0.3.0/go.mod h1:MgwOyqaIuKdG4TL/2ywSsIWKAfJfgHDo8ObuUk3t5sA= github.com/Azure/go-autorest/autorest/to v0.4.0 h1:oXVqrxakqqV1UZdSazDOPOLvOIz+XA683u8EctwboHk= github.com/Azure/go-autorest/autorest/to v0.4.0/go.mod h1:fE8iZBn7LQR7zH/9XU2NcPR4o9jEImooCeWJcYV/zLE= -github.com/Azure/go-autorest/autorest/validation v0.2.0/go.mod h1:3EEqHnBxQGHXRYq3HT1WyXAvT7LLY3tl70hw6tQIbjI= github.com/Azure/go-autorest/autorest/validation v0.3.1 h1:AgyqjAd94fwNAoTjl/WQXg4VvFeRFpO+UhNyRXqF1ac= github.com/Azure/go-autorest/autorest/validation v0.3.1/go.mod h1:yhLgjC0Wda5DYXl6JAsWyUe4KVNffhoDhG0zVzUMo3E= github.com/Azure/go-autorest/logger v0.1.0/go.mod h1:oExouG+K6PryycPJfVSxi/koC6LSNgds39diKLz7Vrc= @@ -468,16 +454,10 @@ github.com/HdrHistogram/hdrhistogram-go v1.1.0/go.mod h1:yDgFjdqOqDEKOvasDdhWNXY github.com/HdrHistogram/hdrhistogram-go v1.1.2 h1:5IcZpTvzydCQeHzK4Ef/D5rrSqwxob0t8PQPMybUNFM= github.com/HdrHistogram/hdrhistogram-go v1.1.2/go.mod h1:yDgFjdqOqDEKOvasDdhWNXYg9BVp4O+o5f6V/ehm6Oo= github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0= -github.com/Masterminds/goutils v1.1.1 h1:5nUrii3FMTL5diU80unEVvNevw1nH4+ZV4DSLVJLSYI= -github.com/Masterminds/goutils v1.1.1/go.mod h1:8cTjp+g8YejhMuvIA5y2vz3BpJxksy863GQaJW2MFNU= +github.com/Masterminds/semver v1.5.0 h1:H65muMkzWKEuNDnfl9d70GUjFniHKHRbFPGBuZ3QEww= github.com/Masterminds/semver v1.5.0/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y= github.com/Masterminds/semver/v3 v3.1.1 h1:hLg3sBzpNErnxhQtUy/mmLR2I9foDujNK030IGemrRc= github.com/Masterminds/semver/v3 v3.1.1/go.mod h1:VPu/7SZ7ePZ3QOrcuXROw5FAcLl4a0cBrbBpGY/8hQs= -github.com/Masterminds/sprig/v3 v3.2.2 h1:17jRggJu518dr3QaafizSXOjKYp94wKfABxUmyxvxX8= -github.com/Masterminds/sprig/v3 v3.2.2/go.mod h1:UoaO7Yp8KlPnJIYWTFkMaqPUYKTfGFPhxNuwnnxkKlk= -github.com/Mellanox/rdmamap v0.0.0-20191106181932-7c3c4763a6ee/go.mod h1:jDA6v0TUYrFEIAE5uGJ29LQOeONIgMdP4Rkqb8HUnPM= -github.com/Microsoft/ApplicationInsights-Go v0.4.2/go.mod h1:CukZ/G66zxXtI+h/VcVn3eVVDGDHfXM2zVILF7bMmsg= -github.com/Microsoft/go-winio v0.4.9/go.mod h1:VhR8bwka0BXejwEJY73c50VrPtXAaKcyvVC4A4RozmA= github.com/Microsoft/go-winio v0.4.15/go.mod h1:tTuCMEN+UleMWgg9dVx4Hu52b1bJo+59jBh3ajtinzw= github.com/Microsoft/go-winio v0.5.0/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpzfwIujj1a84= github.com/Microsoft/go-winio v0.5.1/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpzfwIujj1a84= @@ -487,12 +467,9 @@ github.com/Microsoft/hcsshim v0.9.4 h1:mnUj0ivWy6UzbB1uLFqKR6F+ZyiDc7j4iGgHTpO+5 github.com/Mottl/ctimefmt v0.0.0-20190803144728-fd2ac23a585a/go.mod h1:eyj2WSIdoPMPs2eNTLpSmM6Nzqo4V80/d6jHpnJ1SAI= github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= -github.com/OneOfOne/xxhash v1.2.6 h1:U68crOE3y3MPttCMQGywZOLrTeF5HHJ3/vDBCJn9/bA= github.com/OpenPeeDeeP/depguard v1.0.1/go.mod h1:xsIw86fROiiwelg+jB2uM9PiKihMMmUx/1V+TNhjQvM= -github.com/PuerkitoBio/purell v1.0.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0= github.com/PuerkitoBio/purell v1.1.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0= github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0= -github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE= github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE= github.com/ReneKroon/ttlcache/v2 v2.11.0 h1:OvlcYFYi941SBN3v9dsDcC2N8vRxyHcCmJb3Vl4QMoM= github.com/ReneKroon/ttlcache/v2 v2.11.0/go.mod h1:mBxvsNY+BT8qLLd6CuAJubbKo6r0jh3nb5et22bbfGY= @@ -502,7 +479,6 @@ github.com/SermoDigital/jose v0.9.2-0.20161205224733-f6df55f235c2 h1:koK7z0nSsRi github.com/SermoDigital/jose v0.9.2-0.20161205224733-f6df55f235c2/go.mod h1:ARgCUhI1MHQH+ONky/PAtmVHQrP5JlGY0F3poXOp/fA= github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo= github.com/Shopify/sarama v1.22.2-0.20190604114437-cd910a683f9f/go.mod h1:XLH1GYJnLVE0XCr6KdJGVJRTwY30moWNJ4sERjXX6fs= -github.com/Shopify/sarama v1.27.1/go.mod h1:g5s5osgELxgM+Md9Qni9rzo7Rbt+vvFQI4bt/Mc93II= github.com/Shopify/sarama v1.32.0/go.mod h1:+EmJJKZWVT/faR9RcOxJerP+LId4iWdQPBGLy1Y1Njs= github.com/Shopify/sarama v1.33.0/go.mod h1:lYO7LwEBkE0iAeTl94UfPSrDaavFzSFlmn+5isARATQ= github.com/Shopify/sarama v1.37.2 h1:LoBbU0yJPte0cE5TZCGdlzZRmMgMtZU/XgnUKZg9Cv4= @@ -513,12 +489,9 @@ github.com/Shopify/toxiproxy/v2 v2.3.0/go.mod h1:KvQTtB6RjCJY4zqNJn7C7JDFgsG5uoH github.com/Shopify/toxiproxy/v2 v2.5.0 h1:i4LPT+qrSlKNtQf5QliVjdP08GyAH8+BUIc9gT0eahc= github.com/Showmax/go-fqdn v1.0.0 h1:0rG5IbmVliNT5O19Mfuvna9LL7zlHyRfsSvBPZmF9tM= github.com/Showmax/go-fqdn v1.0.0/go.mod h1:SfrFBzmDCtCGrnHhoDjuvFnKsWjEQX/Q9ARZvOrJAko= -github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6/go.mod h1:3eOhrUMpNV+6aFIbp5/iudMxNCF27Vw2OZgy4xEx0Fg= github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d/go.mod h1:3eOhrUMpNV+6aFIbp5/iudMxNCF27Vw2OZgy4xEx0Fg= -github.com/StackExchange/wmi v1.2.1/go.mod h1:rcmrprowKIVzvc+NUiLncP2uuArMWLCbu9SBzvHz7e8= github.com/VividCortex/gohistogram v1.0.0 h1:6+hBz+qvs0JOrrNhhmR7lFxo5sINxBCGXrdtl/UvroE= github.com/VividCortex/gohistogram v1.0.0/go.mod h1:Pf5mBqqDxYaXu3hDrrU+w6nw50o/4+TcAqDqk/vUH7g= -github.com/aerospike/aerospike-client-go v1.27.0/go.mod h1:zj8LBEnWBDOVEIJt8LvaRvDG5ARAoa5dBeHaB472NRc= github.com/aerospike/aerospike-client-go/v6 v6.7.0 h1:La2669CfR3VgwGtgqeIB1U6EUxQOWyFoyQPM/WTM8ws= github.com/aerospike/aerospike-client-go/v6 v6.7.0/go.mod h1:Do5/flmgSo2X32YLGAYd6o5e/U2gOSpgEhrIGyOS3UI= github.com/afex/hystrix-go v0.0.0-20180502004556-fa1af6a1f4f5/go.mod h1:SkGFH1ia65gfNATL8TAiHDNxPzPdmEL5uirI2Uyuz6c= @@ -536,11 +509,8 @@ github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk5 github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 h1:s6gZFSlWYmbqAuRjVTiNNhvNRfY2Wxp9nhfyel4rklc= github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137/go.mod h1:OMCwj8VM1Kc9e19TLln2VL61YJF0x1XFtfdL4JdbSyE= github.com/alexkohler/prealloc v1.0.0/go.mod h1:VetnK3dIgFBBKmg0YnD9F9x6Icjd+9cvfHR56wJVlKE= -github.com/alicebob/gopher-json v0.0.0-20200520072559-a9ecdc9d1d3a h1:HbKu58rmZpUGpz5+4FfNmIU+FmZg2P3Xaj2v2bfNWmk= -github.com/alicebob/miniredis/v2 v2.22.0 h1:lIHHiSkEyS1MkKHCHzN+0mWrA4YdbGdimE5iZ2sHSzo= github.com/aliyun/aliyun-log-go-sdk v0.1.41 h1:aitUXlMIzMb8KZvwAqrJ77Nad9FOpAFi1Ju7rjFOYCM= github.com/aliyun/aliyun-log-go-sdk v0.1.41/go.mod h1:1QQ59pEJiVVXqKgbHcU6FWIgxT5RKBt+CT8AiQ2bEts= -github.com/amir/raidman v0.0.0-20170415203553-1ccc43bfb9c9/go.mod h1:eliMa/PW+RDr2QLWRmLH1R1ZA4RInpmvOzDDXtaIZkc= 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 h1:V7DdXeJtZscaqfNuAdSRuRFzuiKlHSC/Zh3zl9qY3JY= @@ -563,39 +533,29 @@ github.com/apache/thrift v0.17.0/go.mod h1:OLxhMRJxomX+1I/KUw03qoV3mMz16BwaKI+d4 github.com/ardielle/ardielle-go v1.5.2 h1:TilHTpHIQJ27R1Tl/iITBzMwiUGSlVfiVhwDNGM3Zj4= github.com/ardielle/ardielle-go v1.5.2/go.mod h1:I4hy1n795cUhaVt/ojz83SNVCYIGsAFAONtv2Dr7HUI= github.com/ardielle/ardielle-tools v1.5.4/go.mod h1:oZN+JRMnqGiIhrzkRN9l26Cej9dEx4jeNG6A+AdkShk= -github.com/aristanetworks/glog v0.0.0-20191112221043-67e8567f59f3/go.mod h1:KASm+qXFKs/xjSoWn30NrWBBvdTTQq+UjkhjEJHfSFA= -github.com/aristanetworks/goarista v0.0.0-20190325233358-a123909ec740/go.mod h1:D/tb0zPVXnP7fmsLZjtdUhSsumbK/ij54UXjjVgMGxQ= github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY= -github.com/armon/go-metrics v0.3.0/go.mod h1:zXjbSimjXTd7vOpY8B0/2LpvNvDoXBuplAD+gJD3GYs= github.com/armon/go-metrics v0.3.9/go.mod h1:4O98XIr/9W0sxpJ8UaYkvjk10Iff7SnFrb4QAOwNTFc= github.com/armon/go-metrics v0.3.10/go.mod h1:4O98XIr/9W0sxpJ8UaYkvjk10Iff7SnFrb4QAOwNTFc= github.com/armon/go-metrics v0.4.0 h1:yCQqn7dwca4ITXb+CbubHmedzaQYHhNhrEXLYUeEe8Q= github.com/armon/go-metrics v0.4.0/go.mod h1:E6amYzXo6aW1tqzoZGT755KkbgrJsSdpwZ+3JqfkOG4= -github.com/armon/go-proxyproto v0.0.0-20190211145416-68259f75880e/go.mod h1:QmP9hvJ91BbJmGVGSbutW19IC0Q9phDCLGaomwTJbgU= 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/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs= github.com/aryann/difflib v0.0.0-20170710044230-e206f873d14a/go.mod h1:DAHtR1m6lCRdSC2Tm3DSWRPvIPr6xNKyeHdqDQSQT+A= github.com/asaskevich/govalidator v0.0.0-20180720115003-f9ffefc3facf/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY= github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY= github.com/asaskevich/govalidator v0.0.0-20200108200545-475eaeb16496/go.mod h1:oGkLhpf+kjZl6xBf758TQhh5XrAeiJv/7FRz/2spLIg= github.com/asaskevich/govalidator v0.0.0-20200907205600-7a23bdc65eef/go.mod h1:WaHUgvxTVq04UNunO+XhnAqY/wQc+bxr74GqbsZ/Jqw= -github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d h1:Byv0BzEl3/e6D5CLfI0j/7hiIEtvGVFPCZ7Ei2oq8iQ= github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d/go.mod h1:WaHUgvxTVq04UNunO+XhnAqY/wQc+bxr74GqbsZ/Jqw= github.com/ashanbrown/forbidigo v1.1.0/go.mod h1:vVW7PEdqEFqapJe95xHkTfB1+XvZXBFg8t0sG2FIxmI= github.com/ashanbrown/makezero v0.0.0-20201205152432-7b7cdbb3025a/go.mod h1:oG9Dnez7/ESBqc4EdrdNlryeo7d0KcW1ftXHm7nU/UU= github.com/aws/aws-lambda-go v1.13.3/go.mod h1:4UKl9IzQMoD+QF79YdCuzCwp8VbmG4VAQwij/eHl5CU= -github.com/aws/aws-lambda-go v1.27.0/go.mod h1:jJmlefzPfGnckuHdXX7/80O3BvUUi12XOkbv4w9SGLU= -github.com/aws/aws-sdk-go v1.13.10/go.mod h1:ZRmQr0FajVIyZ4ZzBYKG5P3ZqPz9IHG41ZoMu1ADI3k= github.com/aws/aws-sdk-go v1.27.0/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= github.com/aws/aws-sdk-go v1.32.6/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0= -github.com/aws/aws-sdk-go v1.34.34/go.mod h1:H7NKnBqNVzoTJpGfLrQkkD+ytBA93eiDYi/+8rV9s48= github.com/aws/aws-sdk-go v1.35.24/go.mod h1:tlPOdRjfxPBpNIwqDj61rmsnA85v9jc0Ps9+muhnW+k= 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.11/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo= github.com/aws/aws-sdk-go v1.44.155 h1:PMHMuUS0atPD4LhiXuYrLasrlIm4u3lpNQBl9h+Lr2s= github.com/aws/aws-sdk-go v1.44.155/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= github.com/aws/aws-sdk-go-v2 v0.18.0/go.mod h1:JWVYvqSMppoMJC0x5wdwiImzgXTI9FuZwxzkQq9wy+g= @@ -664,10 +624,8 @@ github.com/aws/smithy-go v1.8.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAm github.com/aws/smithy-go v1.13.3/go.mod h1:Tg+OJXh4MB2R/uN61Ko2f6hTZwB/ZYGOtib8J3gBHzA= github.com/aws/smithy-go v1.13.5 h1:hgz0X/DX0dGqTYpGALqXJoRKRj5oQ7150i5FdTePzO8= github.com/aws/smithy-go v1.13.5/go.mod h1:Tg+OJXh4MB2R/uN61Ko2f6hTZwB/ZYGOtib8J3gBHzA= -github.com/axiomhq/hyperloglog v0.0.0-20180317131949-fe9507de0228/go.mod h1:IOXAcuKIFq/mDyuQ4wyJuJ79XLMsmLM+5RdQ+vWrL7o= 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= github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= github.com/benbjohnson/clock v1.3.0 h1:ip6w0uFQkncKQ979AypyG0ER7mqUSBdKLOgAle/AT8A= github.com/benbjohnson/clock v1.3.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= @@ -677,14 +635,11 @@ 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/bitly/go-hostpool v0.0.0-20171023180738-a3a6125de932/go.mod h1:NOuUCSz6Q9T7+igc/hlvDOUdtWKryOrtFyIVABv/p7k= -github.com/bitly/go-hostpool v0.1.0/go.mod h1:4gOCgp6+NZnVqlKyZ/iBZFTAJKembaVENUpMkpg42fw= github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c/go.mod h1:MKsuJmJgSg28kpZDP6UIiPt0e0Oz0kqKNGyRaWEPv84= github.com/bketelsen/crypt v0.0.4/go.mod h1:aI6NrJ0pMGgvZKL1iVgXLnfIFJtfV+bKCoqOes/6LfM= github.com/bkielbasa/cyclop v1.2.0/go.mod h1:qOI0yy6A7dYC4Zgsa72Ppm9kONl0RoIlPbzot9mhmeI= github.com/blang/semver v3.5.1+incompatible h1:cQNTCjp13qL8KC3Nbxr/y2Bqb63oX6wdnnjpJbkM4JQ= github.com/blang/semver v3.5.1+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk= -github.com/bmatcuk/doublestar v1.2.2 h1:oC24CykoSAB8zd7XgruHo33E0cHJf/WhQA/7BeXj+x0= -github.com/bmatcuk/doublestar v1.2.2/go.mod h1:wiQtGV+rzVYxB7WIlirSN++5HPtPlXEo9MEoZQC/PmE= github.com/bmatcuk/doublestar/v4 v4.4.0 h1:LmAwNwhjEbYtyVLzjcP/XeVw4nhuScHGkF/XWXnvIic= github.com/bmatcuk/doublestar/v4 v4.4.0/go.mod h1:xBQ8jztBU6kakFMg+8WGxn0c6z1fTSPVIjEY1Wr7jzc= github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869/go.mod h1:Ekp36dRnpXw/yCqJaO+ZrUyxD+3VXMFFr56k5XYrpB4= @@ -692,16 +647,10 @@ github.com/bmizerany/perks v0.0.0-20141205001514-d9a9656a3a4b/go.mod h1:ac9efd0D github.com/bombsimon/wsl/v3 v3.2.0/go.mod h1:st10JtZYLE4D5sC7b8xV4zTKZwAQjCH/Hy2Pm1FNZIc= github.com/boombuler/barcode v1.0.0/go.mod h1:paBWMcWSl3LHKBqUq+rly7CNSldXjb2rDl3JlRe0mD8= github.com/bsm/sarama-cluster v2.1.13+incompatible/go.mod h1:r7ao+4tTNXvWm+VRpRJchr2kQhqxgmAp2iEX5W96gMM= -github.com/buger/jsonparser v1.1.1 h1:2PnMjfWD7wBILjqQbt530v576A/cAbQvEW9gGIpYMUs= -github.com/buger/jsonparser v1.1.1/go.mod h1:6RYKKt7H4d4+iWqouImQ9R2FZql3VbhNgx27UK13J/0= -github.com/c2h5oh/datasize v0.0.0-20200112174442-28bbd4740fee h1:BnPxIde0gjtTnc9Er7cxvBk8DHLWhEux0SxayC8dP6I= -github.com/c2h5oh/datasize v0.0.0-20200112174442-28bbd4740fee/go.mod h1:S/7n9copUssQ56c7aAgHqftWO4LTf4xY6CGWt8Bc+3M= -github.com/caio/go-tdigest v2.3.0+incompatible/go.mod h1:sHQM/ubZStBUmF1WbB8FAm8q9GjDajLC5T7ydxE3JHI= github.com/caio/go-tdigest v3.1.0+incompatible h1:uoVMJ3Q5lXmVLCCqaMGHLBWnbGoN6Lpu7OAUPR60cds= github.com/caio/go-tdigest v3.1.0+incompatible/go.mod h1:sHQM/ubZStBUmF1WbB8FAm8q9GjDajLC5T7ydxE3JHI= github.com/casbin/casbin/v2 v2.1.2/go.mod h1:YcPU1XXisHhLzuxH9coDNf2FbKpjGlbCg3n9yuLkIJQ= github.com/casbin/casbin/v2 v2.37.0/go.mod h1:vByNa/Fchek0KZUgG5wEsl7iFsiviAYKRtgrQfcJqHg= -github.com/cenkalti/backoff v2.0.0+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM= github.com/cenkalti/backoff v2.2.1+incompatible h1:tNowT99t7UNflLxfYYSlKYsBpXdEet03Pg2g16Swow4= github.com/cenkalti/backoff v2.2.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM= github.com/cenkalti/backoff/v4 v4.1.1/go.mod h1:scbssz8iZGpm3xbr14ovlUdkxfGXNInqkPWOWmG2CLw= @@ -713,7 +662,6 @@ github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA github.com/census-instrumentation/opencensus-proto v0.3.0/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/census-instrumentation/opencensus-proto v0.4.1 h1:iKLQ0xPNFxR/2hzXZMrBo8f1j86j5WHzznCCQxV/b8g= github.com/census-instrumentation/opencensus-proto v0.4.1/go.mod h1:4T9NM4+4Vw91VeyqjLS6ao50K5bOcLKN6Q42XnYaRYw= -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= @@ -733,7 +681,6 @@ github.com/cilium/ebpf v0.8.1 h1:bLSSEbBLqGPXxls55pGr5qWZaTqcmfDJHhou7t254ao= github.com/cilium/ebpf v0.8.1/go.mod h1:f5zLIM0FSNuAkSyLAN7X+Hy6yznlF1mNiWUMfxMtrgk= github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod h1:nmEj6Dob7S7YxXgwXpfOuvO54S+tGdZdw9fuRZt25Ag= github.com/circonus-labs/circonusllhist v0.1.3/go.mod h1:kMXHVDlOchFAehlya5ePtbp5jckzBHf4XRpQvBOLI+I= -github.com/cisco-ie/nx-telemetry-proto v0.0.0-20190531143454-82441e232cf6/go.mod h1:ugEfq4B8T8ciw/h5mCkgdiDRFS4CkqqhH2dymDB4knc= github.com/clbanning/mxj v1.8.4/go.mod h1:BVjHeAH+rl9rs6f+QIpeRl0tfu10SXn1pUSa5PVGJng= github.com/clbanning/x2j v0.0.0-20191024224557-825249438eec/go.mod h1:jMjuTZXRI4dUb/I5gc9Hdhagfvm9+RyrPryS/auMzxE= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= @@ -758,12 +705,10 @@ github.com/cockroachdb/apd v1.1.0/go.mod h1:8Sl8LxpKi29FqWXR16WEFZRNSz3SoPzUzeMe github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8= github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI= github.com/codahale/rfc6979 v0.0.0-20141003034818-6a90f24967eb/go.mod h1:ZjrT6AXHbDs86ZSdt/osfBi5qfexBrKUdONk989Wnk4= -github.com/codegangsta/negroni v1.0.0/go.mod h1:v0y3T5G7Y1UlFfyxFn/QLRU4a2EuNau2iZY63YTKWo0= github.com/containerd/cgroups v1.0.4 h1:jN/mbWBEaz+T1pi5OFtnkQ+8qnmEbAr1Oo1FRm5B0dA= github.com/containerd/cgroups v1.0.4/go.mod h1:nLNQtsF7Sl2HxNebu77i1R0oDlhiTG+kO4JTrUzo6IA= github.com/containerd/console v1.0.3 h1:lIr7SlA5PxZyMV30bDW0MGbiOPXwc63yRuCP0ARubLw= github.com/containerd/console v1.0.3/go.mod h1:7LqA/THxQ86k76b8c/EMSiaJ3h1eZkMkXar0TQ1gf3U= -github.com/containerd/containerd v1.4.1/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA= github.com/containerd/containerd v1.6.8 h1:h4dOFDwzHmqFEP754PgfgTeVXFnLiRc6kiqC7tplDJs= github.com/containerd/ttrpc v1.1.0 h1:GbtyLRxb0gOLR0TYQWt3O6B0NvT8tMdorEHqIQo/lWI= github.com/containerd/ttrpc v1.1.0/go.mod h1:XX4ZTnoOId4HklF4edwc4DcqskFZuvXB1Evzy5KFQpQ= @@ -776,21 +721,15 @@ github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8Nz github.com/coreos/go-oidc v2.2.1+incompatible h1:mh48q/BqXqgjVHpy2ZY7WnWAbenxRjsz9N1i1YxjHAk= github.com/coreos/go-oidc v2.2.1+incompatible/go.mod h1:CgnwVTmzoESiwO9qyAFEMiHoZ1nMCKZlZ9V6mm3/LKc= github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= -github.com/coreos/go-semver v0.3.0 h1:wkHLiw0WNATZnSG7epLsujiMCgPAc9xhjJ4tgnAxmfM= github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= -github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf h1:iW4rZ826su+pqaw19uhpSCzhj44qo35pNgKFGqzDKkU= -github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= github.com/coreos/go-systemd/v22 v22.4.0 h1:y9YHcjnjynCd/DVbg5j9L/33jQM3MxJlbj/zWskzfGU= github.com/coreos/go-systemd/v22 v22.4.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= -github.com/couchbase/go-couchbase v0.0.0-20180501122049-16db1f1fe037/go.mod h1:TWI8EKQMs5u5jLKW/tsb9VwauIrMIxQG1r5fMsswK5U= -github.com/couchbase/gomemcached v0.0.0-20180502221210-0da75df14530/go.mod h1:srVSlQLB8iXBVXHgnqemxUXqN6FCvClgCMPCsjBDR7c= -github.com/couchbase/goutils v0.0.0-20180530154633-e865a1461c8a/go.mod h1:BQwMFlJzDjFDG3DJUdU0KORxn88UlsOULuxLExMh3Hs= github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE= github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= @@ -801,21 +740,17 @@ github.com/creack/pty v1.1.11/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ github.com/crossdock/crossdock-go v0.0.0-20160816171116-049aabb0122b/go.mod h1:v9FBN7gdVTpiD/+LZ7Po0UKvROyT87uLVxTHVky/dlQ= github.com/cyphar/filepath-securejoin v0.2.3 h1:YX6ebbZCZP7VkM3scTTokDgBL2TY741X51MTk3ycuNI= github.com/cyphar/filepath-securejoin v0.2.3/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxGGx79pTxQpKOJNYHHl4= -github.com/cyriltovena/cloudflare-go v0.27.1-0.20211118103540-ff77400bcb93 h1:PEBeRA25eDfHWkXNJs0HOnMhjIuKMcxKg/Z3VeuoRbU= -github.com/cyriltovena/cloudflare-go v0.27.1-0.20211118103540-ff77400bcb93/go.mod h1:sPWL/lIC6biLEdyGZwBQ1rGQKF1FhM7N60fuNiFdYTI= github.com/daixiang0/gci v0.2.8/go.mod h1:+4dZ7TISfSmqfAGv59ePaHfNzgGtIkHAhhdKggP1JAc= github.com/danieljoos/wincred v1.0.2/go.mod h1:SnuYRW9lp1oJrZX/dXJqr0cPK5gYXqx3EJbmjhLdK9U= github.com/danieljoos/wincred v1.1.2 h1:QLdCxFs1/Yl4zduvBdcHB8goaYk9RARS2SgLLRuAyr0= github.com/danieljoos/wincred v1.1.2/go.mod h1:GijpziifJoIBfYh+S7BbkdUTU4LfM+QnGqR5Vl2tAx0= github.com/dannykopping/go-kit-log v0.2.2-0.20221002180827-5591c1641b6b h1:G8g9mAKEj9O3RsU6Hd/ow6lIcHarlcUl5omV6sFKEOU= github.com/dannykopping/go-kit-log v0.2.2-0.20221002180827-5591c1641b6b/go.mod h1:NwTd00d/i8cPZ3xOwwiv2PO5MOcx78fFErGNcVmBjv0= -github.com/davecgh/go-spew v0.0.0-20151105211317-5215b55f46b2/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v0.0.0-20161028175848-04cdfd42973b/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= 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/denis-tingajkin/go-header v0.4.2/go.mod h1:eLRHAVXzE5atsKAnNRDB90WHCFFnBUn4RN0nRcs1LJA= -github.com/denisenkom/go-mssqldb v0.0.0-20190707035753-2be1aa521ff4/go.mod h1:zAg7JM8CkOJ43xKXIj7eRO9kmWm/TW578qo+oDO6tuM= github.com/denisenkom/go-mssqldb v0.12.2 h1:1OcPn5GBIobjWNd+8yjfHNIaFX14B1pWI3F9HZy5KXw= github.com/denisenkom/go-mssqldb v0.12.2/go.mod h1:lnIw1mZukFRZDJYQ0Pb833QS2IaC3l5HkEfra2LJ+sk= github.com/dennwc/varint v1.0.0 h1:kGNFFSSw8ToIy3obO/kKr8U9GZYUAxQEVuix4zfDWzE= @@ -831,13 +766,9 @@ github.com/dgraph-io/ristretto v0.1.0/go.mod h1:fux0lOrBhrVCJd3lcTHsIJhq1T2rokOu github.com/dgraph-io/ristretto v0.1.1 h1:6CWw5tJNgpegArSHpNHJKldNeq03FQCwYvfMVWajOK8= github.com/dgraph-io/ristretto v0.1.1/go.mod h1:S1GPSBCYCIhmVNfcth17y2zZtQT6wzkzgwUve0VDWWA= github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= -github.com/dgrijalva/jwt-go/v4 v4.0.0-preview1/go.mod h1:+hnT3ywWDTAFrW5aE+u2Sa/wT555ZqwoCS+pk3p6ry4= github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw= github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 h1:fAjc9m62+UWV/WAFKLNi6ZS0675eEUC9y3AlwSbQu1Y= github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw= -github.com/dgryski/go-metro v0.0.0-20180109044635-280f6062b5bc/go.mod h1:c9O8+fpSOX1DM8cPNSkX/qsBWdkD4yd2dpciOWQjpBw= -github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78= -github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc= github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no= github.com/digitalocean/godo v1.88.0 h1:SAEdw63xOMmzlwCeCWjLH1GcyDPUjbSAR1Bh7VELxzc= github.com/digitalocean/godo v1.88.0/go.mod h1:NRpFznZFvhHjBoqZAaOD3khVzsJ3EibzKqFL4R60dmA= @@ -849,22 +780,17 @@ github.com/dimfeld/httptreemux v5.0.1+incompatible/go.mod h1:rbUlSV+CCpv/SuqUTP/ github.com/dnaeon/go-vcr v1.1.0/go.mod h1:M7tiix8f0r6mKKJ3Yq/kqU1OYf3MnfmBWVbPx/yU9ko= github.com/dnaeon/go-vcr v1.2.0 h1:zHCHvJYTMh1N7xnV7zf1m1GPBF9Ad0Jk/whtQ1663qI= github.com/dnaeon/go-vcr v1.2.0/go.mod h1:R4UdLID7HZT3taECzJs4YgbbH6PIGXB6W/sc5OLb6RQ= -github.com/docker/distribution v2.6.0-rc.1.0.20170726174610-edc3ab29cdff+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= github.com/docker/distribution v2.8.1+incompatible h1:Q50tZOPR6T/hjNsyc9g8/syEs6bk8XXApsHjKukMl68= github.com/docker/distribution v2.8.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= -github.com/docker/docker v17.12.0-ce-rc1.0.20200916142827-bd33bbf0497b+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/docker v20.10.18+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/docker v20.10.21+incompatible h1:UTLdBmHk3bEY+w8qeO5KttOhy6OmXWsl/FEet9Uswog= github.com/docker/docker v20.10.21+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= -github.com/docker/go-connections v0.3.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec= 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.3.3/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= 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/docker/libnetwork v0.8.0-dev.2.0.20181012153825-d7b61745d166/go.mod h1:93m0aTqz6z+g32wla4l4WxTrdtvBRmVzYRkYvasA5Z8= -github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod h1:Qh8CwZgvJUkLughtfhJv5dyTYa91l1fOUCrgjqmcifM= github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3ebgob9U8Nd0kOddGdZWjyMGR8Wziv+TBNwSE= github.com/dropbox/godropbox v0.0.0-20180512210157-31879d3884b9 h1:NAvZb7gqQfLSNBPzVsvI7eZMosXtg2g2kxXrei90CtU= github.com/dropbox/godropbox v0.0.0-20180512210157-31879d3884b9/go.mod h1:glr97hP/JuXb+WMYCizc4PIFuzw1lCR97mwbe1VVXhQ= @@ -874,7 +800,6 @@ github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25Kn github.com/dvsekhvalnov/jose2go v0.0.0-20200901110807-248326c1351b/go.mod h1:7BvyPhdbLxMXIYTFPLsyJRFMsKmOZnQmzh6Gb+uquuM= github.com/dvsekhvalnov/jose2go v1.5.0 h1:3j8ya4Z4kMCwT5nXIKFSV84YS+HdqSSO0VsTQxaLAeM= github.com/dvsekhvalnov/jose2go v1.5.0/go.mod h1:QsHjhyTlD/lAVqn/NSbVZmSCGeDehTB/mPZadG+mhXU= -github.com/dvyukov/go-fuzz v0.0.0-20210103155950-6a8e9d1f2415/go.mod h1:11Gm+ccJnvAhCNLlf5+cS9KjtbaD5I5zaZpFMsTHWTw= github.com/dynatrace-oss/dynatrace-metric-utils-go v0.5.0 h1:wHGPJSXvwKQVf/XfhjUPyrhpcPKWNy8F3ikH+eiwoBg= github.com/dynatrace-oss/dynatrace-metric-utils-go v0.5.0/go.mod h1:PseHFo8Leko7J4A/TfZ6kkHdkzKBLUta6hRZR/OEbbc= github.com/eapache/go-resiliency v1.1.0/go.mod h1:kFI+JgMyC7bLPUVY133qvEBtVayf5mFgVsvEsIPBvNs= @@ -885,10 +810,7 @@ github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21 h1:YEetp8 github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1:+020luEh2TKB4/GOp8oxxtq0Daoen/Cii55CzbTV6DU= github.com/eapache/queue v1.1.0 h1:YOEu7KNc61ntiQlcEeUIoDTJ2o8mQznoNvUhiigpIqc= github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I= -github.com/eclipse/paho.mqtt.golang v1.2.0/go.mod h1:H9keYFcgq3Qr5OUJm/JZI/i6U7joQ8SYLhZwfeOo6Ts= github.com/edsrzf/mmap-go v1.0.0/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaBNrHW5M= -github.com/edsrzf/mmap-go v1.1.0 h1:6EUwBLQ/Mcr1EYLE4Tn1VdW1A4ckqCQWZBw8Hr0kjpQ= -github.com/edsrzf/mmap-go v1.1.0/go.mod h1:19H/e8pUPLicwkyNgOykDXkJ9F0MHE+Z52B8EIth78Q= github.com/elastic/elastic-transport-go/v8 v8.0.0-20211216131617-bbee439d559c/go.mod h1:87Tcz8IVNe6rVSLdBux1o/PEItLtyabHU3naC7IoqKI= github.com/elastic/elastic-transport-go/v8 v8.1.0 h1:NeqEz1ty4RQz+TVbUrpSU7pZ48XkzGWQj02k5koahIE= github.com/elastic/elastic-transport-go/v8 v8.1.0/go.mod h1:87Tcz8IVNe6rVSLdBux1o/PEItLtyabHU3naC7IoqKI= @@ -896,7 +818,6 @@ github.com/elastic/go-elasticsearch/v8 v8.5.0 h1:p6j6RFztHvkIg0NaUlfR0OnRmVdCG6Z github.com/elastic/go-elasticsearch/v8 v8.5.0/go.mod h1:Usvydt+x0dv9a1TzEUaovqbJor8rmOHy5dSmPeMAE2k= github.com/elastic/go-structform v0.0.10 h1:oy08o/Ih2hHTkNcRY/1HhaYvIp5z6t8si8gnCJPDo1w= github.com/elastic/go-structform v0.0.10/go.mod h1:CZWf9aIRYY5SuKSmOhtXScE5uQiLZNqAFnwKR4OrIM4= -github.com/elazarl/goproxy v0.0.0-20170405201442-c4fc26588b6e/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc= github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc= github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs= github.com/emicklei/go-restful v2.9.5+incompatible/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs= @@ -918,11 +839,9 @@ github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7 github.com/envoyproxy/protoc-gen-validate v0.6.7/go.mod h1:dyJXwwfPK2VSqiB9Klm1J6romD608Ba7Hij42vrOBCo= github.com/envoyproxy/protoc-gen-validate v0.6.13 h1:TvDcILLkjuZV3ER58VkBmncKsLUBqBDxra/XctCzuMM= github.com/envoyproxy/protoc-gen-validate v0.6.13/go.mod h1:qEySVqXrEugbHKvmhI8ZqtQi75/RHSSRNpffvB4I6Bw= -github.com/ericchiang/k8s v1.2.0/go.mod h1:/OmBgSq2cd9IANnsGHGlEz27nwMZV2YxlpXuQtU3Bz4= github.com/esimonov/ifshort v1.0.1/go.mod h1:yZqNJUrNn20K8Q9n2CrjTKYyVEmX209Hgu+M1LBpeZE= 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.2.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= 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/facebook/time v0.0.0-20220713225404-f7a0d7702d50 h1:3fALCgsB+zI8Bxlv4ph4lCgt1CEQHIdU5sWxbkaMkuc= @@ -931,8 +850,6 @@ github.com/facebookgo/stack v0.0.0-20160209184415-751773369052 h1:JWuenKqqX8nojt github.com/facebookgo/stack v0.0.0-20160209184415-751773369052/go.mod h1:UbMTZqLaRiH3MsBH8va0n7s1pQYcu3uTb8G4tygF4Zg= github.com/facebookgo/stackerr v0.0.0-20150612192056-c2fcf88613f4 h1:fP04zlkPjAGpsduG7xN3rRkxjAqkJaIQnnkNYYw/pAk= github.com/facebookgo/stackerr v0.0.0-20150612192056-c2fcf88613f4/go.mod h1:SBHk9aNQtiw4R4bEuzHjVmZikkUKCnO1v3lPQ21HZGk= -github.com/facette/natsort v0.0.0-20181210072756-2cd4dd1e2dcb h1:IT4JYU7k4ikYg1SCxNI1/Tieq/NFvh6dzLdgi7eu0tM= -github.com/facette/natsort v0.0.0-20181210072756-2cd4dd1e2dcb/go.mod h1:bH6Xx7IW64qjjJq8M2u4dxNaBiDfKK+z/3eGDpXEQhc= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU= github.com/fatih/color v1.10.0/go.mod h1:ELkj/draVOlAH/xkhN6mQ50Qd0MPOk5AAr3maGEBuJM= @@ -977,13 +894,9 @@ github.com/gdamore/encoding v1.0.0/go.mod h1:alR0ol34c49FCSBLjhosxzcPHQbf2trDkoo github.com/gdamore/tcell v1.3.0/go.mod h1:Hjvr+Ofd+gLglo7RYKxxnzCBmev3BzsS67MebKS4zMM= github.com/getsentry/sentry-go v0.16.0 h1:owk+S+5XcgJLlGR/3+3s6N4d+uKwqYvh/eS0AIMjPWo= github.com/getsentry/sentry-go v0.16.0/go.mod h1:ZXCloQLj0pG7mja5NK6NPf2V4A88YJ4pNlc2mOHwh6Y= -github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= -github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32/go.mod h1:GIjDIg/heH5DOkXY3YJ/wNhfHsQHoXGjl8G8amsYQ1I= -github.com/glinton/ping v0.1.4-0.20200311211934-5ac87da8cd96/go.mod h1:uY+1eqFUyotrQxF1wYFNtMeHp/swbYRsoGzfcPZ8x3o= github.com/globalsign/mgo v0.0.0-20180905125535-1ca0a4f7cbcb/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q= github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q= -github.com/go-chi/chi v4.1.2+incompatible/go.mod h1:eB3wogJHnLi3x/kFX2A+IbTBlXxmMeXJVKy9tTv1XzQ= github.com/go-critic/go-critic v0.5.4/go.mod h1:cjB4YGw+n/+X8gREApej7150Uyy1Tg8If6F2XOAUXNE= github.com/go-errors/errors v1.4.2 h1:J6MZopCL4uSllY1OfXM374weqZFFItUbrImctkmUxIA= github.com/go-faster/city v1.0.1 h1:4WAxSZ3V2Ws4QRDrscLEDcibJY8uf41H6AhXDrNDcGw= @@ -997,7 +910,6 @@ github.com/go-fonts/stix v0.1.0/go.mod h1:w/c1f0ldAUlJmLBvlbkvVXLAD+tAMqobIIQpmn 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-ini/ini v1.33.0/go.mod h1:ByCAeIL28uOIIG0E3PJtZPDL8WnHpFKFOtgjp+3Ies8= github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-kit/kit v0.10.0/go.mod h1:xUsJbQ/Fp4kEt7AFgCuvyX4a71u8h9jB8tj/ORgOZ7o= @@ -1019,10 +931,7 @@ 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/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= -github.com/go-ole/go-ole v1.2.1/go.mod h1:7FAglXiTm7HKlQRDeOQ6ZNUHidzCWXuZWq/1dTyBNF8= github.com/go-ole/go-ole v1.2.4/go.mod h1:XCwSNxSkXRo4vlyPy93sltvi/qJq0jqQhjqQNIwKuxM= -github.com/go-ole/go-ole v1.2.5/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0= -github.com/go-ole/go-ole v1.2.6-0.20210915003542-8b1f7f90f6b1/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0= github.com/go-ole/go-ole v1.2.6 h1:/Fpf6oFPoeFik9ty7siob0G6Ke8QvQEuVcuChpwXzpY= github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0= github.com/go-openapi/analysis v0.0.0-20180825180245-b006789cd277/go.mod h1:k70tL6pCuVxPJOHXQ+wIac1FUrvNkHolPie/cLEU6hI= @@ -1032,7 +941,6 @@ github.com/go-openapi/analysis v0.19.2/go.mod h1:3P1osvZa9jKjb8ed2TPng3f0i/UY9sn github.com/go-openapi/analysis v0.19.4/go.mod h1:3P1osvZa9jKjb8ed2TPng3f0i/UY9snX6gxi44djMjk= github.com/go-openapi/analysis v0.19.5/go.mod h1:hkEAkxagaIvIP7VTn8ygJNkd4kAYON2rCu0v0ObL0AU= github.com/go-openapi/analysis v0.19.10/go.mod h1:qmhS3VNFxBlquFJ0RGoDtylO9y4pgTAUNE9AEEMdlJQ= -github.com/go-openapi/analysis v0.21.2 h1:hXFrOYFHUAMQdu6zwAiKKJHJQ8kqZs1ux/ru1P1wLJU= github.com/go-openapi/analysis v0.21.2/go.mod h1:HZwRk4RRisyG8vx2Oe6aqeSQcoxRp47Xkp3+K6q+LdY= github.com/go-openapi/errors v0.17.0/go.mod h1:LcZQpmvG4wyF5j4IhA73wkLFQg+QJXOQHVjmcZxhka0= github.com/go-openapi/errors v0.18.0/go.mod h1:LcZQpmvG4wyF5j4IhA73wkLFQg+QJXOQHVjmcZxhka0= @@ -1041,16 +949,13 @@ github.com/go-openapi/errors v0.19.3/go.mod h1:qX0BLWsyaKfvhluLejVpVNwNRdXZhEbTA github.com/go-openapi/errors v0.19.4/go.mod h1:qX0BLWsyaKfvhluLejVpVNwNRdXZhEbTA4kxxpKBC94= github.com/go-openapi/errors v0.19.8/go.mod h1:cM//ZKUKyO06HSwqAelJ5NsEMMcpa6VpXe8DOa1Mi1M= github.com/go-openapi/errors v0.19.9/go.mod h1:cM//ZKUKyO06HSwqAelJ5NsEMMcpa6VpXe8DOa1Mi1M= -github.com/go-openapi/errors v0.20.2 h1:dxy7PGTqEh94zj2E3h1cUmQQWiM1+aeCROfAr02EmK8= github.com/go-openapi/errors v0.20.2/go.mod h1:cM//ZKUKyO06HSwqAelJ5NsEMMcpa6VpXe8DOa1Mi1M= -github.com/go-openapi/jsonpointer v0.0.0-20160704185906-46af16f9f7b1/go.mod h1:+35s3my2LFTysnkMfxsJBAMHj/DoqoB9knIWoYG/Vk0= github.com/go-openapi/jsonpointer v0.17.0/go.mod h1:cOnomiV+CVVwFLk0A/MExoFMjwdsUdVpsRhURCKh+3M= github.com/go-openapi/jsonpointer v0.18.0/go.mod h1:cOnomiV+CVVwFLk0A/MExoFMjwdsUdVpsRhURCKh+3M= github.com/go-openapi/jsonpointer v0.19.2/go.mod h1:3akKfEdA7DF1sugOqz1dVQHBcuDBPKZGEoHC/NkiQRg= github.com/go-openapi/jsonpointer v0.19.3/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg= github.com/go-openapi/jsonpointer v0.19.5 h1:gZr+CIYByUqjcgeLXnQu2gHYQC9o73G2XUeOFYEICuY= github.com/go-openapi/jsonpointer v0.19.5/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg= -github.com/go-openapi/jsonreference v0.0.0-20160704190145-13c6e3589ad9/go.mod h1:W3Z9FmVs9qj+KR4zFKmDPGiLdk1D9Rlm7cyMvf57TTg= github.com/go-openapi/jsonreference v0.17.0/go.mod h1:g4xxGn04lDIRh0GJb5QlpE3HfopLOL6uZrK/VgnsK9I= github.com/go-openapi/jsonreference v0.18.0/go.mod h1:g4xxGn04lDIRh0GJb5QlpE3HfopLOL6uZrK/VgnsK9I= github.com/go-openapi/jsonreference v0.19.2/go.mod h1:jMjeRr2HHw6nAVajTXJ4eiUwohSTlpa0o73RUL1owJc= @@ -1066,15 +971,12 @@ github.com/go-openapi/loads v0.19.2/go.mod h1:QAskZPMX5V0C2gvfkGZzJlINuP7Hx/4+ix github.com/go-openapi/loads v0.19.3/go.mod h1:YVfqhUCdahYwR3f3iiwQLhicVRvLlU/WO5WPaZvcvSI= github.com/go-openapi/loads v0.19.4/go.mod h1:zZVHonKd8DXyxyw4yfnVjPzBjIQcLt0CCsn0N0ZrQsk= github.com/go-openapi/loads v0.19.5/go.mod h1:dswLCAdonkRufe/gSUC3gN8nTSaB9uaS2es0x5/IbjY= -github.com/go-openapi/loads v0.21.1 h1:Wb3nVZpdEzDTcly8S4HMkey6fjARRzb7iEaySimlDW0= github.com/go-openapi/loads v0.21.1/go.mod h1:/DtAMXXneXFjbQMGEtbamCZb+4x7eGwkvZCvBmwUG+g= github.com/go-openapi/runtime v0.0.0-20180920151709-4f900dc2ade9/go.mod h1:6v9a6LTXWQCdL8k1AO3cvqx5OtZY/Y9wKTgaoP6YRfA= github.com/go-openapi/runtime v0.19.0/go.mod h1:OwNfisksmmaZse4+gpV3Ne9AyMOlP1lt4sK4FXt0O64= github.com/go-openapi/runtime v0.19.4/go.mod h1:X277bwSUBxVlCYR3r7xgZZGKVvBd/29gLDlFGtJ8NL4= github.com/go-openapi/runtime v0.19.15/go.mod h1:dhGWCTKRXlAfGnQG0ONViOZpjfg0m2gUt9nTQPQZuoo= -github.com/go-openapi/runtime v0.23.1/go.mod h1:AKurw9fNre+h3ELZfk6ILsfvPN+bvvlaU/M9q/r9hpk= github.com/go-openapi/runtime v0.23.3/go.mod h1:AKurw9fNre+h3ELZfk6ILsfvPN+bvvlaU/M9q/r9hpk= -github.com/go-openapi/spec v0.0.0-20160808142527-6aced65f8501/go.mod h1:J8+jY1nAiCcj+friV/PDoE1/3eeccG9LYBs0tYvLOWc= github.com/go-openapi/spec v0.17.0/go.mod h1:XkF/MOi14NmjsfZ8VtAKf8pIlbZzyoTvZsdfssdxcBI= github.com/go-openapi/spec v0.18.0/go.mod h1:XkF/MOi14NmjsfZ8VtAKf8pIlbZzyoTvZsdfssdxcBI= github.com/go-openapi/spec v0.19.2/go.mod h1:sCxk3jxKgioEJikev4fgkNmwS+3kuYdJtcsZsD5zxMY= @@ -1083,7 +985,6 @@ github.com/go-openapi/spec v0.19.5/go.mod h1:Hm2Jr4jv8G1ciIAo+frC/Ft+rR2kQDh8JHK github.com/go-openapi/spec v0.19.6/go.mod h1:Hm2Jr4jv8G1ciIAo+frC/Ft+rR2kQDh8JHKHb3gWUSk= github.com/go-openapi/spec v0.20.2/go.mod h1:RW6Xcbs6LOyWLU/mXGdzn2Qc+3aj+ASfI7rvSZh1Vls= github.com/go-openapi/spec v0.20.4/go.mod h1:faYFR1CvsJZ0mNsmsphTMSoRrNV3TEDoAM7FOEWeq8I= -github.com/go-openapi/spec v0.20.6 h1:ich1RQ3WDbfoeTqTAb+5EIxNmpKVJZWBNah9RAT0jIQ= github.com/go-openapi/spec v0.20.6/go.mod h1:2OpW+JddWPrpXSCIX8eOx7lZ5iyuWj3RYR6VaaBKcWA= github.com/go-openapi/strfmt v0.17.0/go.mod h1:P82hnJI0CXkErkXi8IKjPbNBM6lV6+5pLP5l494TcyU= github.com/go-openapi/strfmt v0.18.0/go.mod h1:P82hnJI0CXkErkXi8IKjPbNBM6lV6+5pLP5l494TcyU= @@ -1095,9 +996,7 @@ github.com/go-openapi/strfmt v0.19.5/go.mod h1:eftuHTlB/dI8Uq8JJOyRlieZf+WkkxUuk github.com/go-openapi/strfmt v0.21.0/go.mod h1:ZRQ409bWMj+SOgXofQAGTIo2Ebu72Gs+WaRADcS5iNg= github.com/go-openapi/strfmt v0.21.1/go.mod h1:I/XVKeLc5+MM5oPNN7P6urMOpuLXEcNrCX/rPGuWb0k= github.com/go-openapi/strfmt v0.21.2/go.mod h1:I/XVKeLc5+MM5oPNN7P6urMOpuLXEcNrCX/rPGuWb0k= -github.com/go-openapi/strfmt v0.21.3 h1:xwhj5X6CjXEZZHMWy1zKJxvW9AfHC9pkyUjLvHtKG7o= github.com/go-openapi/strfmt v0.21.3/go.mod h1:k+RzNO0Da+k3FrrynSNN8F7n/peCmQQqbbXjtDfvmGg= -github.com/go-openapi/swag v0.0.0-20160704191624-1d0bd113de87/go.mod h1:DXUve3Dpr1UfpPtxFw+EFuQ41HhCWZfha5jSVRG7C7I= github.com/go-openapi/swag v0.17.0/go.mod h1:AByQ+nYG6gQg71GINrmuDXCPWdL640yX49/kXLo40Tg= github.com/go-openapi/swag v0.18.0/go.mod h1:AByQ+nYG6gQg71GINrmuDXCPWdL640yX49/kXLo40Tg= github.com/go-openapi/swag v0.19.2/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk= @@ -1113,17 +1012,9 @@ github.com/go-openapi/validate v0.19.2/go.mod h1:1tRCw7m3jtI8eNWEEliiAqUIcBztB2K github.com/go-openapi/validate v0.19.3/go.mod h1:90Vh6jjkTn+OT1Eefm0ZixWNFjhtOH7vS9k0lo6zwJo= github.com/go-openapi/validate v0.19.8/go.mod h1:8DJv2CVJQ6kGNpFW6eV9N3JviE1C85nY1c2z52x1Gk4= github.com/go-openapi/validate v0.21.0/go.mod h1:rjnrwK57VJ7A8xqfpAOEKRH8yQSGUriMu5/zuPSQ1hg= -github.com/go-openapi/validate v0.22.0 h1:b0QecH6VslW/TxtpKgzpO1SNG7GU2FsaqKdP1E2T50Y= github.com/go-openapi/validate v0.22.0/go.mod h1:rjnrwK57VJ7A8xqfpAOEKRH8yQSGUriMu5/zuPSQ1hg= -github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4= -github.com/go-playground/locales v0.13.0/go.mod h1:taPMhCMXrRLJO55olJkUXHZBHCxTMfnGwq/HNwmWNS8= -github.com/go-playground/universal-translator v0.17.0/go.mod h1:UkSxE5sNxxRwHyU+Scu5vgOQjsIJAF8j9muTVoKLVtA= -github.com/go-playground/validator/v10 v10.4.1/go.mod h1:nlOn6nFhuKACm19sB/8EGNn9GlaMV7XkbRSipzJ0Ii4= -github.com/go-redis/redis v6.15.9+incompatible/go.mod h1:NAIEuMOZ/fxfXJIrKDQDz8wamY7mA7PouImQ2Jvg6kA= github.com/go-redis/redis/v7 v7.4.1 h1:PASvf36gyUpr2zdOUS/9Zqc80GbM+9BDyiJSJDDOrTI= github.com/go-redis/redis/v7 v7.4.1/go.mod h1:JDNMw23GTyLNC4GZu9njt15ctBQVn7xjRfnwdHj/Dcg= -github.com/go-redis/redis/v8 v8.11.5 h1:AcZZR7igkdvfVmQTPnu9WE37LRrO/YrBH5zWyjDC0oI= -github.com/go-redis/redis/v8 v8.11.5/go.mod h1:gREzHqY1hg6oD9ngVRbLStwAWKhA0FEgq8Jd4h5lpwo= github.com/go-resty/resty/v2 v2.1.1-0.20191201195748-d7b97669fe48 h1:JVrqSeQfdhYRFk24TvhTZWU0q8lfCojxZQFi3Ou7+uY= github.com/go-resty/resty/v2 v2.1.1-0.20191201195748-d7b97669fe48/go.mod h1:dZGr0i9PLlaaTD4H/hoZIDjQ+r6xq8mgbRzHZf7f2J8= github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w= @@ -1174,11 +1065,8 @@ github.com/gobuffalo/packd v0.1.0/go.mod h1:M2Juc+hhDXf/PnmBANFCqx4DM3wRbgDvnVWe github.com/gobuffalo/packr/v2 v2.0.9/go.mod h1:emmyGweYTm6Kdper+iywB6YK5YzuKchGtJQZ0Odn4pQ= github.com/gobuffalo/packr/v2 v2.2.0/go.mod h1:CaAwI0GPIAv+5wKLtv8Afwl+Cm78K/I/VCm/3ptBN+0= github.com/gobuffalo/syncx v0.0.0-20190224160051-33c29581e754/go.mod h1:HhnNqWY95UYwwW3uSASeV7vtgYkT2t16hJgV3AEPUpw= -github.com/goburrow/modbus v0.1.0/go.mod h1:Kx552D5rLIS8E7TyUwQ/UdHEqvX5T8tyiGBTlzMcZBg= -github.com/goburrow/serial v0.1.0/go.mod h1:sAiqG0nRVswsm1C97xsttiYCzSLBmUZ/VSlVLZJ8haA= github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y= github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAkT8= -github.com/goccy/go-yaml v1.9.5/go.mod h1:U/jl18uSupI5rdI2jmuCswEA2htH9eXfferR3KfscvA= github.com/gocql/gocql v0.0.0-20200228163523-cd4b606dd2fb/go.mod h1:DL0ekTmBSTdlNF25Orwt/JMzqIq3EJ4MVa/J/uK64OY= github.com/gocql/gocql v0.0.0-20211222173705-d73e6b1002a7/go.mod h1:3gM2c4D3AnkISwBxGnMMsS8Oy4y2lhbPRsH4xnJrHG8= github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 h1:ZpnhV/YsD2/4cESfV5+Hoeu/iUR3ruzNvZ+yQfO03a0= @@ -1187,25 +1075,18 @@ github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5x github.com/godbus/dbus/v5 v5.0.6 h1:mkgN1ofwASrYnJ5W6U/BxG15eXXXjirgZc7CLqkcaro= github.com/godbus/dbus/v5 v5.0.6/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= github.com/gofrs/flock v0.8.0/go.mod h1:F1TvTiK9OcQqauNUHlbJvyl9Qa1QvF/gOUDKA14jxHU= -github.com/gofrs/uuid v2.1.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= github.com/gofrs/uuid v3.3.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= github.com/gofrs/uuid v4.0.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= github.com/gofrs/uuid v4.2.0+incompatible h1:yyYWMnhkhrKwwr8gAOcOCYxOOscHgDS9yZgBrnJfGa0= github.com/gofrs/uuid v4.2.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= -github.com/gogo/googleapis v0.0.0-20180223154316-0cd9801be74a/go.mod h1:gf4bu3Q80BeJ6H1S1vYPm8/ELATdvryBaNFGgqEef3s= github.com/gogo/googleapis v1.1.0/go.mod h1:gf4bu3Q80BeJ6H1S1vYPm8/ELATdvryBaNFGgqEef3s= github.com/gogo/googleapis v1.4.1 h1:1Yx4Myt7BxzvUr5ldGSbwYiZG6t9wGBZ+8/fX3Wvtq0= github.com/gogo/googleapis v1.4.1/go.mod h1:2lpHqI5OcWCtVElxXnPt+s8oJvMpySlOyM6xDCrzib4= github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.2.0/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= -github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o= -github.com/gogo/protobuf v1.3.0/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o= github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= -github.com/gogo/status v1.0.3/go.mod h1:SavQ51ycCLnc7dGyJxp8YAmudx8xqiVrRf+6IXRsugc= -github.com/gogo/status v1.1.1 h1:DuHXlSFHNKqTQ+/ACf5Vs6r4X/dH2EgIzR9Vr+H65kg= -github.com/gogo/status v1.1.1/go.mod h1:jpG3dM5QPcqu19Hg8lkUhBFBa3TcLs1DG7+2Jqci7oU= github.com/golang-jwt/jwt v3.2.1+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzqecmYZeUEB8OUGHkxJ+I= github.com/golang-jwt/jwt v3.2.2+incompatible h1:IfV12K8xAKAnZqdXVzCZ+TOjboZ2keLg81eXfW3O+oY= github.com/golang-jwt/jwt v3.2.2+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzqecmYZeUEB8OUGHkxJ+I= @@ -1218,7 +1099,6 @@ github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe/go.mod h1:8vg3r2V github.com/golang-sql/sqlexp v0.1.0 h1:ZCD6MBpcuOVfGVqsEmY5/4FtYiKz6tSyUv9LPEDei6A= github.com/golang-sql/sqlexp v0.1.0/go.mod h1:J4ad9Vo8ZCWQ2GMrC4UCQy1JpCbwU9m3EOqtpKwwwHI= github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGwJL78qG/PmXZO1EjYhfJinVAhrmmHX6Z8B9k= -github.com/golang/geo v0.0.0-20190916061304-5b978397cfec/go.mod h1:QZ0nwyI2jOfgRAoBvP+ab5aRr7c9x7lhGEJrKvBwjWI= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= github.com/golang/glog v1.0.0 h1:nfP3RFugxnNRyKgeWd4oI1nYvXpxrx8ck8ZrcizshdQ= github.com/golang/glog v1.0.0/go.mod h1:EWib/APOK0SL3dFbYqvxE3UYd8E6s1ouQ7iEp/0LWV4= @@ -1229,7 +1109,6 @@ github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4er github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE= github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= -github.com/golang/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:tluoj9z5200jBnyusfRPU2LqT6J+DAorxEvtC7LHB+E= 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= @@ -1239,7 +1118,6 @@ github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4= github.com/golang/mock v1.5.0/go.mod h1:CWnOUgYIOo4TcNZ0wHX3YZCqsaM1I1Jvs6v3mP3KVu8= github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs= -github.com/golang/protobuf v0.0.0-20161109072736-4bd1920723d7/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= 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= @@ -1274,12 +1152,10 @@ github.com/golangci/maligned v0.0.0-20180506175553-b1d89398deca/go.mod h1:tvlJhZ github.com/golangci/misspell v0.3.5/go.mod h1:dEbvlSfYbMQDtrpRMQU675gSDLDNa8sCPPChZ7PhiVA= github.com/golangci/revgrep v0.0.0-20210208091834-cd28932614b5/go.mod h1:LK+zW4MpyytAWQRz0M4xnzEk50lSvqDQKfx304apFkY= github.com/golangci/unconvert v0.0.0-20180507085042-28b1c447d1f4/go.mod h1:Izgrg8RkN3rCIMLGE9CyYmU9pY2Jer6DgANEnZ/L/cQ= -github.com/gomodule/redigo v1.8.1/go.mod h1:P9dn9mFrCBvWhGE1wpxx6fgq7BAeLBk+UUUzlpkBYO0= github.com/google/addlicense v0.0.0-20200906110928-a0294312aa76/go.mod h1:EMjYTRimagHs1FwlIqKyX3wAM0u3rA+McvlIIWmSamA= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.1 h1:gK4Kx5IaGY9CD5sPJ36FHiBJ6ZXl0kilRiiCj+jdYp4= -github.com/google/btree v1.0.1/go.mod h1:xXMiIv4Fb/0kKde4SpL7qlzvu5cMJDRkFDxJfI9uaxA= github.com/google/cadvisor v0.46.0 h1:ryTIniqhN8/wR8UA1RuYSXHvsAtdpk/01XwTZtYHekY= github.com/google/cadvisor v0.46.0/go.mod h1:YnCDnR8amaS0HoMEjheOI0TMPzFKCBLc30mciLEjwGI= github.com/google/flatbuffers v1.12.1/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8= @@ -1304,16 +1180,12 @@ github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8 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/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= -github.com/google/go-github/v32 v32.1.0/go.mod h1:rIEpZD9CTDQwDK9GDrtMTycQNA4JU3qBsCizh3q2WCI= -github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck= github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8= github.com/google/go-querystring v1.1.0/go.mod h1:Kcdr2DB4koayq7X8pmAG4sNG59So17icRSOU623lUBU= -github.com/google/gofuzz v0.0.0-20161122191042-44d81051d367/go.mod h1:HP5RmnzzSNb993RKQDq4+1A4ia9nllfqcQFTQJedwGI= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= 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/gops v0.3.22/go.mod h1:7diIdLsqpCihPSX3fQagksT/Ku/y4RL9LHTlKyEUDl8= 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/martian/v3 v3.1.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= @@ -1335,8 +1207,6 @@ github.com/google/pprof v0.0.0-20210601050228-01bbb1931b22/go.mod h1:kpwsk12EmLe github.com/google/pprof v0.0.0-20210609004039-a478d1d731e9/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= -github.com/google/renameio/v2 v2.0.0 h1:UifI23ZTGY8Tt29JbYFiuyIU3eX+RNFtUwefq9qAhxg= -github.com/google/renameio/v2 v2.0.0/go.mod h1:BtmJXm5YlszgC+TD4HOEEUFgkJP3nLxehU6hfe7jRt4= 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= @@ -1358,12 +1228,10 @@ github.com/googleapis/gax-go/v2 v2.5.1/go.mod h1:h6B0KMMFNtI2ddbGJn3T3ZbwkeT6yqE github.com/googleapis/gax-go/v2 v2.6.0/go.mod h1:1mjbznJAPHFpesgE5ucqfYEscaz5kMdcIDwU/6+DDoY= github.com/googleapis/gax-go/v2 v2.7.0 h1:IcsPKeInNvYi7eqSaDjiZqDDKu5rsmunY0Y1YupQSSQ= github.com/googleapis/gax-go/v2 v2.7.0/go.mod h1:TEop28CZZQ2y+c0VxMUmu1lV+fQx57QpBWsYpwqHJx8= -github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY= github.com/googleapis/gnostic v0.4.1/go.mod h1:LRhVm6pbyptWbWbuZ38d1eyptfvIytN3ir6b65WBswg= github.com/googleapis/go-type-adapters v1.0.0/go.mod h1:zHW75FOG2aur7gAO2B+MLby+cLsWGBF62rFAi7WjWO4= github.com/googleapis/google-cloud-go-testing v0.0.0-20200911160855-bcd43fbb19e8/go.mod h1:dvDLG8qkwmyD9a/MJJN3XJcT3xFxOKAvTZGvuZmac9g= github.com/gookit/color v1.3.6/go.mod h1:R3ogXq2B9rTbXoSHJ1HyUVAZ3poOJHpd9nQmyGZsfvQ= -github.com/gopcua/opcua v0.1.12/go.mod h1:a6QH4F9XeODklCmWuvaOdL8v9H0d73CEKUHWVZLQyE8= github.com/gophercloud/gophercloud v1.0.0 h1:9nTGx0jizmHxDobe4mck89FyQHVyA3CaXLIUSGJjP9k= github.com/gophercloud/gophercloud v1.0.0/go.mod h1:Q8fZtyi5zZxPS/j9aj3sSxtvj41AdQMDwyo1myduD5c= github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1 h1:EGx4pi6eqNxGaHF6qqu48+N2wcFQ5qg5FXgOdqsJ5d8= @@ -1394,45 +1262,29 @@ github.com/gostaticanalysis/comment v1.3.0/go.mod h1:xMicKDx7XRXYdVwY9f9wQpDJVnq github.com/gostaticanalysis/comment v1.4.1/go.mod h1:ih6ZxzTHLdadaiSnF5WY3dxUoXfXAlTaRzuaNDlSado= github.com/gostaticanalysis/forcetypeassert v0.0.0-20200621232751-01d4955beaa5/go.mod h1:qZEedyP/sY1lTGV1uJ3VhWZ2mqag3IkWsDHVbplHXak= github.com/gostaticanalysis/nilerr v0.1.1/go.mod h1:wZYb6YI5YAxxq0i1+VJbY0s2YONW0HU0GPE3+5PWN4A= -github.com/grafana/dskit v0.0.0-20220928083349-b1b307db4f30 h1:Lbeu0ddFATI+cgXh6LzjAk9TdoU7WUZ2hry+5H4xXdM= -github.com/grafana/dskit v0.0.0-20220928083349-b1b307db4f30/go.mod h1:NTfOwhBMmR7TyG4E3RB4F1qhvk+cawoXacyN30yipVY= -github.com/grafana/go-gelf/v2 v2.0.1 h1:BOChP0h/jLeD+7F9mL7tq10xVkDG15he3T1zHuQaWak= -github.com/grafana/go-gelf/v2 v2.0.1/go.mod h1:lexHie0xzYGwCgiRGcvZ723bSNyNI8ZRD4s0CLobh90= -github.com/grafana/gomemcache v0.0.0-20220812141859-1e3ae89e91a7 h1:EKJ/x3CNzKFtppRriAk0PlWD513f+5YOx4aHSbWm1Y8= -github.com/grafana/gomemcache v0.0.0-20220812141859-1e3ae89e91a7/go.mod h1:H0wQNHz2YrLsuXOZozoeDmnHXkNCRmMW0gwFWDfEZDA= -github.com/grafana/loki v1.6.2-0.20221206154352-fee23745328c h1:WfrjoGZffQ508jBJmI7AAHWGdlJlYPd1Bet04FHClXg= -github.com/grafana/loki v1.6.2-0.20221206154352-fee23745328c/go.mod h1:VArTqN8uZ+Pfr7Fimx1TNji2I6qz3xRzZhgnqAV6YZ4= github.com/grafana/regexp v0.0.0-20221005093135-b4c2bcb0a4b6 h1:A3dhViTeFDSQcGOXuUi6ukCQSMyDtDISBp2z6OOo2YM= github.com/grafana/regexp v0.0.0-20221005093135-b4c2bcb0a4b6/go.mod h1:M5qHK+eWfAv8VR/265dIuEpL3fNfeC21tXXp9itM24A= -github.com/grafana/tail v0.0.0-20220426200921-98e8eb28ea4c h1:qIsCzNln5YzuXfXbJgXhpfM+4gY7qi3mED3eYQS4Fls= github.com/grafana/tail v0.0.0-20220426200921-98e8eb28ea4c/go.mod h1:GIMXMPB/lRAllP5rVDvcGif87ryO2hgD7tCtHMdHrho= github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA= 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-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= -github.com/grpc-ecosystem/go-grpc-middleware v1.1.0/go.mod h1:f5nM7jw/oeRSadq3xCzHAvxcr8HZnzsqU6ILg/0NiiE= -github.com/grpc-ecosystem/go-grpc-middleware v1.2.0/go.mod h1:mJzapYve32yjrKlk9GbyCZHuPgZsrbyIbyKhSzOpg6s= github.com/grpc-ecosystem/go-grpc-middleware v1.2.2/go.mod h1:EaizFBKfUKtMIF5iaDEhniwNedqGo9FuLFzppDr3uwI= github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 h1:+9834+KizmvFV7pXQGSXQTsaWhq2GjuNUt0aUU0YBYw= github.com/grpc-ecosystem/go-grpc-middleware v1.3.0/go.mod h1:z0ButlSOZa5vEBq9m2m2hlwIgKw+rp3sdCBRoJY+30Y= github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= -github.com/grpc-ecosystem/grpc-gateway v1.9.4/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= github.com/grpc-ecosystem/grpc-gateway v1.14.5/go.mod h1:UJ0EZAp832vCd54Wev9N1BMKEyvcZ5+IM0AwDrnlkEc= 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.14.0 h1:t7uX3JBHdVwAi3G7sSSdbsk8NfgA+LnUS88V/2EKaA0= github.com/grpc-ecosystem/grpc-gateway/v2 v2.14.0/go.mod h1:4OGVnY4qf2+gw+ssiHbW+pq4mo2yko94YxxMmXZ7jCA= -github.com/grpc-ecosystem/grpc-opentracing v0.0.0-20180507213350-8e809c8a8645 h1:MJG/KsmcqMwFAkh8mTnAwhyKoB+sTAnY4CACC110tbU= github.com/grpc-ecosystem/grpc-opentracing v0.0.0-20180507213350-8e809c8a8645/go.mod h1:6iZfnjpejD4L/4DwD7NryNaJyCQdzwWwH2MWhCA90Kw= github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c h1:6rhixN/i8ZofjG1Y75iExal34USq5p+wiN1tpie8IrU= github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c/go.mod h1:NMPJylDgVpX0MLRlPy15sqSwOFv/U1GZ2m21JhFfek0= github.com/hailocab/go-hostpool v0.0.0-20160125115350-e80d13ce29ed/go.mod h1:tMWxXQ9wFIaZeTI9F+hmhFiGpFmhOHzyShyFUhRm0H4= -github.com/harlow/kinesis-consumer v0.3.1-0.20181230152818-2f58b136fee0/go.mod h1:dk23l2BruuUzRP8wbybQbPn3J7sZga2QHICCeaEy5rQ= -github.com/hashicorp/consul v1.2.1 h1:66MuuTfV4aOXTQM7cjAIKUWFOITSk4XZlMhE09ymVbg= -github.com/hashicorp/consul v1.2.1/go.mod h1:mFrjN1mfidgJfYP1xrJCF+AfRhr6Eaqhb2+sfyn/OOI= github.com/hashicorp/consul/api v1.1.0/go.mod h1:VmuI/Lkw1nC05EYQWNKwWGbkg+FbDBtguAZLlVdkD9Q= github.com/hashicorp/consul/api v1.3.0/go.mod h1:MmDNSzIMUjNpY/mQ398R4bk2FnqQLoPndWW5VkKPlCE= github.com/hashicorp/consul/api v1.10.1/go.mod h1:XjsvQN+RJGWI2TWy1/kqaE16HrR2J/FWgkYjdZQsX9M= @@ -1486,7 +1338,6 @@ github.com/hashicorp/go-retryablehttp v0.5.3/go.mod h1:9B5zBasrRhHXnJnui7y6sL7es github.com/hashicorp/go-retryablehttp v0.5.4/go.mod h1:9B5zBasrRhHXnJnui7y6sL7es7NDiJgTc6Er0maI1Xs= github.com/hashicorp/go-retryablehttp v0.7.1 h1:sUiuQAnLlbvmExtFQs72iFW/HXeUn8Z1aJLQ4LJJbTQ= github.com/hashicorp/go-retryablehttp v0.7.1/go.mod h1:vAew36LZh98gCBJNLH42IQ1ER/9wtLZZ8meHqQvEYWY= -github.com/hashicorp/go-rootcerts v0.0.0-20160503143440-6bb64b370b90/go.mod h1:o4zcYY1e0GEZI6eSEr+43QDYmuGglw1qSO6qdHUHCgg= github.com/hashicorp/go-rootcerts v1.0.0/go.mod h1:K6zTfqpRlCUIjkwsN4Z+hiSfzSTQa6eBIzfwKfwNnHU= github.com/hashicorp/go-rootcerts v1.0.1/go.mod h1:pqUvnprVnM5bf7AOirdbb01K4ccR319Vf4pU3K5EGc8= github.com/hashicorp/go-rootcerts v1.0.2 h1:jzhAVGtqPKbwpyCPELlgNWhE1znq+qwJtW5Oi2viEzc= @@ -1517,7 +1368,6 @@ github.com/hashicorp/mdns v1.0.0/go.mod h1:tL+uN++7HEJ6SQLQ2/p+z2pH24WQKWjBPkE0m github.com/hashicorp/mdns v1.0.1/go.mod h1:4gW7WsVCke5TE7EPeYliwHlRUyBtfCwuFwuMg2DmyNY= github.com/hashicorp/mdns v1.0.4/go.mod h1:mtBihi+LeNXGtG8L9dX59gAEa12BDtBQSp4v/YAJqrc= github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I= -github.com/hashicorp/memberlist v0.1.5/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I= github.com/hashicorp/memberlist v0.2.2/go.mod h1:MS2lj3INKhZjWNqd3N0m3J+Jxf3DAOnAH9VT3Sh9MUE= github.com/hashicorp/memberlist v0.3.0/go.mod h1:MS2lj3INKhZjWNqd3N0m3J+Jxf3DAOnAH9VT3Sh9MUE= github.com/hashicorp/memberlist v0.3.1/go.mod h1:MS2lj3INKhZjWNqd3N0m3J+Jxf3DAOnAH9VT3Sh9MUE= @@ -1525,7 +1375,6 @@ github.com/hashicorp/memberlist v0.5.0 h1:EtYPN8DpAURiapus508I4n9CzHs2W+8NZGbmmR github.com/hashicorp/memberlist v0.5.0/go.mod h1:yvyXLpo0QaGE59Y7hDTsTzDD25JYBZ4mHgHUZ8lrOI0= github.com/hashicorp/nomad/api v0.0.0-20221102143410-8a95f1239005 h1:jKwXhVS4F7qk0g8laz+Anz0g/6yaSJ3HqmSAuSNLUcA= github.com/hashicorp/nomad/api v0.0.0-20221102143410-8a95f1239005/go.mod h1:vgJmrz4Bz9E1cR/uy70oP9udUJKFRkcEYHlHTp4nFwI= -github.com/hashicorp/serf v0.8.1/go.mod h1:h/Ru6tmZazX7WO/GDmwdpS975F019L4t5ng5IgwbNrE= github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc= github.com/hashicorp/serf v0.9.5/go.mod h1:UWDWwZeL5cuWDJdl0C6wrvrUwEqtQ4ZKBKKENpqIUyk= github.com/hashicorp/serf v0.9.6/go.mod h1:TXZNMjZQijwlDvp+r0b63xZ45H7JmCmgg4gpTwn9UV4= @@ -1538,31 +1387,23 @@ 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/hashicorp/yamux v0.0.0-20190923154419-df201c70410d/go.mod h1:+NfK9FKeTrX5uv1uIXGdwYDTeHna2qgaIlx54MXqjAM= -github.com/heroku/rollrus v0.2.0/go.mod h1:B3MwEcr9nmf4xj0Sr5l9eSht7wLKMa1C+9ajgAU79ek= -github.com/heroku/x v0.0.50 h1:CA0AXkSumucVJD+T+x+6c7X1iDEb+40F8GNgH5UjJwo= -github.com/heroku/x v0.0.50/go.mod h1:vr+jORZ6sG3wgEq2FAS6UbOUrz9/DxpQGN/xPHVgbSM= github.com/hetznercloud/hcloud-go v1.35.3 h1:WCmFAhLRooih2QHAsbCbEdpIHnshQQmrPqsr3rHE1Ow= github.com/hetznercloud/hcloud-go v1.35.3/go.mod h1:mepQwR6va27S3UQthaEPGS86jtzSY9xWL1e9dyxXpgA= github.com/hexops/gotextdiff v1.0.3 h1:gitA9+qJrrTCsiCl7+kh75nPqQt1cx4ZkudSTLoUqJM= github.com/hjson/hjson-go/v4 v4.0.0 h1:wlm6IYYqHjOdXH1gHev4VoXCaW20HdQAGCxdOEEg2cs= github.com/hjson/hjson-go/v4 v4.0.0/go.mod h1:KaYt3bTw3zhBjYqnXkYywcYctk0A2nxeEFTse3rH13E= -github.com/huandu/xstrings v1.3.1 h1:4jgBlKK6tLKFvO8u5pmYjG91cqytmDCDvGh7ECVFfFs= -github.com/huandu/xstrings v1.3.1/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE= github.com/hudl/fargo v1.3.0/go.mod h1:y3CKSmjA+wD2gak7sUSXTAoopbhU08POFhmITJgmKTg= github.com/hudl/fargo v1.4.0/go.mod h1:9Ai6uvFy5fQNq6VPKtg+Ceq1+eTY4nKUlR2JElEOcDo= -github.com/hydrogen18/memlistener v0.0.0-20141126152155-54553eb933fb/go.mod h1:qEIFzExnS6016fRpRfxrExeVn2gbClQA99gQhnIcdhE= github.com/iancoleman/strcase v0.2.0 h1:05I4QRnGpI0m37iZQRuskXh+w77mr6Z41lwQzuHLwW0= github.com/iancoleman/strcase v0.2.0/go.mod h1:iwCmte+B7n89clKwxIoIXy/HfoL7AsD47ZCWhYzw7ho= github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/imdario/mergo v0.3.5/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= -github.com/imdario/mergo v0.3.11/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA= github.com/imdario/mergo v0.3.12 h1:b6R2BslTbIEToALKP7LxUvijTsNI9TAe80pLWN2g/HU= github.com/imdario/mergo v0.3.12/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= github.com/inconshreveable/mousetrap v1.0.1 h1:U3uMjPSQEBMNp1lFxmllqCPM6P5u/Xq7Pgzkat/bFNc= github.com/inconshreveable/mousetrap v1.0.1/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= -github.com/influxdata/go-syslog/v2 v2.0.1/go.mod h1:hjvie1UTaD5E1fTnDmxaCw8RRDrT4Ve+XHr5O2dKSCo= github.com/influxdata/go-syslog/v3 v3.0.1-0.20210608084020-ac565dc76ba6 h1:s9ZL6ZhFF8y6ebnm1FLvobkzoIu5xwDQUcRPk/IEhpM= github.com/influxdata/go-syslog/v3 v3.0.1-0.20210608084020-ac565dc76ba6/go.mod h1:aXdIdfn2OcGnMhOTojXmwZqXKgC3MU5riiNvzwwG9OY= github.com/influxdata/influxdb-observability/common v0.2.32 h1:L9R2Zr3f47eyJf6T+8AAB6eyjywYFCLbnScXG6QEabg= @@ -1580,18 +1421,12 @@ github.com/influxdata/line-protocol/v2 v2.0.0-20210312151457-c52fdecb625a/go.mod github.com/influxdata/line-protocol/v2 v2.1.0/go.mod h1:QKw43hdUBg3GTk2iC3iyCxksNj7PX9aUSeYOYE/ceHY= github.com/influxdata/line-protocol/v2 v2.2.1 h1:EAPkqJ9Km4uAxtMRgUubJyqAr6zgWM0dznKMLRauQRE= github.com/influxdata/line-protocol/v2 v2.2.1/go.mod h1:DmB3Cnh+3oxmG6LOBIxce4oaL4CPj3OmMPgvauXh+tM= -github.com/influxdata/tail v1.0.1-0.20200707181643-03a791b270e4/go.mod h1:VeiWgI3qaGdJWust2fP27a6J+koITo/1c/UhxeOxgaM= -github.com/influxdata/telegraf v1.16.3 h1:x0qeuSGGMg5y+YqP/5ZHwXZu3bcBrO8AAQOTNlYEb1c= -github.com/influxdata/telegraf v1.16.3/go.mod h1:fX/6k7qpIqzVPWyeIamb0wN5hbwc0ANUaTS80lPYFB8= -github.com/influxdata/toml v0.0.0-20190415235208-270119a8ce65/go.mod h1:zApaNFpP/bTpQItGZNNUMISDMDAnTXu9UqJ4yT3ocz8= -github.com/influxdata/wlog v0.0.0-20160411224016-7c63b0a71ef8/go.mod h1:/2NMgWB1DHM1ti/gqhOlg+LJeBVk6FqR5aVGYY0hlwI= github.com/ionos-cloud/sdk-go/v6 v6.1.3 h1:vb6yqdpiqaytvreM0bsn2pXw+1YDvEk2RKSmBAQvgDQ= github.com/ionos-cloud/sdk-go/v6 v6.1.3/go.mod h1:Ox3W0iiEz0GHnfY9e5LmAxwklsxguuNFEUSu0gVRTME= github.com/jackc/chunkreader v1.0.0/go.mod h1:RT6O25fNZIuasFJRyZ4R/Y2BbhasbmZXF9QQ7T3kePo= github.com/jackc/chunkreader/v2 v2.0.0/go.mod h1:odVSm741yZoC3dpHEUXIqA9tQRhFrgOHwnPIn9lDKlk= github.com/jackc/chunkreader/v2 v2.0.1 h1:i+RDz65UE+mmpjTfyz0MoVTnzeYxroil2G82ki7MGG8= github.com/jackc/chunkreader/v2 v2.0.1/go.mod h1:odVSm741yZoC3dpHEUXIqA9tQRhFrgOHwnPIn9lDKlk= -github.com/jackc/fake v0.0.0-20150926172116-812a484cc733/go.mod h1:WrMFNQdiFJ80sQsxDoMokWK1W5TQtxBFNpzWTD84ibQ= github.com/jackc/pgconn v0.0.0-20190420214824-7e0022ef6ba3/go.mod h1:jkELnwuX+w9qN5YIfX0fl88Ehu4XC3keFuOJJk9pcnA= github.com/jackc/pgconn v0.0.0-20190824142844-760dd75542eb/go.mod h1:lLjNuW/+OfW9/pnVKPazfWOgNfH2aPem8YQ7ilXGvJE= github.com/jackc/pgconn v0.0.0-20190831204454-2fabfa3c18b7/go.mod h1:ZJKsE/KZfsUgOEh9hBm+xYTstcNHg7UPMVJqRfQxq4s= @@ -1625,7 +1460,6 @@ github.com/jackc/pgtype v0.0.0-20190828014616-a8802b16cc59/go.mod h1:MWlu30kVJrU github.com/jackc/pgtype v1.8.1-0.20210724151600-32e20a603178/go.mod h1:C516IlIV9NKqfsMCXTdChteoXmwgUceqaLfjg2e3NlM= github.com/jackc/pgtype v1.12.0 h1:Dlq8Qvcch7kiehm8wPGIW0W3KsCCHJnRacKW0UM8n5w= github.com/jackc/pgtype v1.12.0/go.mod h1:LUMuVrfsFfdKGLw+AFFVv6KtHOFMwRgDDzBt76IqCA4= -github.com/jackc/pgx v3.6.0+incompatible/go.mod h1:0ZGrqGqkRlliWnWB4zKnWtjbSWbGkVEFm4TeybAXq+I= github.com/jackc/pgx/v4 v4.0.0-20190420224344-cc3461e65d96/go.mod h1:mdxmSJJuR08CZQyj1PVQBHy9XOp5p8/SHH6a0psbY9Y= github.com/jackc/pgx/v4 v4.0.0-20190421002000-1b8f0016e912/go.mod h1:no/Y67Jkk/9WuGR0JG/JseM9irFbnEPbuWV2EELPNuM= github.com/jackc/pgx/v4 v4.0.0-pre1.0.20190824185557-6972a5742186/go.mod h1:X+GQnOEnf1dqHGpw7JmHqHc1NxDoalibchSk9/RWuDc= @@ -1657,12 +1491,10 @@ github.com/jcmturner/gokrb5/v8 v8.4.3 h1:iTonLeSJOn7MVUtyMT+arAn5AKAPrkilzhGw8wE github.com/jcmturner/gokrb5/v8 v8.4.3/go.mod h1:dqRwJGXznQrzw6cWmyo6kH+E7jksEQG/CyVWsJEsJO0= github.com/jcmturner/rpc/v2 v2.0.3 h1:7FXXj8Ti1IaVFpSAziCZWNzbNuZmnvw/i6CqLNdWfZY= github.com/jcmturner/rpc/v2 v2.0.3/go.mod h1:VUJYCIDm3PVOEHw8sgt091/20OJjskO/YJki3ELg/Hc= -github.com/jessevdk/go-flags v1.5.0/go.mod h1:Fw0T6WPc1dYxT4mKEZRfG5kJhaTDP9pj1c2EWnYs/m4= github.com/jgautheron/goconst v1.4.0/go.mod h1:aAosetZ5zaeC/2EfMeRswtxUFBpe2Hr7HzkgX4fanO4= github.com/jhump/protoreflect v1.6.0/go.mod h1:eaTn3RZAmMBcV0fifFvlm6VHNz3wSkYyXYWUh7ymB74= github.com/jingyugao/rowserrcheck v0.0.0-20210130005344-c6a0c12dd98d/go.mod h1:/EZlaYCnEX24i7qdVhT9du5JrtFWYRQr67bVgR7JJC8= github.com/jirfag/go-printf-func-name v0.0.0-20200119135958-7558a9eaa5af/go.mod h1:HEWGJkRDzjJY2sqdDwxccsGicWEf9BQOZsq2tV+xzM0= -github.com/jmespath/go-jmespath v0.0.0-20160202185014-0b12d6b521d8/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= github.com/jmespath/go-jmespath v0.3.0/go.mod h1:9QtRXoHjLGCJ5IBSaohpXITPlowMeeYCZ7fLUTSywik= github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg= @@ -1670,18 +1502,13 @@ github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHW github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8= github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U= github.com/jmoiron/sqlx v1.2.0/go.mod h1:1FEQNm3xlJgrMD+FBdI9+xvCksHtbpVBBw5dYhBSsks= -github.com/joeshaw/envdecode v0.0.0-20180129163420-d5f34bca07f3/go.mod h1:Q+alOFAXgW5SrcfMPt/G4B2oN+qEcQRJjkn/f4mKL04= github.com/joho/godotenv v1.3.0 h1:Zjp+RcGpHhGlrMbJzXTrZZPrWj+1vfm90La1wgB6Bhc= github.com/joho/godotenv v1.3.0/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqxOKXbg= github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY= github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y= -github.com/jpillora/backoff v0.0.0-20180909062703-3050d21c67d7/go.mod h1:2iMrUgbbvHEiQClaW2NsSzMyGHqN+rDFqY705q49KG0= github.com/jpillora/backoff v1.0.0 h1:uvFg412JmmHBHw7iwprIxkPMI+sGQ4kzOWsMeHnm2EA= github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4= -github.com/jsimonetti/rtnetlink v0.0.0-20190606172950-9527aa82566a/go.mod h1:Oz+70psSo5OFh8DBl0Zv2ACw7Esh6pPUphlvZG9x7uw= -github.com/jsimonetti/rtnetlink v0.0.0-20200117123717-f846d4f6c1f4/go.mod h1:WGuG/smIU4J/54PblvSbh+xvCZmpJnFgr3ds6Z55XMQ= -github.com/json-iterator/go v0.0.0-20180612202835-f2b4162afba3/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= github.com/json-iterator/go v1.1.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/json-iterator/go v1.1.8/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= @@ -1699,23 +1526,19 @@ github.com/juju/errors v0.0.0-20181012004132-a4583d0a56ea/go.mod h1:W54LbzXuIE0b github.com/juju/loggo v0.0.0-20190526231331-6e530bcce5d8/go.mod h1:vgyd7OREkbtVEN/8IXZe5Ooef3LQePvuBm9UWj6ZL8U= github.com/juju/testing v0.0.0-20191001232224-ce9dec17d28b/go.mod h1:63prj8cnj0tU0S9OHjGJn+b1h0ZghCndfnbQolrYTwA= github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= -github.com/julienschmidt/httprouter v1.3.0 h1:U0609e9tgbseu3rBINet9P48AI/D3oJs4dN7jwJOQ1U= github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM= github.com/julz/importas v0.0.0-20210226073942-60b4fa260dd0/go.mod h1:oSFU2R4XK/P7kNBrnL/FEQlDGN1/6WoxXEjSSXO0DV0= github.com/jung-kurt/gofpdf v1.0.0/go.mod h1:7Id9E/uU8ce6rXgefFLlgrJj/GYY22cpxn+r32jIOes= github.com/jung-kurt/gofpdf v1.0.3-0.20190309125859-24315acbbda5/go.mod h1:7Id9E/uU8ce6rXgefFLlgrJj/GYY22cpxn+r32jIOes= github.com/k0kubun/pp v3.0.1+incompatible/go.mod h1:GWse8YhT0p8pT4ir3ZgBbfZild3tgzSScAn6HmfYukg= github.com/k0kubun/pp/v3 v3.1.0/go.mod h1:vIrP5CF0n78pKHm2Ku6GVerpZBJvscg48WepUYEk2gw= -github.com/kardianos/service v1.0.0/go.mod h1:8CzDhVuCuugtsHyZoTvsOBuvonN/UDBvl0kH+BUxvbo= github.com/karrick/godirwalk v1.8.0/go.mod h1:H5KPZjojv4lE+QYImBI8xVtrBRgYrIVsaRPx4tDPEn4= github.com/karrick/godirwalk v1.10.3/go.mod h1:RoGL9dQei4vP9ilrpETWE8CLOZ1kiN0LhBygSwrAsHA= -github.com/karrick/godirwalk v1.16.1/go.mod h1:j4mkqPuvaLI8mp1DroR3P6ad7cyYd4c1qeJ3RV7ULlk= github.com/karrick/godirwalk v1.17.0 h1:b4kY7nqDdioR/6qnbHQyDvmA17u5G1cZ6J+CZXwSWoI= github.com/karrick/godirwalk v1.17.0/go.mod h1:j4mkqPuvaLI8mp1DroR3P6ad7cyYd4c1qeJ3RV7ULlk= github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 h1:Z9n2FFNUXsshfwJMBgNA0RU6/i7WVaAegv3PtuIHPMs= github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod h1:CzGEWj7cYgsdH8dAjBGEr58BoE7ScuLd+fwFZ44+/x8= github.com/keybase/go-keychain v0.0.0-20190712205309-48d3d31d256d/go.mod h1:JJNrCn9otv/2QP4D7SMJBgaleKpOf66PnW6F5WGNRIc= -github.com/keybase/go-ps v0.0.0-20190827175125-91aafc93ba19/go.mod h1:hY+WOq6m2FpbvyrI93sMaypsttvaIL5nhVR92dTMUcQ= github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q= github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= @@ -1756,16 +1579,12 @@ github.com/kr/pty v1.1.8/go.mod h1:O1sed60cT9XZ5uDucP5qwvh+TE3NnUj51EiZO/lmSfw= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= -github.com/kubernetes/apimachinery v0.0.0-20190119020841-d41becfba9ee/go.mod h1:Pe/YBTPc3vqoMkbuIWPH8CF9ehINdvNyS0dP3J6HC0s= github.com/kulti/thelper v0.4.0/go.mod h1:vMu2Cizjy/grP+jmsvOFDx1kYP6+PD1lqg4Yu5exl2U= github.com/kunwardeep/paralleltest v1.0.2/go.mod h1:ZPqNm1fVHPllh5LPVujzbVz1JN2GhLxSfY+oqUsvG30= github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc= github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw= github.com/kyoh86/exportloopref v0.1.8/go.mod h1:1tUcJeiioIs7VWe5gcOObrux3lb66+sBqGZrRkMwPgg= -github.com/leesper/go_rng v0.0.0-20171009123644-5344a9259b21/go.mod h1:N0SVk0uhy+E1PZ3C9ctsPRlvOPAFPkCNlcPBDkt0N3U= github.com/leesper/go_rng v0.0.0-20190531154944-a612b043e353 h1:X/79QL0b4YJVO5+OsPH9rF2u428CIrGL/jLmPsoOQQ4= -github.com/leesper/go_rng v0.0.0-20190531154944-a612b043e353/go.mod h1:N0SVk0uhy+E1PZ3C9ctsPRlvOPAFPkCNlcPBDkt0N3U= -github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII= github.com/leodido/ragel-machinery v0.0.0-20181214104525-299bdde78165 h1:bCiVCRCs1Heq84lurVinUPy19keqGEe4jh5vtK37jcg= github.com/leodido/ragel-machinery v0.0.0-20181214104525-299bdde78165/go.mod h1:WZxr2/6a/Ar9bMDc2rN/LJrE/hF6bXE4LPyDSIxwAfg= github.com/leoluk/perflib_exporter v0.2.0 h1:WJU7N3AIHxfc3CjoEJcBgG3i2ltF5Yz1ADVY9T6f1BY= @@ -1773,7 +1592,6 @@ github.com/leoluk/perflib_exporter v0.2.0/go.mod h1:MinSWm88jguXFFrGsP56PtleUb4Q github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= github.com/lib/pq v1.1.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= -github.com/lib/pq v1.3.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= github.com/lib/pq v1.9.0/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= github.com/lib/pq v1.10.2/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= github.com/lib/pq v1.10.7 h1:p7ZhMD+KsSRozJr34udlUrhboJwWAgCg34+/ZZNvZZw= @@ -1787,7 +1605,6 @@ github.com/linkedin/goavro/v2 v2.9.8/go.mod h1:UgQUb2N/pmueQYH9bfqFioWxzYCZXSfF8 github.com/linode/linodego v1.9.3 h1:+lxNZw4avRxhCqGjwfPgQ2PvMT+vOL0OMsTdzixR7hQ= github.com/linode/linodego v1.9.3/go.mod h1:h6AuFR/JpqwwM/vkj7s8KV3iGN8/jxn+zc437F8SZ8w= github.com/logrusorgru/aurora v0.0.0-20181002194514-a7b3b318ed4e/go.mod h1:7rIyQOR62GCctdiQpZ/zOJlFyk6y+94wXzv6RNZgaR4= -github.com/lstoll/grpce v1.7.0/go.mod h1:XiCWl3R+avNCT7KsTjv3qCblgsSqd0SC4ymySrH226g= github.com/lucasb-eyer/go-colorful v1.0.2/go.mod h1:0MS4r+7BZKSJ5mw4/S5MPN+qHFF1fYclkSPilDOKW0s= github.com/lucasb-eyer/go-colorful v1.0.3/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0= github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0/go.mod h1:zJYVVT2jmtg6P3p1VtQj7WsuWi/y4VnjVBn7F8KPB3I= @@ -1802,8 +1619,6 @@ github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czP github.com/magiconair/properties v1.8.5/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60= github.com/magiconair/properties v1.8.6 h1:5ibWZ6iY0NctNGWo87LalDlEZ6R41TqbbDamhfG/Qzo= github.com/magiconair/properties v1.8.6/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60= -github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= -github.com/mailru/easyjson v0.0.0-20180717111219-efc7eb8984d6/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/mailru/easyjson v0.0.0-20180823135443-60711f1a8329/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/mailru/easyjson v0.0.0-20190312143242-1de009706dbe/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= @@ -1843,7 +1658,6 @@ github.com/mattn/go-runewidth v0.0.2/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzp github.com/mattn/go-runewidth v0.0.4/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= github.com/mattn/go-runewidth v0.0.7/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI= github.com/mattn/go-runewidth v0.0.8/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI= -github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI= github.com/mattn/go-sqlite3 v1.9.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc= github.com/mattn/go-sqlite3 v2.0.3+incompatible h1:gXHsfypPkaMZrKbD5209QV9jbUTJKjyR5WD3HYQSd+U= github.com/mattn/go-sqlite3 v2.0.3+incompatible/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc= @@ -1852,14 +1666,8 @@ github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5 github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo= github.com/matttproud/golang_protobuf_extensions v1.0.4/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4= github.com/mbilski/exhaustivestruct v1.2.0/go.mod h1:OeTBVxQWoEmB2J2JCHmXWPJ0aksxSUOUy+nvtVEfzXc= -github.com/mdlayher/apcupsd v0.0.0-20200608131503-2bf01da7bf1b/go.mod h1:WYK/Z/aXq9cbMFIL5ihcA4sX/r/3/WCas/Qvs/2fXcA= -github.com/mdlayher/genetlink v1.0.0/go.mod h1:0rJ0h4itni50A86M2kHcgS85ttZazNt7a8H2a2cw0Gc= -github.com/mdlayher/netlink v0.0.0-20190409211403-11939a169225/go.mod h1:eQB3mZE4aiYnlUsyGGCOpPETfdQq4Jhsgf1fk3cwQaA= -github.com/mdlayher/netlink v1.0.0/go.mod h1:KxeJAFOFLG6AjpyDkQ/iIhxygIUKD+vcwqcnu43w/+M= -github.com/mdlayher/netlink v1.1.0/go.mod h1:H4WCitaheIsdF9yOYu8CFmCgQthAPIWZmcKp9uZHgmY= github.com/mgechev/dots v0.0.0-20190921121421-c36f7dcfbb81/go.mod h1:KQ7+USdGKfpPjXk4Ga+5XxQM4Lm4e3gAogrreFAYpOg= github.com/mgechev/revive v1.0.3/go.mod h1:POGGZagSo/0frdr7VeAifzS5Uka0d0GPiM35MsTO8nE= -github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b/go.mod h1:01TrycV0kFyexm33Z7vhZRXopbI8J3TDReVlkTgMUxE= github.com/microsoft/ApplicationInsights-Go v0.4.4 h1:G4+H9WNs6ygSCe6sUyxRc2U81TI5Es90b2t/MwX5KqY= github.com/microsoft/ApplicationInsights-Go v0.4.4/go.mod h1:fKRUseBqkw6bDiXTs3ESTiU/4YTIHsQS4W3fP2ieF4U= github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= @@ -1868,7 +1676,6 @@ github.com/miekg/dns v1.1.41/go.mod h1:p6aan82bvRIyn+zDIv9xYNUpwa73JcSh9BKwknJys github.com/miekg/dns v1.1.43/go.mod h1:+evo5L0630/F6ca/Z9+GAqzhjGyn8/c+TBaOyfEl0V4= github.com/miekg/dns v1.1.50 h1:DQUfb9uc6smULcREF09Uc+/Gd46YWqJd5DbpPE9xkcA= github.com/miekg/dns v1.1.50/go.mod h1:e3IlAVfNqAllflbibAZEWOXOQ+Ynzk/dDozDxY7XnME= -github.com/mikioh/ipaddr v0.0.0-20190404000644-d465c8ab6721/go.mod h1:Ickgr2WtCLZ2MDGd4Gr0geeCH5HybhRJbonOgQpvSxc= github.com/mindprince/gonvml v0.0.0-20190828220739-9ebdce4bb989 h1:PS1dLCGtD8bb9RPKJrc8bS7qHL6JnW1CZvwzH9dPoUs= github.com/mindprince/gonvml v0.0.0-20190828220739-9ebdce4bb989/go.mod h1:2eu9pRWp8mo84xCg6KswZ+USQHjwgRhNp06sozOdsTY= github.com/minio/highwayhash v1.0.1/go.mod h1:BQskDq+xkJ12lmlUUi7U0M5Swg3EWR+dLTk+kldvVxY= @@ -1918,7 +1725,6 @@ github.com/moby/term v0.0.0-20220808134915-39b0c02b01ae/go.mod h1:E2VnQOmVuvZB6U github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= -github.com/modern-go/reflect2 v0.0.0-20180320133207-05fbef0ca5da/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= @@ -1939,7 +1745,6 @@ github.com/mrunalp/fileutils v0.5.0 h1:NKzVxiH7eSk+OQ4M+ZYW1K6h27RUV3MI6NUTsHhU6 github.com/mrunalp/fileutils v0.5.0/go.mod h1:M1WthSahJixYnrXQl/DFQuteStB1weuxD2QJNHXfbSQ= github.com/mtibben/percent v0.2.1 h1:5gssi8Nqo8QU/r2pynCm+hBQHpkB/uNK7BJCFogWdzs= github.com/mtibben/percent v0.2.1/go.mod h1:KG9uO+SZkUp+VkRHsCdYQV3XSZrrSpR3O9ibNBTZrns= -github.com/multiplay/go-ts3 v1.0.0/go.mod h1:14S6cS3fLNT3xOytrA/DkRyAFNuQLMLEqOYAsf87IbQ= github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= 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= @@ -1948,13 +1753,11 @@ github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f h1:KUppIJq7/+ github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw= github.com/nakabonne/nestif v0.3.0/go.mod h1:dI314BppzXjJ4HsCnbo7XzrJHPszZsjnk5wEBSYHI2c= -github.com/naoina/go-stringutil v0.1.0/go.mod h1:XJ2SJL9jCtBh+P9q5btrd/Ylo8XwT/h1USek5+NqSA0= github.com/nats-io/jwt v0.3.0/go.mod h1:fRYCDE99xlTsqUzISS1Bi75UBJ6ljOJQOAAu5VglpSg= github.com/nats-io/jwt v0.3.2/go.mod h1:/euKqTS1ZD+zzjYrY7pseZrTtWQSjujC7xjPc8wL6eU= github.com/nats-io/jwt v1.2.2/go.mod h1:/xX356yQA6LuXI9xWW7mZNpxgF2mBmGecH+Fj34sP5Q= github.com/nats-io/jwt/v2 v2.0.3/go.mod h1:VRP+deawSXyhNjXmxPCHskrR6Mq50BqpEI5SEcNiGlY= github.com/nats-io/nats-server/v2 v2.1.2/go.mod h1:Afk+wRZqkMQs/p45uXdrVLuab3gwv3Z8C4HTBu8GD/k= -github.com/nats-io/nats-server/v2 v2.1.4/go.mod h1:Jw1Z28soD/QasIA2uWjXyM9El1jly3YwyFOuR8tH1rg= github.com/nats-io/nats-server/v2 v2.5.0/go.mod h1:Kj86UtrXAL6LwYRA6H4RqzkHhK0Vcv2ZnKD5WbQ1t3g= github.com/nats-io/nats.go v1.9.1/go.mod h1:ZjDU1L/7fJ09jvUSRVBR2e7+RnLiiIQyqyzEE/Zbp4w= github.com/nats-io/nats.go v1.12.1/go.mod h1:BPko4oXsySz4aSWeFgOHLZs3G4Jq4ZAyE6/zMCxRT6w= @@ -1965,7 +1768,6 @@ github.com/nats-io/nkeys v0.3.0/go.mod h1:gvUNGjVcM2IPr5rCsRsC6Wb3Hr2CQAm08dsxtV github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c= github.com/nbutton23/zxcvbn-go v0.0.0-20180912185939-ae427f1e4c1d/go.mod h1:o96djdrsSGy3AWPyBgZMAGfxZNfgntdJG+11KU4QvbU= github.com/nbutton23/zxcvbn-go v0.0.0-20201221231540-e56b841a3c88/go.mod h1:KSVJerMDfblTH7p5MZaTt+8zaT2iEk3AkVb9PQdZuE8= -github.com/newrelic/newrelic-telemetry-sdk-go v0.2.0/go.mod h1:G9MqE/cHGv3Hx3qpYhfuyFUsGx2DpVcGi1iJIqTg+JQ= github.com/nginxinc/nginx-plus-go-client v0.6.0/go.mod h1:DBAmdDP71tOhgFPdCMVusegzdKmLVpVL0nVcMX17pbY= github.com/nginxinc/nginx-prometheus-exporter v0.8.1-0.20201110005315-f5a5f8086c19 h1:jR4KbeVA+KYmPq+amRe6AdB4mIfEaSOZGY2zCpqt/p8= github.com/nginxinc/nginx-prometheus-exporter v0.8.1-0.20201110005315-f5a5f8086c19/go.mod h1:L58Se1nwn3cEyHWlcfdlXgiGbHe/efvDbkbi+psz3lA= @@ -1973,7 +1775,6 @@ github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLA github.com/nishanths/exhaustive v0.1.0/go.mod h1:S1j9110vxV1ECdCudXRkeMnFQ/DQk9ajLT0Uf2MYZQQ= github.com/nishanths/predeclared v0.2.1/go.mod h1:HvkGJcA3naj4lOwnFXFDkFxVtSqQMB9sbB1usJ+xjQE= github.com/npillmayer/nestext v0.1.3/go.mod h1:h2lrijH8jpicr25dFY+oAJLyzlya6jhnuG+zWp9L0Uk= -github.com/nsqio/go-nsq v1.0.7/go.mod h1:XP5zaUs3pqf+Q71EqUJs3HYfBIqfK6G83WQMdNN+Ito= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE= github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU= @@ -1987,7 +1788,6 @@ github.com/oklog/ulid v1.3.1 h1:EGfNDEx6MqHz8B3uNV6QAib1UR2Lm97sHi3ocA6ESJ4= github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U= github.com/olekukonko/tablewriter v0.0.0-20170122224234-a0225b3f23b5/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo= github.com/olekukonko/tablewriter v0.0.4/go.mod h1:zq6QwlOf5SlnkVbMSr5EoBv3636FWnp+qbPhuoO21uA= -github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY= github.com/olivere/elastic v6.2.35+incompatible/go.mod h1:J+q1zQJTgAz9woqsbVRqGeB5G1iqDKVBWLNSYW8yfJ8= github.com/olivere/elastic v6.2.37+incompatible/go.mod h1:J+q1zQJTgAz9woqsbVRqGeB5G1iqDKVBWLNSYW8yfJ8= github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= @@ -2019,11 +1819,8 @@ github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAl github.com/onsi/gomega v1.18.1/go.mod h1:0q+aL8jAiMXy9hbwj2mr5GziHiwhAIQpFmmtT5hitRs= github.com/onsi/gomega v1.20.1 h1:PA/3qinGoukvymdIDV8pii6tiZgC8kbmJO6Z5+b002Q= github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk= -github.com/openconfig/gnmi v0.0.0-20180912164834-33a1865c3029/go.mod h1:t+O9It+LKzfOAhKTT5O0ehDix+MTqbtT0T9t+7zzOvc= -github.com/opencontainers/go-digest v1.0.0-rc1/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s= 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.1/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0= github.com/opencontainers/image-spec v1.0.2/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0= github.com/opencontainers/image-spec v1.0.3-0.20211202183452-c5a74bcca799 h1:rc3tiVYb5z54aKaDfakKn0dDjIyPpTtszkjuMzyt7ec= github.com/opencontainers/image-spec v1.0.3-0.20211202183452-c5a74bcca799/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0= @@ -2041,13 +1838,9 @@ github.com/openshift/api v0.0.0-20210521075222-e273a339932a/go.mod h1:izBmoXbUu3 github.com/openshift/build-machinery-go v0.0.0-20210423112049-9415d7ebd33e/go.mod h1:b1BuldmJlbA/xYtdZvKi+7j5YGB44qJUJDZ9zwiNCfE= github.com/openshift/client-go v0.0.0-20210521082421-73d9475a9142 h1:ZHRIMCFIJN1p9LsJt4HQ+akDrys4PrYnXzOWI5LK03I= github.com/openshift/client-go v0.0.0-20210521082421-73d9475a9142/go.mod h1:fjS8r9mqDVsPb5td3NehsNOAWa4uiFkYEfVZioQ2gH0= -github.com/opentracing-contrib/go-grpc v0.0.0-20180928155321-4b5a12d3ff02/go.mod h1:JNdpVEzCpXBgIiv4ds+TzhN1hrtxq6ClLrTlT9OQRSc= github.com/opentracing-contrib/go-grpc v0.0.0-20191001143057-db30781987df/go.mod h1:DYR5Eij8rJl8h7gblRrOZ8g0kW1umSpKqYIBTgeDtLo= -github.com/opentracing-contrib/go-grpc v0.0.0-20210225150812-73cb765af46e h1:4cPxUYdgaGzZIT5/j0IfqOrrXmq6bG8AwvwisMXpdrg= -github.com/opentracing-contrib/go-grpc v0.0.0-20210225150812-73cb765af46e/go.mod h1:DYR5Eij8rJl8h7gblRrOZ8g0kW1umSpKqYIBTgeDtLo= github.com/opentracing-contrib/go-observer v0.0.0-20170622124052-a52f23424492/go.mod h1:Ngi6UdF0k5OKD5t5wlmGhe/EDKPoUM3BXZSSfIuJbis= github.com/opentracing-contrib/go-stdlib v0.0.0-20190519235532-cf7a6c988dc9/go.mod h1:PLldrQSroqzH70Xl+1DQcGnefIbqsKR7UDaiux3zV+w= -github.com/opentracing-contrib/go-stdlib v1.0.0 h1:TBS7YuVotp8myLon4Pv7BtCBzOTo1DeZCld0Z63mW2w= github.com/opentracing-contrib/go-stdlib v1.0.0/go.mod h1:qtI1ogk+2JhVPIXVc6q+NHziSmy2W5GbdQZFUHADCBU= github.com/opentracing/basictracer-go v1.0.0/go.mod h1:QfBfYuafItcjQuMwinw9GhYKwFXS9KnPs5lxoYwgW74= github.com/opentracing/opentracing-go v1.0.2/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= @@ -2061,7 +1854,6 @@ github.com/openzipkin/zipkin-go v0.2.2/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnh github.com/openzipkin/zipkin-go v0.2.5/go.mod h1:KpXfKdgRDnnhsxw4pNIH9Md5lyFqKUa4YDFlwRYAMyE= github.com/openzipkin/zipkin-go v0.4.1 h1:kNd/ST2yLLWhaWrkgchya40TJabe8Hioj9udfPcEO5A= github.com/openzipkin/zipkin-go v0.4.1/go.mod h1:qY0VqDSN1pOBN94dBc6w2GJlWLiovAyg7Qt6/I9HecM= -github.com/openzipkin/zipkin-go-opentracing v0.3.4/go.mod h1:js2AbwmHW0YD9DwIw2JhQWmbfFi/UnWyYwdVhqbCDOE= github.com/ory/go-acc v0.2.6/go.mod h1:4Kb/UnPcT8qRAk3IAxta+hvVapdxTLWtrr7bFLlEgpw= github.com/ory/viper v1.7.5/go.mod h1:ypOuyJmEUb3oENywQZRgeAMwqgOyDqwboO1tj3DjTaM= github.com/ovh/go-ovh v1.3.0 h1:mvZaddk4E4kLcXhzb+cxBsMPYp2pHqiQpWYkInsuZPQ= @@ -2100,7 +1892,6 @@ github.com/pierrec/lz4 v0.0.0-20190327172049-315a67e90e41/go.mod h1:3/3N9NVKO0je github.com/pierrec/lz4 v1.0.2-0.20190131084431-473cd7ce01a1/go.mod h1:3/3N9NVKO0jef7pBehbT1qWhCMrIgbYNnFAZCqQ5LRc= github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= github.com/pierrec/lz4 v2.4.1+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= -github.com/pierrec/lz4 v2.5.2+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= github.com/pierrec/lz4 v2.6.0+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= 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= @@ -2115,7 +1906,6 @@ github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8/go.mod h1:HKlIX3XHQyzL github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA= 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.8.2-0.20190227000051-27936f6d90f9/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/pkg/profile v1.2.1/go.mod h1:hJw3o1OdXxsrSjjVksARp5W95eeEaEfptyVZyv6JUPA= @@ -2134,10 +1924,7 @@ github.com/power-devops/perfstat v0.0.0-20220216144756-c35f1ee13d7c/go.mod h1:Om github.com/pquerna/cachecontrol v0.1.0 h1:yJMy84ti9h/+OEWa752kBTKv4XC30OtVVHYv/8cTqKc= github.com/pquerna/cachecontrol v0.1.0/go.mod h1:NrUG3Z7Rdu85UNR3vm7SOsl1nFIeSiQnrHV5K9mBcUI= github.com/prashantv/gostub v1.1.0/go.mod h1:A5zLQHz7ieHGG7is6LLXLz7I8+3LZzsrV0P1IAHhP5U= -github.com/prometheus/alertmanager v0.24.0 h1:HBWR3lk4uy3ys+naDZthDdV7yEsxpaNeZuUS+hJgrOw= -github.com/prometheus/alertmanager v0.24.0/go.mod h1:r6fy/D7FRuZh5YbnX6J3MBY0eI4Pb5yPYS7/bPSXXqI= github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= -github.com/prometheus/client_golang v0.9.2/go.mod h1:OsXs2jCmiKlQ1lTBmv21f2mNfw4xf/QclQDMrYNZzcM= github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829/go.mod h1:p2iRAGwDERtqlqzRXnrOVns+ignqQo//hLXqYxZYVNs= github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDft0ttaMvbicHlPoso= github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= @@ -2163,7 +1950,6 @@ github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6T github.com/prometheus/client_model v0.3.0 h1:UBgGFHqYdG/TPFD1B1ogZywDqEkwp3fBMvqdiQ7Xew4= github.com/prometheus/client_model v0.3.0/go.mod h1:LDGWKZIo7rky3hgvBe+caln+Dr3dPggB5dvjtD7w9+w= github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= -github.com/prometheus/common v0.0.0-20181126121408-4724e9255275/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= github.com/prometheus/common v0.2.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= github.com/prometheus/common v0.4.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= @@ -2181,11 +1967,7 @@ github.com/prometheus/common v0.37.0 h1:ccBbHCgIiT9uSoFY0vX8H3zsNR5eLt17/RQLUvn8 github.com/prometheus/common v0.37.0/go.mod h1:phzohg0JFMnBEFGxTDbfu3QyL5GI8gTQJFhYO5B3mfA= github.com/prometheus/common/sigv4 v0.1.0 h1:qoVebwtwwEhS85Czm2dSROY5fTo2PAPEVdDeppTwGX4= github.com/prometheus/common/sigv4 v0.1.0/go.mod h1:2Jkxxk9yYvCkE5G1sQT7GuEXm57JrvHu9k5YwTjsNtI= -github.com/prometheus/exporter-toolkit v0.7.1/go.mod h1:ZUBIj498ePooX9t/2xtDjeQYwvRpiPP2lh5u4iblj2g= -github.com/prometheus/exporter-toolkit v0.8.2 h1:sbJAfBXQFkG6sUkbwBun8MNdzW9+wd5YfPYofbmj0YM= -github.com/prometheus/exporter-toolkit v0.8.2/go.mod h1:00shzmJL7KxcsabLWcONwpyNEuWhREOnFqZW7vadFS0= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= -github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= @@ -2208,16 +1990,12 @@ github.com/quasilyte/go-ruleguard/dsl v0.0.0-20210106184943-e47d54850b18/go.mod github.com/quasilyte/go-ruleguard/dsl v0.0.0-20210115110123-c73ee1cbff1f/go.mod h1:KeCP03KrjuSO0H1kTuZQCWlQPulDV6YMIXmpQss17rU= github.com/quasilyte/go-ruleguard/rules v0.0.0-20201231183845-9e62ed36efe1/go.mod h1:7JTjp89EGyU1d6XfBiXihJNG37wB2VRkd125Q1u7Plc= github.com/quasilyte/regex/syntax v0.0.0-20200407221936-30656e2c4a95/go.mod h1:rlzQ04UMyJXu/aOvhd8qT+hvDrFpiwqp8MRXDY9szc0= -github.com/rafaeljusto/redigomock v0.0.0-20190202135759-257e089e14a1/go.mod h1:JaY6n2sDr+z2WTsXkOmNRUfDy6FN0L6Nk7x06ndm4tY= -github.com/rcrowley/go-metrics v0.0.0-20160613154715-cfa5a85e9f0a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= github.com/rcrowley/go-metrics v0.0.0-20190826022208-cac0b30c2563/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= -github.com/rcrowley/go-metrics v0.0.0-20200313005456-10cdbea86bc0/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 h1:N/ElC8H3+5XpJzTSTfLsJV/mx9Q9g7kxmchpfZyxgzM= github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= github.com/relvacode/iso8601 v1.1.0 h1:2nV8sp0eOjpoKQ2vD3xSDygsjAx37NHG2UlZiCkDH4I= github.com/relvacode/iso8601 v1.1.0/go.mod h1:FlNp+jz+TXpyRqgmM7tnzHHzBnz776kmAH2h3sZCn0I= -github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo= github.com/rhnvrm/simples3 v0.6.1/go.mod h1:Y+3vYm2V7Y4VijFoJHHTrja6OgPrJ2cBti8dPGkC3sA= github.com/rivo/tview v0.0.0-20200219210816-cd38d7432498/go.mod h1:6lkG1x+13OShEf0EaOCaTQYyB7d5nSbb181KtjlS+84= github.com/rivo/uniseg v0.1.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= @@ -2230,8 +2008,6 @@ 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.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8= github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs= -github.com/rollbar/rollbar-go v1.0.2/go.mod h1:AcFs5f0I+c71bpHlXNNDbOWJiKwjFDtISeXco0L5PKQ= -github.com/rollbar/rollbar-go v1.2.0/go.mod h1:czC86b8U4xdUH7W2C6gomi2jutLm8qK0OtrF5WMvpcc= github.com/rs/cors v1.7.0/go.mod h1:gFx+x8UowdsKA9AchylcLynDq+nNFfI8FkUZdN/jGCU= github.com/rs/cors v1.8.2 h1:KCooALfAYGs415Cwu5ABvv9n9509fSiG5SQJn/AQo4U= github.com/rs/cors v1.8.2/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU= @@ -2247,15 +2023,12 @@ github.com/ryanrolds/sqlclosecheck v0.3.0/go.mod h1:1gREqxyTGR3lVtpngyFo3hZAgk0K 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/safchain/ethtool v0.0.0-20200218184317-f459e2d13664/go.mod h1:Z0q5wiBQGYcxhMZ6gUqHn6pYNLypFAvaL3UvgZLR0U4= github.com/sagikazarmark/crypt v0.6.0/go.mod h1:U8+INwJo3nBv1m6A/8OBXAq7Jnpspk5AxSgDyEQcea8= github.com/sagikazarmark/crypt v0.8.0/go.mod h1:TmKwZAo97S4Fy4sfMH/HX/cQP5D+ijra2NyLpNNmttY= -github.com/samuel/go-zookeeper v0.0.0-20180130194729-c4fab1ac1bec/go.mod h1:gi+0XIa01GRL2eRQVjQkKGqKF3SF9vZR/HnPullcV2E= github.com/samuel/go-zookeeper v0.0.0-20190923202752-2cc03de413da/go.mod h1:gi+0XIa01GRL2eRQVjQkKGqKF3SF9vZR/HnPullcV2E= github.com/sanity-io/litter v1.2.0/go.mod h1:JF6pZUFgu2Q0sBZ+HSV35P8TVPI1TTzEwyu9FXAw2W4= github.com/sanposhiho/wastedassign v0.1.3/go.mod h1:LGpq5Hsv74QaqM47WtIsRSF/ik9kqk07kchgv66tLVE= github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0= -github.com/satori/go.uuid v1.2.1-0.20181028125025-b2ce2384e17b/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0= github.com/scaleway/scaleway-sdk-go v1.0.0-beta.9 h1:0roa6gXKgyta64uqh52AQG3wzZXH21unn+ltzQSXML0= github.com/scaleway/scaleway-sdk-go v1.0.0-beta.9/go.mod h1:fCa7OJZ/9DRTnOKmxvT6pn+LPWUptQAmHF/SBJUGEcg= github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529 h1:nn5Wsu0esKSJiIVhscUtVbo7ada43DJhG55ua/hjS5I= @@ -2269,28 +2042,21 @@ github.com/securego/gosec v0.0.0-20200203094520-d13bb6d2420c/go.mod h1:gp0gaHj0W github.com/securego/gosec/v2 v2.6.1/go.mod h1:I76p3NTHBXsGhybUW+cEQ692q2Vp+A0Z6ZLzDIZy+Ao= github.com/segmentio/asm v1.2.0 h1:9BQrFxC+YOHJlTlHGkTrFWf59nbL3XnCoFLTwDCI7ys= github.com/segmentio/asm v1.2.0/go.mod h1:BqMnlJP91P8d+4ibuonYZw9mfnzI9HfxselHZr5aAcs= -github.com/sercand/kuberesolver v2.4.0+incompatible h1:WE2OlRf6wjLxHwNkkFLQGaZcVLEXjMjBPjjEU5vksH8= -github.com/sercand/kuberesolver v2.4.0+incompatible/go.mod h1:lWF3GL0xptCB/vCiJPl/ZshwPsX/n4Y7u0CW9E7aQIQ= github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo= github.com/shazow/go-diff v0.0.0-20160112020656-b6b7b6733b8c/go.mod h1:/PevMnwAxekIXwN8qQyfc5gl2NlkB3CQlkizAbOkeBs= -github.com/shirou/gopsutil v2.20.9+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA= github.com/shirou/gopsutil/v3 v3.21.1/go.mod h1:igHnfak0qnw1biGeI2qKQvu0ZkwvEkUcCLlYhZzdr/4= -github.com/shirou/gopsutil/v3 v3.21.9/go.mod h1:YWp/H8Qs5fVmf17v7JNZzA0mPJ+mS2e9JdiUF9LlKzQ= github.com/shirou/gopsutil/v3 v3.22.2/go.mod h1:WapW1AOOPlHyXr+yOyw3uYx36enocrtSoSBy0L5vUHY= github.com/shirou/gopsutil/v3 v3.22.6/go.mod h1:EdIubSnZhbAvBS1yJ7Xi+AShB/hxwLHOMz4MCYz7yMs= github.com/shirou/gopsutil/v3 v3.22.10 h1:4KMHdfBRYXGF9skjDWiL4RA2N+E8dRdodU/bOZpPoVg= github.com/shirou/gopsutil/v3 v3.22.10/go.mod h1:QNza6r4YQoydyCfo6rH0blGfKahgibh4dQmV5xdFkQk= github.com/shoenig/test v0.4.3 h1:3+CjrpqCwtL08S0wZQilu9WWR/S2CdsLKhHjbJqPj/I= github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24/go.mod h1:M+9NzErvs504Cn4c5DxATwIqPbtswREoFCre64PpcG4= -github.com/shopspring/decimal v0.0.0-20200105231215-408a2507e114/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o= github.com/shopspring/decimal v1.2.0/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o= github.com/shopspring/decimal v1.3.1 h1:2Usl1nmF/WZucqkFZhnfFYxxxu8LG21F6nPQBE5gKV8= github.com/shopspring/decimal v1.3.1/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o= github.com/shurcooL/go v0.0.0-20180423040247-9e1955d9fb6e/go.mod h1:TDJrrUr11Vxrven61rcy3hJMUqaf/CLWYhHNPmT14Lk= github.com/shurcooL/go-goon v0.0.0-20170922171312-37c2f522c041/go.mod h1:N5mDOmsrJOB+vfqUK+7DmDyjhSLIIBnXo9lvZJj3MWQ= -github.com/shurcooL/httpfs v0.0.0-20190707220628-8d4bc4ba7749/go.mod h1:ZY1cvUeJuFPAdZ/B6v7RHavJWZn2YPVFQ1OSXhCGOkg= github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= -github.com/shurcooL/vfsgen v0.0.0-20200824052919-0d455de96546/go.mod h1:TrYk7fJVaAttu97ZZKrO9UbRa8izdowaMIZcxYMbVaw= github.com/signalfx/com_signalfx_metrics_protobuf v0.0.3 h1:32k2QLgsKhcEs55q4REPKyIadvid5FPy2+VMgvbmKJ0= github.com/signalfx/com_signalfx_metrics_protobuf v0.0.3/go.mod h1:gJrXWi7wSGXfiC7+VheQaz+ypdCt5SmZNL+BRxUe7y4= github.com/signalfx/gohistogram v0.0.0-20160107210732-1ccfd2ff5083 h1:WsShHmu12ZztYPfh9b+I+VjYD1o8iOHhB67WZCMEEE8= @@ -2317,7 +2083,6 @@ github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0 github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d h1:zE9ykElWQ6/NYmHa3jpm/yHnI4xSofP+UP6SpjHcSeM= github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= -github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= github.com/smartystreets/goconvey v1.6.4 h1:fv0U8FUIMPNf1L9lnHLvLhgicrIVChEkdzIKYqbNC9s= github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= github.com/snowflakedb/gosnowflake v1.6.15 h1:P8ddNHa+suNqJtjkgx03PUXge5HkxP/aOcGqcPoPv9g= @@ -2326,12 +2091,8 @@ github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4k github.com/soheilhy/cmux v0.1.5 h1:jjzc5WVemNEDTLwv9tlmemhC73tI08BNOIGwBOo10Js= github.com/soheilhy/cmux v0.1.5/go.mod h1:T7TcVDs9LWfQgPlPsdngu6I6QIoyIFZDDC6sNE1GqG0= github.com/sonatard/noctx v0.0.1/go.mod h1:9D2D/EoULe8Yy2joDHJj7bv3sZoq9AaSb8B4lqBjiZI= -github.com/soniah/gosnmp v1.25.0/go.mod h1:8YvfZxH388NIIw2A+X5z2Oh97VcNhtmxDLt5QeUzVuQ= github.com/sony/gobreaker v0.4.1/go.mod h1:ZKptC7FHNvhBz7dN2LGjPVBz2sZJmc0/PkyDJOjmxWY= -github.com/sony/gobreaker v0.5.0 h1:dRCvqm0P490vZPmy7ppEk2qCnCieBooFJ+YoXGYB+yg= -github.com/sony/gobreaker v0.5.0/go.mod h1:ZKptC7FHNvhBz7dN2LGjPVBz2sZJmc0/PkyDJOjmxWY= github.com/sourcegraph/go-diff v0.6.1/go.mod h1:iBszgVvyxdc8SFZ7gm69go2KDdt3ag071iBaWPF6cjs= -github.com/soveran/redisurl v0.0.0-20180322091936-eb325bc7a4b8/go.mod h1:FVJ8jbHu7QrNFs3bZEsv/L5JjearIAY9N0oXh2wk+6Y= github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= github.com/spaolacci/murmur3 v1.1.0 h1:7c1g84S4BPRrfL5Xrdp6fOJ206sU9y293DDHaoy0bLI= github.com/spaolacci/murmur3 v1.1.0/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= @@ -2346,7 +2107,6 @@ github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkU github.com/spf13/cast v1.3.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= github.com/spf13/cast v1.5.0 h1:rj3WzYc11XZaIZMPKmwP96zkFEnnAmV8s6XbB2aY32w= github.com/spf13/cast v1.5.0/go.mod h1:SpXXQ5YoyJw6s3/6cMTQuxvgRl3PCJiyaX9p6b155UU= -github.com/spf13/cobra v0.0.2/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ= github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ= github.com/spf13/cobra v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU= github.com/spf13/cobra v0.0.7/go.mod h1:/6GTrnGXV9HjY+aR4k0oJ5tcvakLuG6EuKReYlHNrgE= @@ -2375,7 +2135,6 @@ github.com/spf13/viper v1.14.0 h1:Rg7d3Lo706X9tHsJMUjdiwMpHB7W8WnSVOssIY+JElU= github.com/spf13/viper v1.14.0/go.mod h1:WT//axPky3FdvXHzGw33dNdXXXfFQqmEalje+egj8As= github.com/ssgreg/nlreturn/v2 v2.1.0/go.mod h1:E/iiPB78hV7Szg2YfRgyIrk1AD6JVMTRkkxBiELzh2I= github.com/stoewer/go-strcase v1.2.0/go.mod h1:IBiWB2sKIp3wVVQ3Y035++gc+knqhUQag1KpM8ahLw8= -github.com/streadway/amqp v0.0.0-20180528204448-e5adc2ada8b8/go.mod h1:1WNBiOZtZQLpVAyu0iTduoJL9hEsMloAK5XWrtW0xdY= github.com/streadway/amqp v0.0.0-20190404075320-75d898a42a94/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= github.com/streadway/amqp v0.0.0-20190827072141-edfb9018d271/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= github.com/streadway/amqp v1.0.0/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= @@ -2387,7 +2146,6 @@ github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoH github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= github.com/stretchr/objx v0.5.0 h1:1zr/of2m5FGMsad5YfcqgdqdWrIhu+EBEJRhR1U7z/c= github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= -github.com/stretchr/testify v0.0.0-20151208002404-e3a8ff8ce365/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v0.0.0-20161117074351-18a02ba4a312/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.1.4/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= @@ -2410,25 +2168,19 @@ github.com/subosito/gotenv v1.4.1/go.mod h1:ayKnFf/c6rvx/2iiLrJUk1e6plDbT3edrFNG github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635 h1:kdXcSzyDtseVEc4yCz2qF8ZrQvIDBJLl4S1c3GCXmoI= github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww= github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7/go.mod h1:q4W45IWZaF22tdD+VEXcAWRA037jwmWEB5VWYORlTpc= -github.com/tbrandon/mbserver v0.0.0-20170611213546-993e1772cc62/go.mod h1:qUzPVlSj2UgxJkVbH0ZwuuiR46U8RBMDT5KLY78Ifpw= 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/tedsuo/ifrit v0.0.0-20191009134036-9a97d0632f00/go.mod h1:eyZnKCc955uh98WQvzOm0dgAeLnf2O0Rz0LPoC5ze+0= github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.553 h1:RB8GWKSifv5QdBQUUWfzCo06FU4mmqH1VG7dTWMm5nQ= github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.553/go.mod h1:7sCQWVkxcsR38nffDW057DRGk8mUjK1Ing/EFOK8s8Y= github.com/testcontainers/testcontainers-go v0.15.0 h1:3Ex7PUGFv0b2bBsdOv6R42+SK2qoZnWBd21LvZYhUtQ= github.com/tetafro/godot v1.4.4/go.mod h1:FVDd4JuKliW3UgjswZfJfHq4vAx0bD/Jd5brJjGeaz4= github.com/tg123/go-htpasswd v1.2.0 h1:UKp34m9H467/xklxUxU15wKRru7fwXoTojtxg25ITF0= github.com/tg123/go-htpasswd v1.2.0/go.mod h1:h7IzlfpvIWnVJhNZ0nQ9HaFxHb7pn5uFJYLlEUJa2sM= -github.com/thanos-io/thanos v0.28.0 h1:g0LByBE0ANA30/t/a2C/mceYhO3VtIPQFoxCsqrYM9I= -github.com/thanos-io/thanos v0.28.0/go.mod h1:pqjpOBxOCME9Yn1QztV8bP9C4rkhWvWtyyavdBZ8lDk= github.com/theupdateframework/go-tuf v0.3.0 h1:od2sc5+BSkKZhmUG2o2rmruy0BGSmhrbDhCnpxh87X8= github.com/theupdateframework/go-tuf v0.3.0/go.mod h1:E5XP0wXitrFUHe4b8cUcAAdxBW4LbfnqF4WXXGLgWNo= -github.com/tidwall/gjson v1.6.0/go.mod h1:P256ACg0Mn+j1RXIDXoss50DeIABTYK1PULOJHhxOls= github.com/tidwall/gjson v1.10.2/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk= github.com/tidwall/gjson v1.14.3 h1:9jvXn7olKEHU1S9vwoMGliaT8jq1vJ7IH/n9zD9Dnlw= github.com/tidwall/gjson v1.14.3/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk= -github.com/tidwall/match v1.0.1/go.mod h1:LujAq0jyVjBy028G1WhWfIzbpQfMO8bBZ6Tyb0+pL9E= github.com/tidwall/match v1.1.1 h1:+Ho715JplO36QYgwN9PGYNhgZvoUSc9X2c80KVTi+GA= github.com/tidwall/match v1.1.1/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM= github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk= @@ -2457,10 +2209,8 @@ github.com/tomarrell/wrapcheck v0.0.0-20201130113247-1683564d9756/go.mod h1:yiFB github.com/tommy-muehle/go-mnd/v2 v2.3.1/go.mod h1:WsUAkMJMYww6l/ufffCD3m+P7LEvr8TnZn9lwVDlgzw= github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM= github.com/uber/jaeger-client-go v2.25.0+incompatible/go.mod h1:WVhlPFC8FDjOFMMWRy2pZqQJSXxYSwNYOkTr/Z6d3Kk= -github.com/uber/jaeger-client-go v2.28.0+incompatible/go.mod h1:WVhlPFC8FDjOFMMWRy2pZqQJSXxYSwNYOkTr/Z6d3Kk= github.com/uber/jaeger-client-go v2.30.0+incompatible h1:D6wyKGCecFaSRUpo8lCVbaOOb6ThwMmTEbhRwtKR97o= github.com/uber/jaeger-client-go v2.30.0+incompatible/go.mod h1:WVhlPFC8FDjOFMMWRy2pZqQJSXxYSwNYOkTr/Z6d3Kk= -github.com/uber/jaeger-lib v2.2.0+incompatible/go.mod h1:ComeNDZlWwrWnDv8aPp0Ba6+uUTzImX/AauajbLI56U= github.com/uber/jaeger-lib v2.4.0+incompatible/go.mod h1:ComeNDZlWwrWnDv8aPp0Ba6+uUTzImX/AauajbLI56U= github.com/uber/jaeger-lib v2.4.1+incompatible h1:td4jdvLcExb4cBISKIpHuGoVXh+dVKhn2Um6rjCsSsg= github.com/uber/jaeger-lib v2.4.1+incompatible/go.mod h1:ComeNDZlWwrWnDv8aPp0Ba6+uUTzImX/AauajbLI56U= @@ -2468,11 +2218,8 @@ github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGr github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0= github.com/ultraware/funlen v0.0.3/go.mod h1:Dp4UiAus7Wdb9KUZsYWZEWiRzGuM2kXM1lPbfaF6xhA= github.com/ultraware/whitespace v0.0.4/go.mod h1:aVMh/gQve5Maj9hQ/hg+F75lr/X5A89uZnzAmWSineA= -github.com/unrolled/secure v1.0.1/go.mod h1:R6rugAuzh4TQpbFAq69oqZggyBQxFRFQIewtz5z7Jsc= github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA= -github.com/urfave/cli v1.21.0/go.mod h1:lxDj6qX9Q6lWQxIrbrT0nwecwUtRnhVZAJjJZrVUZZQ= github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= -github.com/urfave/cli/v2 v2.2.0/go.mod h1:SE9GqnLQmjVa0iPEY0f1w3ygNIYcIJ0OKPMoW2caLfQ= github.com/urfave/cli/v2 v2.3.0/go.mod h1:LJmUH05zAU44vOAcrfzZQKsZbVcdbOG8rtL3/XcUArI= github.com/uudashr/gocognit v1.0.1/go.mod h1:j44Ayx2KW4+oB6SWMv8KsmHzZrOInQav7D3cQMJ5JUM= github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= @@ -2484,37 +2231,24 @@ github.com/vektah/gqlparser v1.1.2/go.mod h1:1ycwN7Ij5njmMkPPAOaRFY4rET2Enx7IkVv github.com/vektra/mockery v0.0.0-20181123154057-e78b021dcbb5/go.mod h1:ppEjwdhyy7Y31EnHRDm1JkChoC7LXIJ7Ex0VYLWtZtQ= github.com/vincent-petithory/dataurl v1.0.0 h1:cXw+kPto8NLuJtlMsI152irrVw9fRDX8AbShPRpg2CI= github.com/vincent-petithory/dataurl v1.0.0/go.mod h1:FHafX5vmDzyP+1CQATJn7WFKc9CvnvxyvZy6I1MrG/U= -github.com/vishvananda/netlink v0.0.0-20171020171820-b2de5d10e38e/go.mod h1:+SR5DhBJrl6ZM7CoCKvpw5BKroDKQ+PJqOg65H/2ktk= github.com/vishvananda/netlink v1.1.0/go.mod h1:cTgwzPIzzgDAYoQrMm0EdrjRUBkTqKYppBueQtXaqoE= github.com/vishvananda/netlink v1.1.1-0.20210330154013-f5de75959ad5 h1:+UB2BJA852UkGH42H+Oee69djmxS3ANzl2b/JtT1YiA= github.com/vishvananda/netlink v1.1.1-0.20210330154013-f5de75959ad5/go.mod h1:twkDnbuQxJYemMlGd4JFIcuhgX83tXhKS2B/PRMpOho= -github.com/vishvananda/netns v0.0.0-20180720170159-13995c7128cc/go.mod h1:ZjcWmFBXmLKZu9Nxj3WKYEafiSqer2rnvPr0en9UNpI= github.com/vishvananda/netns v0.0.0-20191106174202-0a2b9b5464df/go.mod h1:JP3t17pCcGlemwknint6hfoeCVQrEMVwxRLRjXpq+BU= github.com/vishvananda/netns v0.0.0-20200728191858-db3c7e526aae/go.mod h1:DD4vA1DwXk04H54A1oHXtwZmA0grkVMdPxx/VGLCah0= github.com/vishvananda/netns v0.0.0-20210104183010-2eb08e3e575f h1:p4VB7kIXpOQvVn1ZaTIVp+3vuYAXFe3OJEvjbUYJLaA= github.com/vishvananda/netns v0.0.0-20210104183010-2eb08e3e575f/go.mod h1:DD4vA1DwXk04H54A1oHXtwZmA0grkVMdPxx/VGLCah0= -github.com/vjeantet/grok v1.0.0/go.mod h1:/FWYEVYekkm+2VjcFmO9PufDU5FgXHUz9oy2EGqmQBo= github.com/vmihailenco/msgpack/v4 v4.3.12 h1:07s4sz9IReOgdikxLTKNbBdqDMLsjPKXwvCazn8G65U= github.com/vmihailenco/tagparser v0.1.2 h1:gnjoVuB/kljJ5wICEEOpx98oXMWPLj22G67Vbd1qPqc= github.com/vmware/go-vmware-nsxt v0.0.0-20220328155605-f49a14c1ef5f h1:NbC9yOr5At92seXK+kOr2TzU3mIWzcJOVzZasGSuwoU= github.com/vmware/go-vmware-nsxt v0.0.0-20220328155605-f49a14c1ef5f/go.mod h1:VEqcmf4Sp7gPB7z05QGyKVmn6xWppr7Nz8cVNvyC80o= -github.com/vmware/govmomi v0.19.0/go.mod h1:URlwyTFZX72RmxtxuaFL2Uj3fD1JTvZdx59bHWk6aFU= github.com/vmware/govmomi v0.29.0 h1:SHJQ7DUc4fltFZv16znJNGHR1/XhiDK5iKxm2OqwkuU= github.com/vmware/govmomi v0.29.0/go.mod h1:F7adsVewLNHsW/IIm7ziFURaXDaHEwcc+ym4r3INMdY= github.com/vultr/govultr/v2 v2.17.2 h1:gej/rwr91Puc/tgh+j33p/BLR16UrIPnSr+AIwYWZQs= github.com/vultr/govultr/v2 v2.17.2/go.mod h1:ZFOKGWmgjytfyjeyAdhQlSWwTjh2ig+X49cAp50dzXI= github.com/wadey/gocovmerge v0.0.0-20160331181800-b5bfa59ec0ad/go.mod h1:Hy8o65+MXnS6EwGElrSRjUzQDLXreJlzYLlWiHtt8hM= -github.com/wavefronthq/wavefront-sdk-go v0.9.2/go.mod h1:hQI6y8M9OtTCtc0xdwh+dCER4osxXdEAeCpacjpDZEU= github.com/wavefronthq/wavefront-sdk-go v0.11.0 h1:U9iJ4KFKebf4FB87z182DGiu1OXsRexv8DYCEj48HTA= github.com/wavefronthq/wavefront-sdk-go v0.11.0/go.mod h1:oKJ9Y0y36n+szFm2NiivXI+UubZe3lwfWnN1p+mFNDw= -github.com/weaveworks/common v0.0.0-20221201103051-7c2720a9024d h1:9Z/HiqeGN+LOnmotAMpFEQjuXZ4AGAVFG0rC1laP5Go= -github.com/weaveworks/common v0.0.0-20221201103051-7c2720a9024d/go.mod h1:Fnq3+U51tMkPRMC6Wr7zKGUeFFYX4YjNrNK50iU0fcE= -github.com/weaveworks/promrus v1.2.0 h1:jOLf6pe6/vss4qGHjXmGz4oDJQA+AOCqEL3FvvZGz7M= -github.com/weaveworks/promrus v1.2.0/go.mod h1:SaE82+OJ91yqjrE1rsvBWVzNZKcHYFtMUyS1+Ogs/KA= -github.com/willf/bitset v1.1.11 h1:N7Z7E9UvjW+sGsEl7k/SJrvY2reP1A07MrGuCjIOjRE= -github.com/willf/bloom v2.0.3+incompatible h1:QDacWdqcAUI1MPOwIQZRy9kOR7yxfyEmxX8Wdm2/JPA= -github.com/wvanbergen/kafka v0.0.0-20171203153745-e2edea948ddf/go.mod h1:nxx7XRXbR9ykhnC8lXqQyJS0rfvJGxKyKw/sT1YOttg= -github.com/wvanbergen/kazoo-go v0.0.0-20180202103751-f72d8611297a/go.mod h1:vQQATAGxVK20DC1rRubTJbZDDhhpA4QfU02pMdPxGO4= github.com/xdg-go/pbkdf2 v1.0.0 h1:Su7DPu48wXMwC3bs7MCNG+z4FhcyEuz5dlvchbq0B0c= github.com/xdg-go/pbkdf2 v1.0.0/go.mod h1:jrpuAogTd400dnrH08LKmI/xc1MbPOebTwRqcT5RDeI= github.com/xdg-go/scram v1.0.2/go.mod h1:1WAq6h33pAW+iRreB34OORO2Nf7qel3VV3fjBj+hCSs= @@ -2528,7 +2262,6 @@ github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c/go.mod h1:lB8K/P019DLNhe github.com/xdg/stringprep v0.0.0-20180714160509-73f8eece6fdc/go.mod h1:Jhud4/sHMO4oL310DaZAKk9ZaJ08SJfe+sJh0HrGL1Y= github.com/xdg/stringprep v1.0.0/go.mod h1:Jhud4/sHMO4oL310DaZAKk9ZaJ08SJfe+sJh0HrGL1Y= github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= -github.com/xlab/treeprint v1.1.0/go.mod h1:gj5Gd3gPdKtR1ikdDK6fnFLdmIS0X30kTTuNd/WEJu0= github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q= github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d h1:splanxYIlg+5LfHAM6xpdFEAYOk8iySO56hMFq6uLyA= github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d/go.mod h1:rHwXgn7JulP+udvsHwJoVG1YGAP6VLg4y9I5dyZdqmA= @@ -2537,9 +2270,7 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= -github.com/yuin/goldmark v1.4.1/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= -github.com/yuin/gopher-lua v0.0.0-20180630135845-46796da1b0b4/go.mod h1:aEV29XrmTYFr3CiRxZeGHpkvbwq+prZduBqMaascyCU= github.com/yuin/gopher-lua v0.0.0-20200816102855-ee81675732da/go.mod h1:E1AXubJBdNmFERAOucpDIxNzeGfLzg0mYh+UfMWdChA= github.com/yuin/gopher-lua v0.0.0-20220504180219-658193537a64 h1:5mLPGnFdSsevFRFc9q3yYbBkB6tsm4aCwwQV/j1JQAQ= github.com/yuin/gopher-lua v0.0.0-20220504180219-658193537a64/go.mod h1:GBR0iDaNXjAgGg9zfCvksxSRnQx76gclCIb7kdAd1Pw= @@ -2554,18 +2285,15 @@ go.etcd.io/bbolt v1.3.6/go.mod h1:qXsaaIqmgQH0T+OPdb99Bf+PKfBBQVAdyD6TY9G8XM4= go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738/go.mod h1:dnLIgRNXwCJa5e+c6mIZCrds/GIG4ncV9HhK5PX7jPg= go.etcd.io/etcd/api/v3 v3.5.0/go.mod h1:cbVKeC6lCfl7j/8jBhAK6aIYO9XOjdptoxU/nLQcPvs= go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A= -go.etcd.io/etcd/api/v3 v3.5.5 h1:BX4JIbQ7hl7+jL+g+2j5UAr0o1bctCm6/Ct+ArBGkf0= go.etcd.io/etcd/api/v3 v3.5.5/go.mod h1:KFtNaxGDw4Yx/BA4iPPwevUTAuqcsPxzyX8PHydchN8= go.etcd.io/etcd/client/pkg/v3 v3.5.0/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= -go.etcd.io/etcd/client/pkg/v3 v3.5.5 h1:9S0JUVvmrVl7wCF39iTQthdaaNIiAaQbmK75ogO6GU8= go.etcd.io/etcd/client/pkg/v3 v3.5.5/go.mod h1:ggrwbk069qxpKPq8/FKkQ3Xq9y39kbFR4LnKszpRXeQ= go.etcd.io/etcd/client/v2 v2.305.0/go.mod h1:h9puh54ZTgAKtEbut2oe9P4L/oqKCVB6xsXlzd7alYQ= go.etcd.io/etcd/client/v2 v2.305.4/go.mod h1:Ud+VUwIi9/uQHOMA+4ekToJ12lTxlv0zB/+DHwTGEbU= go.etcd.io/etcd/client/v2 v2.305.5/go.mod h1:zQjKllfqfBVyVStbt4FaosoX2iYd8fV/GRy/PbowgP4= go.etcd.io/etcd/client/v3 v3.5.0/go.mod h1:AIKXXVX/DQXtfTEqBryiLTUXwON+GuvO6Z7lLS/oTh0= go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= -go.etcd.io/etcd/client/v3 v3.5.5 h1:q++2WTJbUgpQu4B6hCuT7VkdwaTP7Qz6Daak3WzbrlI= go.etcd.io/etcd/client/v3 v3.5.5/go.mod h1:aApjR4WGlSumpnJ2kloS75h6aHUmAyaPLjHMxpc7E7c= go.mongodb.org/atlas v0.19.0 h1:gvezG9d0KsSDaExEdTtcGqZHRvvVazzuEcBUpBXxmlg= go.mongodb.org/atlas v0.19.0/go.mod h1:PFk1IGhiGjFXHGVspOK7i1U2nnPjK8wAjYwQf6FoVf4= @@ -2584,7 +2312,6 @@ go.opencensus.io v0.20.1/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk= go.opencensus.io v0.20.2/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk= go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= -go.opencensus.io v0.22.1/go.mod h1:Ap50jQcDJrx6rB6VgeeFPtuPIf3wMRvRfrfYDO6+BmA= 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= @@ -2594,60 +2321,45 @@ go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= go.opentelemetry.io/collector v0.57.2/go.mod h1:9TwWyMRhbFNzaaGLtm/6poWNDJw+etvQMS6Fy+8/8Xs= go.opentelemetry.io/collector v0.64.1/go.mod h1:RxdEKzwxTEhBAgzC4wzyJEwSFgjWU73CHnLjKUKQDyo= -go.opentelemetry.io/collector v0.65.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/component v0.65.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/consumer v0.65.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/exporter/loggingexporter v0.66.1-0.20221202005155-1c54042beb70 h1:/C637mgJY6I0l/KFLXmL9I1foefM53aob20WF2Yh/0Y= -go.opentelemetry.io/collector/exporter/loggingexporter v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:xxkHO5NrxffTV22dhCy3K8XZThGJ1ak7LZ1ctoiJp5k= -go.opentelemetry.io/collector/exporter/otlpexporter v0.66.1-0.20221202005155-1c54042beb70 h1:m9GPfziw/079Xt7/Pfby/5obJhtqR19WKkgQQ/VxNZo= -go.opentelemetry.io/collector/exporter/otlpexporter v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:bCD3trc7OqeEVCgyQdO3kwGgogZMjcMu2tX49SFv1lU= -go.opentelemetry.io/collector/exporter/otlphttpexporter v0.66.1-0.20221202005155-1c54042beb70 h1:7rDNCZS1qfqZxnCLaBWItnX/TweYKC6NyULpelzXl4g= -go.opentelemetry.io/collector/exporter/otlphttpexporter v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:vkFlRP0DDfDfSDVl96Gvy5Ah8L8sMcVAxMZn+0af2ew= -go.opentelemetry.io/collector/extension/ballastextension v0.66.1-0.20221202005155-1c54042beb70 h1:pSGZDMMURLRp7iSxeNlDNDxDgFQJqCYt+Fv7bZxC0JU= -go.opentelemetry.io/collector/extension/ballastextension v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:+YdyZisEXLDE8rhZE7Ce4wli0ZVE164SFN0qg2mPjDU= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/component v0.67.0 h1:GCBRZAqk4yNaT4L1uwlbbwophFHrxYccLZ4Uj1Ifs/M= +go.opentelemetry.io/collector/component v0.67.0/go.mod h1:Txa2lm9oe7xsGQN8u7GdUIrRpAHFIKsTO4Qi3/CSmKk= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/exporter/loggingexporter v0.67.0 h1:09dH5PKxcqKuvxzCVf/j+oEgDYC2LBTgDhaDxujdEO8= +go.opentelemetry.io/collector/exporter/loggingexporter v0.67.0/go.mod h1:8sHgDw0tYsBQTunEBZojJ/L43CyaKVPAvT6eqGlo7xo= +go.opentelemetry.io/collector/exporter/otlpexporter v0.67.0 h1:AxejzV7pxCQjdIsIBLQPbeub2SqbyAsu09TA1BG0jcs= +go.opentelemetry.io/collector/exporter/otlpexporter v0.67.0/go.mod h1:urludZR9ya0gUNf7JXzKL06gX2Anu4BDa6UfCvI61Hw= +go.opentelemetry.io/collector/exporter/otlphttpexporter v0.67.0 h1:B91LfbKa0Khqc8SX2aVd5D2g9aDpeCEJ+jDjNb894mA= +go.opentelemetry.io/collector/exporter/otlphttpexporter v0.67.0/go.mod h1:o7HgN765fAq2cuATsQF2BLhbXiFJ+fK0NIbfcmw2Pa8= +go.opentelemetry.io/collector/extension/ballastextension v0.67.0 h1:fqwrpnAZ/4B5Ghs3vkAZiBnW5b9ro8dbhNa1kw61IXA= +go.opentelemetry.io/collector/extension/ballastextension v0.67.0/go.mod h1:aLm/LXcYAfRW+VWPczi5DKgCcajYPve0Z+fcPLw0w3U= go.opentelemetry.io/collector/extension/zpagesextension v0.64.1/go.mod h1:XenhQAUbOHgqNq5YQ/vQIcDHRcPUaDgZQxDC2qoI4Bc= -go.opentelemetry.io/collector/extension/zpagesextension v0.65.0/go.mod h1:+IPas7AeffG0GMIXhZr8IzpTNhH1Ri/6S/9YFqbLsmQ= -go.opentelemetry.io/collector/extension/zpagesextension v0.66.0/go.mod h1:+IPas7AeffG0GMIXhZr8IzpTNhH1Ri/6S/9YFqbLsmQ= -go.opentelemetry.io/collector/extension/zpagesextension v0.66.1-0.20221202005155-1c54042beb70 h1:+vq59gRJpiAcUshBVxhqhc9aXOc/8Z5wuWlyng5Hfm4= -go.opentelemetry.io/collector/extension/zpagesextension v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tejEMB1pDXsmEeyg7UHB+S++4Lvgtki7N5CVWk5rI4A= -go.opentelemetry.io/collector/featuregate v0.65.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/extension/zpagesextension v0.67.0 h1:TRW8vZwE+/h2vJqqMDmyQO9X0sxcYCSXf5MyXozSLas= +go.opentelemetry.io/collector/extension/zpagesextension v0.67.0/go.mod h1:let/Bt3vTou1cVKhfv+z6FTSk3JaYV11z9C4O/PDPrA= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= go.opentelemetry.io/collector/pdata v0.56.0/go.mod h1:mYcCREWiIJyHss0dbU+GSiz2tmGZ6u09vtfkKTciog4= go.opentelemetry.io/collector/pdata v0.57.2/go.mod h1:RU9I8lwBUxucwOsSYzHEcHi15M9QaX78hgQ2PRdSxV0= go.opentelemetry.io/collector/pdata v0.64.1/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= -go.opentelemetry.io/collector/pdata v0.65.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= go.opentelemetry.io/collector/processor/batchprocessor v0.64.1/go.mod h1:qVl0+aYokPfiq5y+JVAvlII2rrUFBDEqqiDbTSnax78= -go.opentelemetry.io/collector/processor/batchprocessor v0.65.0/go.mod h1:XhGTsC1B/bq4gpg8IZ/QYBLXkzE4Gw3r7Xu2+ik8A1Q= -go.opentelemetry.io/collector/processor/batchprocessor v0.66.0/go.mod h1:XhGTsC1B/bq4gpg8IZ/QYBLXkzE4Gw3r7Xu2+ik8A1Q= -go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221202005155-1c54042beb70 h1:Y4e8NnVevonnAgmjX9Z7QIMA32yMqHAOnAlh8SzTS8c= -go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:Pi1CsKDQFoDrUP1i3+VdE6s2Xuji7bOGFBgqHK0J32E= -go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.66.1-0.20221202005155-1c54042beb70 h1:l0005D1ERsXKno9Ax5Gr2A8FaysF7n40yer6r5qAMHQ= -go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:9CBysimj8fH0weF6Wu8S8nW7cG/XRanrMU1BWlIXeN4= +go.opentelemetry.io/collector/processor/batchprocessor v0.67.0 h1:Qn4Ytth3q1trwTSAYYTzIRs4SBh9rz0xBou1nZB+Dko= +go.opentelemetry.io/collector/processor/batchprocessor v0.67.0/go.mod h1:+ZXCkUG9tlwbbVLi+PT9DjQ7vz+lfFSQqvW45snLYno= +go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.67.0 h1:m3GK5/lZIznGFzzvSPuQo5jxvEn43efv4VkvPtZwDI8= +go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.67.0/go.mod h1:YYjx8ouKYP6AZJ4f4PQPo8cuzcE8n4atn7gOoB890FQ= go.opentelemetry.io/collector/receiver/otlpreceiver v0.64.1/go.mod h1:4rwNi9SeCKBP9XGLWNRFKPsWUV5NK4iqMvdj2WRMksQ= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.66.1-0.20221202005155-1c54042beb70 h1:KBbbPVDV7o5w857g6ePphdu4MV87jrcQevFYDA1okUk= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:0Py8RNjNiFRH6/F+vM2uptdaw9hMj1FBdv0ySntM2gE= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.67.0 h1:pMluLYSSAH7n8zkPWYkWGY/pALrVxG9rHX8J/WDrcx0= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.67.0/go.mod h1:GIJc0eu4N2oJB420N3NhSFJ1IhAgCwvlTCMGWxKhXgg= go.opentelemetry.io/collector/semconv v0.56.0/go.mod h1:EH1wbDvTyqKpKBBpoMIe0KQk2plCcFS66Mo17WtR7CQ= go.opentelemetry.io/collector/semconv v0.57.2/go.mod h1:84YnUjmm+nhGu4YTDLnHCbxnL74ooWpismPG79tFD7w= go.opentelemetry.io/collector/semconv v0.64.1/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= -go.opentelemetry.io/collector/semconv v0.65.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= -go.opentelemetry.io/collector/semconv v0.66.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 h1:Q5L9Urod3c8as6ZYaoaqBjarx/HXxsxy34DFZIU2fO4= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector/semconv v0.67.0 h1:zLAvcQa6Kgow52FFLrmk7/9ZVtEYyA73+xDtCcFG78Q= +go.opentelemetry.io/collector/semconv v0.67.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.33.0/go.mod h1:y/SlJpJQPd2UzfBCj0E9Flk9FDCtTyqUmaCB41qFrWI= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4 h1:PRXhsszxTt5bbPriTjmaweWUsAnJYeWBhUMLRetUgBU= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4/go.mod h1:05eWWy6ZWzmpeImD3UowLTB3VjDMU1yxQ+ENuVWDM3c= @@ -2659,53 +2371,31 @@ go.opentelemetry.io/contrib/propagators/b3 v1.11.1/go.mod h1:ECIveyMXgnl4gorxFcA go.opentelemetry.io/contrib/zpages v0.33.0/go.mod h1:ddmD63NkBVE29GucaBBCR8/b/TRlY+PkpIbF3m2JF7Y= go.opentelemetry.io/contrib/zpages v0.36.4 h1:Z2VK5WsDhWs9VwZ1p0TM5RyusTOgAQfdMMDDQPRnlmY= go.opentelemetry.io/contrib/zpages v0.36.4/go.mod h1:h1gnOu0cOfDGEncNgLsjQ5H/9eAzt9LXsa1WvH7I5KU= -go.opentelemetry.io/otel v1.0.0-RC1/go.mod h1:x9tRa9HK4hSSq7jf2TKbqFbtt58/TGk0f9XiEYISI1I= -go.opentelemetry.io/otel v1.0.0-RC3/go.mod h1:Ka5j3ua8tZs4Rkq4Ex3hwgBgOchyPVq5S6P2lz//nKQ= go.opentelemetry.io/otel v1.8.0/go.mod h1:2pkj+iMj0o03Y+cW6/m8Y4WkRdYN3AvCXCnzRMp9yvM= go.opentelemetry.io/otel v1.9.0/go.mod h1:np4EoPGzoPs3O67xUVNoPPcmSvsfOxNlNA4F4AC+0Eo= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= -go.opentelemetry.io/otel/exporters/otlp/otlpmetric v0.22.0/go.mod h1:gIp6+vQxqmh6Vd/mucqnsaFpOuVycQAS/BBXMKzJk0w= -go.opentelemetry.io/otel/exporters/otlp/otlpmetric v0.23.0/go.mod h1:pe9oOWRaZyapdajWCn64fnl76v3cmTEmNBgh7MkKvwE= -go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v0.23.0/go.mod h1:aSP5oMNaAfOYq+sRydHANZ0vBYLyZR/3lR9pru9aPLk= -go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v0.22.0/go.mod h1:FX3Hvv/Hwb4WtlrAvco4QCsfxsaqg/UoYA6WFCnT1Ro= go.opentelemetry.io/otel/exporters/prometheus v0.31.0/go.mod h1:QarXIB8L79IwIPoNgG3A6zNvBgVmcppeFogV1d8612s= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= go.opentelemetry.io/otel/exporters/prometheus v0.33.0/go.mod h1:ZSmYfKdYWEdSDBB4njLBIwTf4AU2JNsH3n2quVQDebI= -go.opentelemetry.io/otel/internal/metric v0.22.0/go.mod h1:7qVuMihW/ktMonEfOvBXuh6tfMvvEyoIDgeJNRloYbQ= -go.opentelemetry.io/otel/internal/metric v0.23.0/go.mod h1:z+RPiDJe30YnCrOhFGivwBS+DU1JU/PiLKkk4re2DNY= -go.opentelemetry.io/otel/metric v0.22.0/go.mod h1:KcsUkBiYGW003DJ+ugd2aqIRIfjabD9jeOUXqsAtrq0= -go.opentelemetry.io/otel/metric v0.23.0/go.mod h1:G/Nn9InyNnIv7J6YVkQfpc0JCfKBNJaERBGw08nqmVQ= go.opentelemetry.io/otel/metric v0.31.0/go.mod h1:ohmwj9KTSIeBnDBm/ZwH2PSZxZzoOaG2xZeekTRzL5A= go.opentelemetry.io/otel/metric v0.33.0 h1:xQAyl7uGEYvrLAiV/09iTJlp1pZnQ9Wl793qbVvED1E= go.opentelemetry.io/otel/metric v0.33.0/go.mod h1:QlTYc+EnYNq/M2mNk1qDDMRLpqCOj2f/r5c7Fd5FYaI= -go.opentelemetry.io/otel/oteltest v1.0.0-RC1/go.mod h1:+eoIG0gdEOaPNftuy1YScLr1Gb4mL/9lpDkZ0JjMRq4= -go.opentelemetry.io/otel/sdk v1.0.0-RC1/go.mod h1:kj6yPn7Pgt5ByRuwesbaWcRLA+V7BSDg3Hf8xRvsvf8= -go.opentelemetry.io/otel/sdk v1.0.0-RC3/go.mod h1:78H6hyg2fka0NYT9fqGuFLvly2yCxiBXDJAgLKo/2Us= go.opentelemetry.io/otel/sdk v1.8.0/go.mod h1:uPSfc+yfDH2StDM/Rm35WE8gXSNdvCg023J6HeGNO0c= go.opentelemetry.io/otel/sdk v1.11.1 h1:F7KmQgoHljhUuJyA+9BiU+EkJfyX5nVVF4wyzWZpKxs= go.opentelemetry.io/otel/sdk v1.11.1/go.mod h1:/l3FE4SupHJ12TduVjUkZtlfFqDCQJlOlithYrdktys= -go.opentelemetry.io/otel/sdk/export/metric v0.22.0/go.mod h1:a14rf2CiHSn9xjB6cHuv0HoZGl5C4w2PAgl+Lja1VzU= -go.opentelemetry.io/otel/sdk/export/metric v0.23.0/go.mod h1:SuMiREmKVRIwFKq73zvGTvwFpxb/ZAYkMfyqMoOtDqs= -go.opentelemetry.io/otel/sdk/metric v0.22.0/go.mod h1:LzkI0G0z6KhEagqmzgk3bw/dglE2Tk2OXs455UMcI0s= -go.opentelemetry.io/otel/sdk/metric v0.23.0/go.mod h1:wa0sKK13eeIFW+0OFjcC3S1i7FTRRiLAXe1kjBVbhwg= go.opentelemetry.io/otel/sdk/metric v0.31.0/go.mod h1:fl0SmNnX9mN9xgU6OLYLMBMrNAsaZQi7qBwprwO3abk= go.opentelemetry.io/otel/sdk/metric v0.33.0 h1:oTqyWfksgKoJmbrs2q7O7ahkJzt+Ipekihf8vhpa9qo= go.opentelemetry.io/otel/sdk/metric v0.33.0/go.mod h1:xdypMeA21JBOvjjzDUtD0kzIcHO/SPez+a8HOzJPGp0= -go.opentelemetry.io/otel/trace v1.0.0-RC1/go.mod h1:86UHmyHWFEtWjfWPSbu0+d0Pf9Q6e1U+3ViBOc+NXAg= -go.opentelemetry.io/otel/trace v1.0.0-RC3/go.mod h1:VUt2TUYd8S2/ZRX09ZDFZQwn2RqfMB5MzO17jBojGxo= go.opentelemetry.io/otel/trace v1.8.0/go.mod h1:0Bt3PXY8w+3pheS3hQUt+wow8b1ojPaTBoTCh2zIFI4= go.opentelemetry.io/otel/trace v1.9.0/go.mod h1:2737Q0MuG8q1uILYm2YYVkAyLtOofiTNGg6VODnOiPo= go.opentelemetry.io/otel/trace v1.11.1 h1:ofxdnzsNrGBYXbP7t7zpUK281+go5rF7dvdIZXF8gdQ= go.opentelemetry.io/otel/trace v1.11.1/go.mod h1:f/Q9G7vzk5u91PhbmKbg1Qn0rzH1LJ4vbPHFGkTPtOk= 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.15.0/go.mod h1:H7XAot3MsfNsj7EXtrA2q5xSNQ10UqI405h3+duxN4U= -go.starlark.net v0.0.0-20200901195727-6e684ef5eeee/go.mod h1:f0znQkUKRrkk36XxWbGjMqQM8wGv/xHBVE2qc3B5oFU= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= -go.uber.org/atomic v1.5.1/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= @@ -2737,18 +2427,12 @@ go.uber.org/zap v1.22.0/go.mod h1:H4siCOZOrAolnUPJEkfaSjDqyP+BDS0DdDWzwcgt3+U= go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= -go4.org/intern v0.0.0-20211027215823-ae77deb06f29 h1:UXLjNohABv4S58tHmeuIZDO6e3mHpW2Dx33gaNt03LE= -go4.org/intern v0.0.0-20211027215823-ae77deb06f29/go.mod h1:cS2ma+47FKrLPdXFpr7CuxiTW3eyJbWew4qx0qtQWDA= -go4.org/unsafe/assume-no-moving-gc v0.0.0-20211027215541-db492cf91b37/go.mod h1:FftLjUGFEDu5k8lt0ddY+HcrH/qU/0qk+H8j9/nTl3E= -go4.org/unsafe/assume-no-moving-gc v0.0.0-20220617031537-928513b29760 h1:FyBZqvoA/jbNzuAWLQE2kG820zMAkcilx6BMjGbL/E4= -go4.org/unsafe/assume-no-moving-gc v0.0.0-20220617031537-928513b29760/go.mod h1:FftLjUGFEDu5k8lt0ddY+HcrH/qU/0qk+H8j9/nTl3E= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190228161510-8dd112bcdc25/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190320223903-b7391e95e576/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190404164418-38d8ce5564a5/go.mod h1:WFFai1msRO1wXaEeE5yQxYXgSfI8pQAWXbQop6sCtWE= golang.org/x/crypto v0.0.0-20190411191339-88737f569e3a/go.mod h1:WFFai1msRO1wXaEeE5yQxYXgSfI8pQAWXbQop6sCtWE= golang.org/x/crypto v0.0.0-20190422162423-af44ce270edf/go.mod h1:WFFai1msRO1wXaEeE5yQxYXgSfI8pQAWXbQop6sCtWE= @@ -2760,16 +2444,12 @@ golang.org/x/crypto v0.0.0-20190617133340-57b3e21c3d56/go.mod h1:yigFU9vqHzYiE8U golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/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-20191002192127-34f69633bfdc/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20200204104054-c9f3fb736b72/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200323165209-0ec3e9974c59/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20200414173820-0848c9571904/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200510223506-06a226fb4e37/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20201112155050-0c6587e931a9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= @@ -2791,7 +2471,6 @@ golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4/go.mod h1:IxCIyHEi3zRg3s0 golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= -golang.org/x/crypto v0.0.0-20221012134737-56aed061732a/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.3.0 h1:a06MkbcxBrEFc0w0QIZWXrH/9cCX6KJyWbBOIwAn+7A= golang.org/x/crypto v0.3.0/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4= golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= @@ -2820,7 +2499,6 @@ golang.org/x/image v0.0.0-20200430140353-33d19683fad8/go.mod h1:FeLwcggjj3mMvU+o golang.org/x/image v0.0.0-20200618115811-c13761719519/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= golang.org/x/image v0.0.0-20201208152932-35266b937fa6/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= golang.org/x/image v0.0.0-20210216034530-4410531fe030/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= -golang.org/x/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= 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= @@ -2847,18 +2525,15 @@ golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.5.0/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro= -golang.org/x/mod v0.5.1/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= golang.org/x/mod v0.7.0 h1:LapD9S96VoQRhi/GrNTqeBJFrUjs5UHCAtTlgwA5oZA= golang.org/x/mod v0.7.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= -golang.org/x/net v0.0.0-20170114055629-f2499483f923/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180530234432-1e491301e022/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181005035420-146acd28ed58/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20181106065722-10aee1819953/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -2881,9 +2556,6 @@ golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLL golang.org/x/net v0.0.0-20190921015927-1a5e07d1ff72/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20191002035440-2ec189313ef0/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20191003171128-d98b1b443823/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20191004110552-13f9640d40b9/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20191007182048-72f939374954/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20191112182307-2180aed22343/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= @@ -2903,7 +2575,6 @@ golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81R golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20200813134508-3edf25e44fcc/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= -golang.org/x/net v0.0.0-20200904194848-62affa334b73/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20201010224723-4f7140c49acb/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= @@ -2920,7 +2591,6 @@ golang.org/x/net v0.0.0-20210410081132-afb366fc7cd1/go.mod h1:9tjilg8BloeKEkVJvy golang.org/x/net v0.0.0-20210421230115-4e50805a0758/go.mod h1:72T/g9IO56b78aLF+1Kcs5dz7/ng1VjMUvfKvpfy+jM= golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk= golang.org/x/net v0.0.0-20210503060351-7fd8e65b6420/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20210510120150-4163338589ed/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= 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= @@ -2928,7 +2598,6 @@ golang.org/x/net v0.0.0-20210726213435-c6fcb2dbf985/go.mod h1:9nx3DQGgdP8bBQD5qx 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-20210917221730-978cfadd31cf/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20211216030914-fe4d6282115f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= @@ -2996,7 +2665,6 @@ golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20220929204114-8fcdb60fdcc0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o= golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sys v0.0.0-20170830134202-bb24a47a89ea/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= 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= @@ -3014,7 +2682,6 @@ golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5h golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190321052220-f7bb7a8bee54/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190411185658-b44545bcd369/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190419153524-e8e3143a4f4a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -3029,7 +2696,6 @@ golang.org/x/sys v0.0.0-20190626150813-e07cf5db2756/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20190626221950-04f50cda93cb/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190712062909-fae7ac547cb7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190804053845-51ab0e2deafa/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -3037,7 +2703,6 @@ golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7w 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-20191003212358-c178f38b412c/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-20191010194322-b09406accb47/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -3073,7 +2738,6 @@ golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200728102440-3e129f6d46b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200814200057-3d37ad5750ed/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200826173525-f9321e4c35a6/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200923182605-d9f96fdee20d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -3110,15 +2774,12 @@ golang.org/x/sys v0.0.0-20210816074244-15123e1e1f71/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20210816183151-1e6c022a8912/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210819135213-f52c844e1c1c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210902050250-f475640dd07b/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-20210908233432-aa78b53d3365/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210917161153-d61c044b1678/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/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-20211102061401-a2f17f7b995c/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-20211124211545-fe61309f8881/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211210111614-af8b64212486/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -3156,7 +2817,6 @@ golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuX golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.3.0 h1:qoo4akIqOcDME5bhc/NgxUdovd6BSS2uMsVjB56q1xI= golang.org/x/term v0.3.0/go.mod h1:q750SLmJuPmVoN1blW3UFBPREJfb1KmY3vwxfr+nFDA= -golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= 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= @@ -3176,7 +2836,6 @@ golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxb 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.0.0-20200416051211-89c76fbcd5d1/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/time v0.0.0-20201208040808-7e3f01d25324/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20220609170525-579cf78fd858/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= @@ -3186,7 +2845,6 @@ golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGm golang.org/x/tools v0.0.0-20180525024113-a5b4c53f6e8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20181011042414-1f849cf54d09/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20181112210238-4b1f3b6b1646/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190110163146-51295c7ec13a/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= @@ -3248,7 +2906,6 @@ golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod h1:TB2adYChydJhpapK 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-20200317043434-63da46f3035e/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8= golang.org/x/tools v0.0.0-20200324003944-a576cf524670/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8= golang.org/x/tools v0.0.0-20200329025819-fd4102a86c65/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8= golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8= @@ -3298,7 +2955,6 @@ 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.6-0.20210726203631-07bc1bf47fb2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= -golang.org/x/tools v0.1.9/go.mod h1:nABZi5QlRsZVlzPpHl034qft6wpY4eDcsTt5AaioBiU= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= golang.org/x/tools v0.2.0 h1:G6AHpWxTMGY1KyEYoAQ5WTtIekUUvDNjan3ugu60JvE= golang.org/x/tools v0.2.0/go.mod h1:y4OqIKeOV/fWJetJ8bXPU1sEVniLMIyDAZWeHdV+NTA= @@ -3313,11 +2969,7 @@ golang.org/x/xerrors v0.0.0-20220517211312-f3a8303e98df/go.mod h1:K8+ghG5WaK9qNq golang.org/x/xerrors v0.0.0-20220609144429-65e65417b02f/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8= golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 h1:H2TDz8ibqkAF6YGhCdN3jS9O0/s90v0rJh3X/OLHEUk= golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8= -golang.zx2c4.com/wireguard v0.0.20200121/go.mod h1:P2HsVp8SKwZEufsnezXZA4GRX/T49/HlU7DGuelXsU4= -golang.zx2c4.com/wireguard/wgctrl v0.0.0-20200205215550-e35592f146e4/go.mod h1:UdS9frhv65KTfwxME1xE8+rHYoFpbm36gOud1GhBe9c= gonum.org/v1/gonum v0.0.0-20180816165407-929014505bf4/go.mod h1:Y+Yx5eoAFn32cQvJDxZx5Dpnq+c3wtXuadVZAcxbbBo= -gonum.org/v1/gonum v0.0.0-20190502212712-4a2eb0188cbc/go.mod h1:2ltnJ7xHfj0zHS40VVPYEAAMTa3ZGguvHGBSJeRWqE0= -gonum.org/v1/gonum v0.6.2/go.mod h1:9mxDZsDKxgMAuccQkewq682L+0eCu4dCN2yonUJTCLU= 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.12.0 h1:xKuo6hzt+gMav00meVPUlXwSdoEJP46BR+wdxQEFK2o= @@ -3391,16 +3043,13 @@ google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCID 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-20170818010345-ee236bd376b0/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= -google.golang.org/genproto v0.0.0-20180518175338-11a468237815/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= -google.golang.org/genproto v0.0.0-20181221175505-bd9b4fb69e2f/go.mod h1:7Ep/1NZk928CDR8SjdVbjWNpdIf6nzjE3BTgJDr2Atg= 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-20190530194941-fb225487d101/go.mod h1:z3L6/3dTEVtUr6QSP8miRzeRqwQOioJ9I66odjN4I7s= -google.golang.org/genproto v0.0.0-20190716160619-c506a9f90610/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= 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= @@ -3417,7 +3066,6 @@ google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63/go.mod h1:55QSHmfG 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-20200317114155-1f3552e48f24/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= @@ -3428,7 +3076,6 @@ google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEY 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-20200806141610-86f49bd18e98/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= @@ -3515,9 +3162,7 @@ google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c/go.mod h1:CGI5F/G+ google.golang.org/genproto v0.0.0-20221206210731-b1a01be3a5f6 h1:AGXp12e/9rItf6/4QymU7WsAUwCf+ICW75cuR91nJIc= google.golang.org/genproto v0.0.0-20221206210731-b1a01be3a5f6/go.mod h1:1dOng4TWOomJrDGhpXjfCD35wQC6jnC7HpRmOFRqEV0= google.golang.org/grpc v1.8.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= -google.golang.org/grpc v1.12.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= google.golang.org/grpc v1.14.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= -google.golang.org/grpc v1.16.0/go.mod h1:0JHn/cJsOMiMfNA9+DeHDlAU7KAAB5GDlYFpa9MZMio= google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.0/go.mod h1:chYK+tFQF0nDUGJgXMSgLCQk3phJEuONr2DCgLDdAQM= @@ -3565,7 +3210,6 @@ google.golang.org/grpc v1.50.1/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCD google.golang.org/grpc v1.51.0 h1:E1eGv1FTqoLIdnBCZufiSHgKjlqG6fKFf6pPWtMTh8U= google.golang.org/grpc v1.51.0/go.mod h1:wgNDFcnuBGmxLKI/qn4T+m5BtEBYXJPvibbUPsAIPww= google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw= -google.golang.org/grpc/examples v0.0.0-20210916203835-567da6b86340/go.mod h1:gID3PKrg7pWKntu9Ss6zTLJ0ttC0X9IHgREOCZwbCVU= 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= @@ -3584,7 +3228,6 @@ google.golang.org/protobuf v1.28.1 h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175 google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d/go.mod h1:cuepJuh7vyXfUyUwEgHQXw849cJrilpS5NeIjOWESAw= -gopkg.in/caio/go-tdigest.v2 v2.3.0/go.mod h1:HPfh/CLN8UWDMOC76lqxVeKa5E24ypoVuTj4BLMb9cU= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= @@ -3595,18 +3238,13 @@ gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntN gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= gopkg.in/cheggaaa/pb.v1 v1.0.25/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qStrOgw= gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= -gopkg.in/fatih/pool.v2 v2.0.0/go.mod h1:8xVGeu1/2jr2wm5V9SPuMht2H5AEmf5aFMGSQixtjTY= gopkg.in/fsnotify.v1 v1.2.1/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= -gopkg.in/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4= gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= -gopkg.in/fsnotify/fsnotify.v1 v1.4.7 h1:XNNYLJHt73EyYiCZi6+xjupS9CpvmiDgjPTAjrBlQbo= gopkg.in/fsnotify/fsnotify.v1 v1.4.7/go.mod h1:Fyux9zXlo4rWoMSIzpn9fDAYjalPqJ/K1qJ27s+7ltE= gopkg.in/gcfg.v1 v1.2.3/go.mod h1:yesOnuUOFQAhST5vPY4nbZsb/huCgGGXlipJsBn0b3o= -gopkg.in/gorethink/gorethink.v3 v3.0.5/go.mod h1:+3yIIHJUGMBK+wyPH+iN5TP+88ikFDfZdqTlK3Y9q8I= gopkg.in/inconshreveable/log15.v2 v2.0.0-20180818164646-67afb5ed74ec/go.mod h1:aPpfJ7XW+gOuirDoZ8gHhLh3kZ1B08FtV2bbmy7Jv3s= gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc= gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= -gopkg.in/ini.v1 v1.42.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/ini.v1 v1.51.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/ini.v1 v1.52.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/ini.v1 v1.57.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= @@ -3618,20 +3256,15 @@ gopkg.in/jcmturner/aescts.v1 v1.0.1/go.mod h1:nsR8qBOg+OucoIW+WMhB3GspUQXq9XorLn gopkg.in/jcmturner/dnsutils.v1 v1.0.1/go.mod h1:m3v+5svpVOhtFAP/wSz+yzh4Mc0Fg7eRhxkJMWSIz9Q= gopkg.in/jcmturner/goidentity.v3 v3.0.0/go.mod h1:oG2kH0IvSYNIu80dVAyu/yoefjq1mNfM5bm88whjWx4= gopkg.in/jcmturner/gokrb5.v7 v7.2.3/go.mod h1:l8VISx+WGYp+Fp7KRbsiUuXTTOnxIc3Tuvyavf11/WM= -gopkg.in/jcmturner/gokrb5.v7 v7.5.0/go.mod h1:l8VISx+WGYp+Fp7KRbsiUuXTTOnxIc3Tuvyavf11/WM= gopkg.in/jcmturner/rpc.v1 v1.1.0/go.mod h1:YIdkC4XfD6GXbzje11McwsDuOlZQSb9W4vfLvuNnlv8= -gopkg.in/ldap.v3 v3.1.0/go.mod h1:dQjCc0R0kfyFjIlWNMH1DORwUASZyDxo2Ry1B51dXaQ= -gopkg.in/mgo.v2 v2.0.0-20180705113604-9856a29383ce/go.mod h1:yeKp02qBN3iKW1OzL3MGk2IdtZzaj7SFntXj72NppTA= gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22/go.mod h1:yeKp02qBN3iKW1OzL3MGk2IdtZzaj7SFntXj72NppTA= gopkg.in/natefinch/lumberjack.v2 v2.0.0 h1:1Lc07Kr7qY4U2YPouBjpCLxpiyxIVoxqXgkXLknAOE8= gopkg.in/natefinch/lumberjack.v2 v2.0.0/go.mod h1:l0ndWWf7gzL7RNwBG7wST/UCcT4T24xpD6X8LsfU/+k= -gopkg.in/olivere/elastic.v5 v5.0.70/go.mod h1:FylZT6jQWtfHsicejzOm3jIMVPOAksa80i3o+6qtQRk= gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= gopkg.in/square/go-jose.v2 v2.3.1/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI= gopkg.in/square/go-jose.v2 v2.4.1/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI= gopkg.in/square/go-jose.v2 v2.5.1 h1:7odma5RETjNHWJnR32wx8t+Io4djHE1PqxCFx3iiZ2w= gopkg.in/square/go-jose.v2 v2.5.1/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI= -gopkg.in/telebot.v3 v3.0.0/go.mod h1:7rExV8/0mDDNu9epSrDm/8j22KLaActH1Tbee6YjzWg= gopkg.in/tomb.v1 v1.0.0-20140529071818-c131134a1947/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= @@ -3655,11 +3288,8 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/zorkian/go-datadog-api.v2 v2.30.0 h1:umQdVO0Ytx+kYadhuJNjFtDgIsIEBnKrOTvNuu8ClKI= gopkg.in/zorkian/go-datadog-api.v2 v2.30.0/go.mod h1:kx0CSMRpzEZfx/nFH62GLU4stZjparh/BRpM89t4XCQ= -gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo= -gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw= gotest.tools/v3 v3.0.2/go.mod h1:3SzNCllyD9/Y+b5r9JIKQ474KzkZyqLqEfYqMsX94Bk= gotest.tools/v3 v3.2.0 h1:I0DwBVMGAx26dttAj1BtJLAkVGncrkkUXfJLC4Flt/I= -honnef.co/go/netdb v0.0.0-20150201073656-a416d700ae39/go.mod h1:rbNo0ST5hSazCG4rGfpHrwnwvzP1QX62WbhzD+ghGzs= honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= 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= @@ -3670,12 +3300,9 @@ honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9 honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= honnef.co/go/tools v0.1.1/go.mod h1:NgwopIslSNH47DimFoV78dnkksY2EFtX0ajyb3K/las= honnef.co/go/tools v0.1.2/go.mod h1:NgwopIslSNH47DimFoV78dnkksY2EFtX0ajyb3K/las= -inet.af/netaddr v0.0.0-20211027220019-c74959edd3b6 h1:acCzuUSQ79tGsM/O50VRFySfMm19IoMKL+sZztZkCxw= -inet.af/netaddr v0.0.0-20211027220019-c74959edd3b6/go.mod h1:y3MGhcFMlh0KZPMuXXow8mpjxxAk3yoDNsp4cQz54i8= k8s.io/api v0.21.1/go.mod h1:FstGROTmsSHBarKc8bylzXih8BLNYTiS3TZcsoEDg2s= k8s.io/api v0.25.4 h1:3YO8J4RtmG7elEgaWMb4HgmpS2CfY1QlaOz9nwB+ZSs= k8s.io/api v0.25.4/go.mod h1:IG2+RzyPQLllQxnhzD8KQNEu4c4YvyDTpSMztf4A0OQ= -k8s.io/apimachinery v0.17.1/go.mod h1:b9qmWdKlLuU9EBh+06BtLcSf/Mu89rWL33naRxs1uZg= k8s.io/apimachinery v0.21.1/go.mod h1:jbreFvJo3ov9rj7eWT7+sYiRx+qZuCYXwWT1bcDswPY= k8s.io/apimachinery v0.25.4 h1:CtXsuaitMESSu339tfhVXhQrPET+EiWnIY1rcurKnAc= k8s.io/apimachinery v0.25.4/go.mod h1:jaF9C/iPNM1FuLl7Zuy5b9v+n35HGSh6AQ4HYRkCqwo= @@ -3683,10 +3310,8 @@ k8s.io/client-go v0.21.1/go.mod h1:/kEw4RgW+3xnBGzvp9IWxKSNA+lXn3A7AuH3gdOAzLs= k8s.io/client-go v0.25.4 h1:3RNRDffAkNU56M/a7gUfXaEzdhZlYhoW8dgViGy5fn8= k8s.io/client-go v0.25.4/go.mod h1:8trHCAC83XKY0wsBIpbirZU4NTUpbuhc2JnI7OruGZw= k8s.io/code-generator v0.21.1/go.mod h1:hUlps5+9QaTrKx+jiM4rmq7YmH8wPOIko64uZCHDh6Q= -k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= 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 v0.0.0-20181102134211-b9b56d5dfc92/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk= k8s.io/klog v1.0.0 h1:Pt+yjF5aB1xDSVbau4VsWe+dQNzA0qv1LlXdC2dF6Q8= k8s.io/klog v1.0.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I= k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE= @@ -3694,7 +3319,6 @@ 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 h1:atnLQ121W371wYYFawwYx1aEY2eUfs4l3J72wtgAwV4= k8s.io/klog/v2 v2.80.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= -k8s.io/kube-openapi v0.0.0-20191107075043-30be4d16710a/go.mod h1:1TqjTSzOxsLGIKfj0lK8EeCP7K1iUG65v09OM0/WG5E= k8s.io/kube-openapi v0.0.0-20210305001622-591a79e4bda7/go.mod h1:wXW5VT87nVfh/iLV8FpR2uDvrFyomxbtb1KivDbvPTE= k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1 h1:MQ8BAZPZlWk3S9K4a9NCkIFQtZShWqoha7snGixVgEA= k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1/go.mod h1:C/N6wCaBHeBHkHUesQOQy2/MZqGgMAFPqGsGQLdbZBU= @@ -3704,24 +3328,16 @@ k8s.io/utils v0.0.0-20201110183641-67b214c5f920/go.mod h1:jPW/WVKK9YHAvNhRxK0md/ k8s.io/utils v0.0.0-20211116205334-6203023598ed/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed h1:jAne/RjBTyawwAy0utX5eqigAwz/lQhTmy+Hr/Cpue4= k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= -modernc.org/httpfs v1.0.0/go.mod h1:BSkfoMUcahSijQD5J/Vu4UMOxzmEf5SNRwyXC4PJBEw= -modernc.org/libc v1.3.1/go.mod h1:f8sp9GAfEyGYh3lsRIKtBh/XwACdFvGznxm6GJmQvXk= -modernc.org/mathutil v1.1.1/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E= -modernc.org/memory v1.0.1/go.mod h1:NSjvC08+g3MLOpcAxQbdctcThAEX4YlJ20WWHYEhvRg= -modernc.org/sqlite v1.7.4/go.mod h1:xse4RHCm8Fzw0COf5SJqAyiDrVeDwAQthAS1V/woNIA= -modernc.org/tcl v1.4.1/go.mod h1:8YCvzidU9SIwkz7RZwlCWK61mhV8X9UwfkRDRp7y5e0= mvdan.cc/gofumpt v0.1.0/go.mod h1:yXG1r1WqZVKWbVRtBWKWX9+CxGYfA51nSomhM0woR48= mvdan.cc/interfacer v0.0.0-20180901003855-c20040233aed/go.mod h1:Xkxe497xwlCKkIaQYRfC7CSLworTXY9RMqwhhCm+8Nc= mvdan.cc/lint v0.0.0-20170908181259-adc824a0674b/go.mod h1:2odslEg/xrtNQqCYg2/jCoyKnw3vv5biOc3JnIcYfL4= mvdan.cc/unparam v0.0.0-20210104141923-aac4ce9116a7/go.mod h1:hBpJkZE8H/sb+VRFvw2+rBpHNsTBcvSpk61hr8mzXZE= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= -rsc.io/goversion v1.2.0/go.mod h1:Eih9y/uIBS3ulggl7KNJ09xGSLcuNaLgmvvqa07sgfo= rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4= 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/json v0.0.0-20220713155537-f223a00ba0e2 h1:iXTIw73aPyC+oRdyqqvVJuloN1p0AC/kzH07hu3NE+k= sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0= -sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e/go.mod h1:wWxsB5ozmmv/SG7nM11ayaAW51xMvak/t1r0CSlcokI= sigs.k8s.io/structured-merge-diff/v4 v4.0.2/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw= sigs.k8s.io/structured-merge-diff/v4 v4.1.0/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw= sigs.k8s.io/structured-merge-diff/v4 v4.2.3 h1:PRbqxJClWWYMNV1dhaG4NsibJbArud9kFxnAMREiWFE= diff --git a/internal/aws/containerinsight/go.mod b/internal/aws/containerinsight/go.mod index 29767e9e2d7bb..1fdd0912c46e2 100644 --- a/internal/aws/containerinsight/go.mod +++ b/internal/aws/containerinsight/go.mod @@ -4,7 +4,7 @@ go 1.18 require ( github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/pdata v1.0.0-rc1 go.uber.org/zap v1.24.0 ) diff --git a/internal/aws/containerinsight/go.sum b/internal/aws/containerinsight/go.sum index 62a0e358049cd..4e6557466e3cc 100644 --- a/internal/aws/containerinsight/go.sum +++ b/internal/aws/containerinsight/go.sum @@ -54,8 +54,8 @@ github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKs github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ= go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= diff --git a/internal/aws/cwlogs/go.mod b/internal/aws/cwlogs/go.mod index 601e657e0015e..1dabc14e064e4 100644 --- a/internal/aws/cwlogs/go.mod +++ b/internal/aws/cwlogs/go.mod @@ -5,7 +5,7 @@ go 1.18 require ( github.com/aws/aws-sdk-go v1.44.155 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/component v0.67.0 go.uber.org/zap v1.24.0 ) @@ -26,11 +26,11 @@ require ( github.com/pelletier/go-toml v1.9.4 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/stretchr/objx v0.5.0 // indirect - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 // indirect - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a // indirect - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector v0.67.0 // indirect + go.opentelemetry.io/collector/confmap v0.67.0 // indirect + go.opentelemetry.io/collector/consumer v0.67.0 // indirect + go.opentelemetry.io/collector/featuregate v0.67.0 // indirect + go.opentelemetry.io/collector/pdata v1.0.0-rc1 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/internal/aws/cwlogs/go.sum b/internal/aws/cwlogs/go.sum index 84172abfe1151..3a0e0ba6c0888 100644 --- a/internal/aws/cwlogs/go.sum +++ b/internal/aws/cwlogs/go.sum @@ -271,18 +271,18 @@ github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5t go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A= go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/component v0.67.0 h1:GCBRZAqk4yNaT4L1uwlbbwophFHrxYccLZ4Uj1Ifs/M= +go.opentelemetry.io/collector/component v0.67.0/go.mod h1:Txa2lm9oe7xsGQN8u7GdUIrRpAHFIKsTO4Qi3/CSmKk= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/metric v0.33.0 h1:xQAyl7uGEYvrLAiV/09iTJlp1pZnQ9Wl793qbVvED1E= diff --git a/internal/aws/ecsutil/go.mod b/internal/aws/ecsutil/go.mod index 37d198978fd7d..94482a6a104e2 100644 --- a/internal/aws/ecsutil/go.mod +++ b/internal/aws/ecsutil/go.mod @@ -3,10 +3,10 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/ec go 1.18 require ( - github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.66.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.67.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector v0.67.0 + go.opentelemetry.io/collector/component v0.67.0 go.uber.org/zap v1.24.0 ) @@ -32,10 +32,10 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rogpeppe/go-internal v1.8.0 // indirect github.com/rs/cors v1.8.2 // indirect - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a // indirect - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/confmap v0.67.0 // indirect + go.opentelemetry.io/collector/consumer v0.67.0 // indirect + go.opentelemetry.io/collector/featuregate v0.67.0 // indirect + go.opentelemetry.io/collector/pdata v1.0.0-rc1 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect diff --git a/internal/aws/ecsutil/go.sum b/internal/aws/ecsutil/go.sum index dbeeff260bc3b..d3b8634e2fa42 100644 --- a/internal/aws/ecsutil/go.sum +++ b/internal/aws/ecsutil/go.sum @@ -279,18 +279,18 @@ github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1 go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A= go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/component v0.67.0 h1:GCBRZAqk4yNaT4L1uwlbbwophFHrxYccLZ4Uj1Ifs/M= +go.opentelemetry.io/collector/component v0.67.0/go.mod h1:Txa2lm9oe7xsGQN8u7GdUIrRpAHFIKsTO4Qi3/CSmKk= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 h1:aUEBEdCa6iamGzg6fuYxDA8ThxvOG240mAvWDU+XLio= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4/go.mod h1:l2MdsbKTocpPS5nQZscqTR9jd8u96VYZdcpF8Sye7mA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= diff --git a/internal/aws/proxy/go.mod b/internal/aws/proxy/go.mod index 6a658d8933df7..95f33d2fdc301 100644 --- a/internal/aws/proxy/go.mod +++ b/internal/aws/proxy/go.mod @@ -4,9 +4,9 @@ go 1.18 require ( github.com/aws/aws-sdk-go v1.44.155 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.66.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.67.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector v0.67.0 go.uber.org/zap v1.24.0 ) @@ -15,7 +15,7 @@ require ( github.com/jmespath/go-jmespath v0.4.0 // indirect github.com/kr/pretty v0.3.0 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/featuregate v0.67.0 // indirect go.uber.org/atomic v1.10.0 // indirect go.uber.org/multierr v1.8.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/internal/aws/proxy/go.sum b/internal/aws/proxy/go.sum index b6d171c5d243b..3caae7790baca 100644 --- a/internal/aws/proxy/go.sum +++ b/internal/aws/proxy/go.sum @@ -32,10 +32,10 @@ github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ= go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= diff --git a/internal/common/go.mod b/internal/common/go.mod index b39c55a5d09d4..e180f7ae46797 100644 --- a/internal/common/go.mod +++ b/internal/common/go.mod @@ -4,7 +4,7 @@ go 1.18 require ( github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/featuregate v0.67.0 go.uber.org/zap v1.24.0 ) diff --git a/internal/common/go.sum b/internal/common/go.sum index 97eb67fcd69c6..86c8763ff8d79 100644 --- a/internal/common/go.sum +++ b/internal/common/go.sum @@ -23,8 +23,8 @@ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ= go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= diff --git a/internal/comparetest/go.mod b/internal/comparetest/go.mod index 09f580e22f87f..8c0ad6c9700fb 100644 --- a/internal/comparetest/go.mod +++ b/internal/comparetest/go.mod @@ -4,7 +4,7 @@ go 1.18 require ( github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/pdata v1.0.0-rc1 go.uber.org/multierr v1.8.0 ) diff --git a/internal/comparetest/go.sum b/internal/comparetest/go.sum index f5282c4fce81b..a338604a1b892 100644 --- a/internal/comparetest/go.sum +++ b/internal/comparetest/go.sum @@ -61,8 +61,8 @@ github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKs github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ= go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= diff --git a/internal/components/components.go b/internal/components/components.go index 7dd10efcb4be5..078fb78f3170e 100644 --- a/internal/components/components.go +++ b/internal/components/components.go @@ -16,6 +16,7 @@ package components // import "github.com/open-telemetry/opentelemetry-collector- import ( "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/exporter" "go.opentelemetry.io/collector/exporter/loggingexporter" "go.opentelemetry.io/collector/exporter/otlpexporter" "go.opentelemetry.io/collector/exporter/otlphttpexporter" @@ -24,6 +25,7 @@ import ( "go.opentelemetry.io/collector/extension/zpagesextension" "go.opentelemetry.io/collector/processor/batchprocessor" "go.opentelemetry.io/collector/processor/memorylimiterprocessor" + "go.opentelemetry.io/collector/receiver" "go.opentelemetry.io/collector/receiver/otlpreceiver" "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/alibabacloudlogserviceexporter" @@ -153,7 +155,6 @@ import ( "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/postgresqlreceiver" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusexecreceiver" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver" - "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/promtailreceiver" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/pulsarreceiver" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/purefareceiver" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/rabbitmqreceiver" @@ -211,7 +212,7 @@ func Components() (component.Factories, error) { return component.Factories{}, err } - receivers := []component.ReceiverFactory{ + receivers := []receiver.Factory{ activedirectorydsreceiver.NewFactory(), aerospikereceiver.NewFactory(), apachereceiver.NewFactory(), @@ -263,7 +264,7 @@ func Components() (component.Factories, error) { postgresqlreceiver.NewFactory(), prometheusexecreceiver.NewFactory(), prometheusreceiver.NewFactory(), - promtailreceiver.NewFactory(), + // promtailreceiver.NewFactory(), pulsarreceiver.NewFactory(), purefareceiver.NewFactory(), rabbitmqreceiver.NewFactory(), @@ -291,12 +292,12 @@ func Components() (component.Factories, error) { vcenterreceiver.NewFactory(), zipkinreceiver.NewFactory(), } - factories.Receivers, err = component.MakeReceiverFactoryMap(receivers...) + factories.Receivers, err = receiver.MakeFactoryMap(receivers...) if err != nil { return component.Factories{}, err } - exporters := []component.ExporterFactory{ + exporters := []exporter.Factory{ alibabacloudlogserviceexporter.NewFactory(), awscloudwatchlogsexporter.NewFactory(), awsemfexporter.NewFactory(), @@ -343,7 +344,7 @@ func Components() (component.Factories, error) { tencentcloudlogserviceexporter.NewFactory(), zipkinexporter.NewFactory(), } - factories.Exporters, err = component.MakeExporterFactoryMap(exporters...) + factories.Exporters, err = exporter.MakeFactoryMap(exporters...) if err != nil { return component.Factories{}, err } diff --git a/internal/components/exporters_test.go b/internal/components/exporters_test.go index 42c3308786d4a..c23304d742d6a 100644 --- a/internal/components/exporters_test.go +++ b/internal/components/exporters_test.go @@ -28,8 +28,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config/configgrpc" + "go.opentelemetry.io/collector/exporter" + "go.opentelemetry.io/collector/exporter/exportertest" "go.opentelemetry.io/collector/exporter/otlpexporter" "go.opentelemetry.io/collector/exporter/otlphttpexporter" @@ -474,10 +475,10 @@ type getExporterConfigFn func() component.Config // verifyExporterLifecycle is used to test if an exporter type can handle the typical // lifecycle of a component. The getConfigFn parameter only need to be specified if // the test can't be done with the default configuration for the component. -func verifyExporterLifecycle(t *testing.T, factory component.ExporterFactory, getConfigFn getExporterConfigFn) { +func verifyExporterLifecycle(t *testing.T, factory exporter.Factory, getConfigFn getExporterConfigFn) { ctx := context.Background() host := newAssertNoErrorHost(t) - expCreateSettings := componenttest.NewNopExporterCreateSettings() + expCreateSettings := exportertest.NewNopCreateSettings() cfg := factory.CreateDefaultConfig() if getConfigFn != nil { @@ -509,24 +510,24 @@ func verifyExporterLifecycle(t *testing.T, factory component.ExporterFactory, ge type createExporterFn func( ctx context.Context, - set component.ExporterCreateSettings, + set exporter.CreateSettings, cfg component.Config, ) (component.Component, error) -func wrapCreateLogsExp(factory component.ExporterFactory) createExporterFn { - return func(ctx context.Context, set component.ExporterCreateSettings, cfg component.Config) (component.Component, error) { +func wrapCreateLogsExp(factory exporter.Factory) createExporterFn { + return func(ctx context.Context, set exporter.CreateSettings, cfg component.Config) (component.Component, error) { return factory.CreateLogsExporter(ctx, set, cfg) } } -func wrapCreateTracesExp(factory component.ExporterFactory) createExporterFn { - return func(ctx context.Context, set component.ExporterCreateSettings, cfg component.Config) (component.Component, error) { +func wrapCreateTracesExp(factory exporter.Factory) createExporterFn { + return func(ctx context.Context, set exporter.CreateSettings, cfg component.Config) (component.Component, error) { return factory.CreateTracesExporter(ctx, set, cfg) } } -func wrapCreateMetricsExp(factory component.ExporterFactory) createExporterFn { - return func(ctx context.Context, set component.ExporterCreateSettings, cfg component.Config) (component.Component, error) { +func wrapCreateMetricsExp(factory exporter.Factory) createExporterFn { + return func(ctx context.Context, set exporter.CreateSettings, cfg component.Config) (component.Component, error) { return factory.CreateMetricsExporter(ctx, set, cfg) } } diff --git a/internal/components/receivers_test.go b/internal/components/receivers_test.go index 2bc447b120009..4f3d608e9734b 100644 --- a/internal/components/receivers_test.go +++ b/internal/components/receivers_test.go @@ -24,18 +24,14 @@ import ( "path/filepath" "runtime" "testing" - "time" - "github.com/grafana/loki/clients/pkg/promtail/scrapeconfig" - "github.com/grafana/loki/clients/pkg/promtail/targets/file" - "github.com/prometheus/common/model" promconfig "github.com/prometheus/prometheus/config" - "github.com/prometheus/prometheus/discovery" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/consumer/consumertest" + "go.opentelemetry.io/collector/receiver" + "go.opentelemetry.io/collector/receiver/receivertest" tcpop "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/operator/input/tcp" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awscloudwatchreceiver" @@ -46,7 +42,6 @@ import ( "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/mongodbatlasreceiver" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/otlpjsonfilereceiver" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver" - "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/promtailreceiver" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/snmpreceiver" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/syslogreceiver" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/tcplogreceiver" @@ -284,35 +279,35 @@ func TestDefaultReceivers(t *testing.T) { receiver: "prometheus_exec", skipLifecyle: true, // Requires running a subproccess that can not be easily set across platforms }, - { - receiver: "promtail", - getConfigFn: func() component.Config { - cfg := rcvrFactories["promtail"].CreateDefaultConfig().(*promtailreceiver.PromtailConfig) - cfg.InputConfig = *promtailreceiver.NewConfigWithID("testconfig") - cfg.InputConfig.Input = promtailreceiver.PromtailInputConfig{ - ScrapeConfig: []scrapeconfig.Config{ - { - JobName: "test", - PipelineStages: []interface{}{}, - ServiceDiscoveryConfig: scrapeconfig.ServiceDiscoveryConfig{ - StaticConfigs: discovery.StaticConfig{ - { - Labels: model.LabelSet{ - "job": "varlogs", - }, - Targets: []model.LabelSet{}, - }, - }, - }, - }, - }, - TargetConfig: file.Config{ - SyncPeriod: 10 * time.Second, - }, - } - return cfg - }, - }, + // { + // receiver: "promtail", + // getConfigFn: func() component.Config { + // cfg := rcvrFactories["promtail"].CreateDefaultConfig().(*promtailreceiver.PromtailConfig) + // cfg.InputConfig = *promtailreceiver.NewConfigWithID("testconfig") + // cfg.InputConfig.Input = promtailreceiver.PromtailInputConfig{ + // ScrapeConfig: []scrapeconfig.Config{ + // { + // JobName: "test", + // PipelineStages: []interface{}{}, + // ServiceDiscoveryConfig: scrapeconfig.ServiceDiscoveryConfig{ + // StaticConfigs: discovery.StaticConfig{ + // { + // Labels: model.LabelSet{ + // "job": "varlogs", + // }, + // Targets: []model.LabelSet{}, + // }, + // }, + // }, + // }, + // }, + // TargetConfig: file.Config{ + // SyncPeriod: 10 * time.Second, + // }, + // } + // return cfg + // }, + // }, { receiver: "pulsar", skipLifecyle: true, // TODO It requires a running pulsar instance to start successfully. @@ -454,10 +449,10 @@ type getReceiverConfigFn func() component.Config // verifyReceiverLifecycle is used to test if a receiver type can handle the typical // lifecycle of a component. The getConfigFn parameter only need to be specified if // the test can't be done with the default configuration for the component. -func verifyReceiverLifecycle(t *testing.T, factory component.ReceiverFactory, getConfigFn getReceiverConfigFn) { +func verifyReceiverLifecycle(t *testing.T, factory receiver.Factory, getConfigFn getReceiverConfigFn) { ctx := context.Background() host := newAssertNoErrorHost(t) - receiverCreateSet := componenttest.NewNopReceiverCreateSettings() + receiverCreateSet := receivertest.NewNopCreateSettings() if getConfigFn == nil { getConfigFn = factory.CreateDefaultConfig @@ -488,24 +483,24 @@ func verifyReceiverLifecycle(t *testing.T, factory component.ReceiverFactory, ge // assertNoErrorHost implements a component.Host that asserts that there were no errors. type createReceiverFn func( ctx context.Context, - set component.ReceiverCreateSettings, + set receiver.CreateSettings, cfg component.Config, ) (component.Component, error) -func wrapCreateLogsRcvr(factory component.ReceiverFactory) createReceiverFn { - return func(ctx context.Context, set component.ReceiverCreateSettings, cfg component.Config) (component.Component, error) { +func wrapCreateLogsRcvr(factory receiver.Factory) createReceiverFn { + return func(ctx context.Context, set receiver.CreateSettings, cfg component.Config) (component.Component, error) { return factory.CreateLogsReceiver(ctx, set, cfg, consumertest.NewNop()) } } -func wrapCreateMetricsRcvr(factory component.ReceiverFactory) createReceiverFn { - return func(ctx context.Context, set component.ReceiverCreateSettings, cfg component.Config) (component.Component, error) { +func wrapCreateMetricsRcvr(factory receiver.Factory) createReceiverFn { + return func(ctx context.Context, set receiver.CreateSettings, cfg component.Config) (component.Component, error) { return factory.CreateMetricsReceiver(ctx, set, cfg, consumertest.NewNop()) } } -func wrapCreateTracesRcvr(factory component.ReceiverFactory) createReceiverFn { - return func(ctx context.Context, set component.ReceiverCreateSettings, cfg component.Config) (component.Component, error) { +func wrapCreateTracesRcvr(factory receiver.Factory) createReceiverFn { + return func(ctx context.Context, set receiver.CreateSettings, cfg component.Config) (component.Component, error) { return factory.CreateTracesReceiver(ctx, set, cfg, consumertest.NewNop()) } } diff --git a/internal/coreinternal/go.mod b/internal/coreinternal/go.mod index a08d6d037de51..88d176b9cc42a 100644 --- a/internal/coreinternal/go.mod +++ b/internal/coreinternal/go.mod @@ -4,9 +4,9 @@ go 1.18 require ( github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector v0.67.0 + go.opentelemetry.io/collector/pdata v1.0.0-rc1 + go.opentelemetry.io/collector/semconv v0.67.0 go.uber.org/zap v1.24.0 ) diff --git a/internal/coreinternal/go.sum b/internal/coreinternal/go.sum index 669a19106e224..9351f7d0fd6b7 100644 --- a/internal/coreinternal/go.sum +++ b/internal/coreinternal/go.sum @@ -45,13 +45,13 @@ github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKs github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/consumer v0.66.0 h1:wDx0MmqqsHGBcEa24HS0MlvDbLR0jT/936CSZ7vvP4M= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 h1:Q5L9Urod3c8as6ZYaoaqBjarx/HXxsxy34DFZIU2fO4= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= +go.opentelemetry.io/collector/semconv v0.67.0 h1:zLAvcQa6Kgow52FFLrmk7/9ZVtEYyA73+xDtCcFG78Q= +go.opentelemetry.io/collector/semconv v0.67.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ= go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= diff --git a/internal/filter/go.mod b/internal/filter/go.mod index 0e3de973c57e9..c9e5b9f858a13 100644 --- a/internal/filter/go.mod +++ b/internal/filter/go.mod @@ -5,12 +5,12 @@ go 1.18 require ( github.com/antonmedv/expr v1.9.0 github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da - github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.66.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.67.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/confmap v0.67.0 + go.opentelemetry.io/collector/pdata v1.0.0-rc1 + go.opentelemetry.io/collector/semconv v0.67.0 ) require ( @@ -28,10 +28,10 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rogpeppe/go-internal v1.6.1 // indirect - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 // indirect - go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 // indirect - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector v0.67.0 // indirect + go.opentelemetry.io/collector/component v0.67.0 // indirect + go.opentelemetry.io/collector/consumer v0.67.0 // indirect + go.opentelemetry.io/collector/featuregate v0.67.0 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/internal/filter/go.sum b/internal/filter/go.sum index 64ccac723d3cd..bcf3ed0ae29a4 100644 --- a/internal/filter/go.sum +++ b/internal/filter/go.sum @@ -277,20 +277,20 @@ github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1 go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A= go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 h1:Q5L9Urod3c8as6ZYaoaqBjarx/HXxsxy34DFZIU2fO4= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/component v0.67.0 h1:GCBRZAqk4yNaT4L1uwlbbwophFHrxYccLZ4Uj1Ifs/M= +go.opentelemetry.io/collector/component v0.67.0/go.mod h1:Txa2lm9oe7xsGQN8u7GdUIrRpAHFIKsTO4Qi3/CSmKk= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= +go.opentelemetry.io/collector/semconv v0.67.0 h1:zLAvcQa6Kgow52FFLrmk7/9ZVtEYyA73+xDtCcFG78Q= +go.opentelemetry.io/collector/semconv v0.67.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/metric v0.33.0 h1:xQAyl7uGEYvrLAiV/09iTJlp1pZnQ9Wl793qbVvED1E= diff --git a/internal/kubelet/go.mod b/internal/kubelet/go.mod index 8f81cae7419fb..533d6df19597f 100644 --- a/internal/kubelet/go.mod +++ b/internal/kubelet/go.mod @@ -3,10 +3,10 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/internal/kubele go 1.18 require ( - github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.66.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.67.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector v0.67.0 go.uber.org/zap v1.24.0 ) diff --git a/internal/kubelet/go.sum b/internal/kubelet/go.sum index 3ea89b4532185..31532fdc28588 100644 --- a/internal/kubelet/go.sum +++ b/internal/kubelet/go.sum @@ -252,8 +252,8 @@ 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 v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ= go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= diff --git a/internal/sharedcomponent/go.mod b/internal/sharedcomponent/go.mod index bfe63475d90bf..a47de63181efb 100644 --- a/internal/sharedcomponent/go.mod +++ b/internal/sharedcomponent/go.mod @@ -4,7 +4,7 @@ go 1.18 require ( github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/component v0.67.0 ) require ( @@ -22,11 +22,11 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pelletier/go-toml v1.9.4 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 // indirect - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a // indirect - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector v0.67.0 // indirect + go.opentelemetry.io/collector/confmap v0.67.0 // indirect + go.opentelemetry.io/collector/consumer v0.67.0 // indirect + go.opentelemetry.io/collector/featuregate v0.67.0 // indirect + go.opentelemetry.io/collector/pdata v1.0.0-rc1 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/internal/sharedcomponent/go.sum b/internal/sharedcomponent/go.sum index e1bb635097da6..4d20dc7206e4a 100644 --- a/internal/sharedcomponent/go.sum +++ b/internal/sharedcomponent/go.sum @@ -265,18 +265,18 @@ github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1 go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A= go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/component v0.67.0 h1:GCBRZAqk4yNaT4L1uwlbbwophFHrxYccLZ4Uj1Ifs/M= +go.opentelemetry.io/collector/component v0.67.0/go.mod h1:Txa2lm9oe7xsGQN8u7GdUIrRpAHFIKsTO4Qi3/CSmKk= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/metric v0.33.0 h1:xQAyl7uGEYvrLAiV/09iTJlp1pZnQ9Wl793qbVvED1E= diff --git a/internal/splunk/go.mod b/internal/splunk/go.mod index b50b4e0781851..74336e9ed44b2 100644 --- a/internal/splunk/go.mod +++ b/internal/splunk/go.mod @@ -4,10 +4,10 @@ go 1.18 require ( github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector v0.67.0 + go.opentelemetry.io/collector/consumer v0.67.0 + go.opentelemetry.io/collector/pdata v1.0.0-rc1 + go.opentelemetry.io/collector/semconv v0.67.0 go.uber.org/multierr v1.8.0 ) @@ -28,9 +28,9 @@ require ( github.com/pelletier/go-toml v1.9.4 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 // indirect - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/component v0.67.0 // indirect + go.opentelemetry.io/collector/confmap v0.67.0 // indirect + go.opentelemetry.io/collector/featuregate v0.67.0 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/internal/splunk/go.sum b/internal/splunk/go.sum index afa760a50afa7..b7ebcc231b647 100644 --- a/internal/splunk/go.sum +++ b/internal/splunk/go.sum @@ -286,20 +286,20 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 h1:Q5L9Urod3c8as6ZYaoaqBjarx/HXxsxy34DFZIU2fO4= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/component v0.67.0 h1:GCBRZAqk4yNaT4L1uwlbbwophFHrxYccLZ4Uj1Ifs/M= +go.opentelemetry.io/collector/component v0.67.0/go.mod h1:Txa2lm9oe7xsGQN8u7GdUIrRpAHFIKsTO4Qi3/CSmKk= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= +go.opentelemetry.io/collector/semconv v0.67.0 h1:zLAvcQa6Kgow52FFLrmk7/9ZVtEYyA73+xDtCcFG78Q= +go.opentelemetry.io/collector/semconv v0.67.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/pkg/batchperresourceattr/go.mod b/pkg/batchperresourceattr/go.mod index 8adb3e0031e91..f15c0d2c283cc 100644 --- a/pkg/batchperresourceattr/go.mod +++ b/pkg/batchperresourceattr/go.mod @@ -4,8 +4,8 @@ go 1.18 require ( github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/consumer v0.67.0 + go.opentelemetry.io/collector/pdata v1.0.0-rc1 go.uber.org/multierr v1.8.0 ) diff --git a/pkg/batchperresourceattr/go.sum b/pkg/batchperresourceattr/go.sum index 2aaf0a85a6588..61027d81cb46d 100644 --- a/pkg/batchperresourceattr/go.sum +++ b/pkg/batchperresourceattr/go.sum @@ -84,11 +84,11 @@ github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKs github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ= diff --git a/pkg/batchpersignal/go.mod b/pkg/batchpersignal/go.mod index 8b17e7b4a0558..0a34c3dce9dfd 100644 --- a/pkg/batchpersignal/go.mod +++ b/pkg/batchpersignal/go.mod @@ -4,7 +4,7 @@ go 1.18 require ( github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/pdata v1.0.0-rc1 ) require ( diff --git a/pkg/batchpersignal/go.sum b/pkg/batchpersignal/go.sum index 0664ac7409962..f232e2f652361 100644 --- a/pkg/batchpersignal/go.sum +++ b/pkg/batchpersignal/go.sum @@ -51,8 +51,8 @@ github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKs github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= go.uber.org/atomic v1.7.0 h1:ADUqmZGgLDDfbSL9ZmPxKTybcoEYHgpYfELNoN+7hsw= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= diff --git a/pkg/ottl/go.mod b/pkg/ottl/go.mod index 5ed10211f3bc2..76c2295047908 100644 --- a/pkg/ottl/go.mod +++ b/pkg/ottl/go.mod @@ -8,8 +8,8 @@ require ( github.com/iancoleman/strcase v0.2.0 github.com/json-iterator/go v1.1.12 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/component v0.67.0 + go.opentelemetry.io/collector/pdata v1.0.0-rc1 go.opentelemetry.io/otel/trace v1.11.1 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.24.0 @@ -30,10 +30,10 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pelletier/go-toml v1.9.4 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 // indirect - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a // indirect - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector v0.67.0 // indirect + go.opentelemetry.io/collector/confmap v0.67.0 // indirect + go.opentelemetry.io/collector/consumer v0.67.0 // indirect + go.opentelemetry.io/collector/featuregate v0.67.0 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.uber.org/atomic v1.10.0 // indirect diff --git a/pkg/ottl/go.sum b/pkg/ottl/go.sum index d420e90e9f75e..c914772433321 100644 --- a/pkg/ottl/go.sum +++ b/pkg/ottl/go.sum @@ -268,18 +268,18 @@ github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1 go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A= go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/component v0.67.0 h1:GCBRZAqk4yNaT4L1uwlbbwophFHrxYccLZ4Uj1Ifs/M= +go.opentelemetry.io/collector/component v0.67.0/go.mod h1:Txa2lm9oe7xsGQN8u7GdUIrRpAHFIKsTO4Qi3/CSmKk= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/metric v0.33.0 h1:xQAyl7uGEYvrLAiV/09iTJlp1pZnQ9Wl793qbVvED1E= diff --git a/pkg/resourcetotelemetry/go.mod b/pkg/resourcetotelemetry/go.mod index 15c9d2ad74aef..44edf4014bc6b 100644 --- a/pkg/resourcetotelemetry/go.mod +++ b/pkg/resourcetotelemetry/go.mod @@ -3,11 +3,11 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetot go 1.18 require ( - github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.66.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.67.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector v0.67.0 + go.opentelemetry.io/collector/consumer v0.67.0 + go.opentelemetry.io/collector/pdata v1.0.0-rc1 ) require ( @@ -24,9 +24,9 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rogpeppe/go-internal v1.6.1 // indirect - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 // indirect - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/component v0.67.0 // indirect + go.opentelemetry.io/collector/confmap v0.67.0 // indirect + go.opentelemetry.io/collector/featuregate v0.67.0 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/pkg/resourcetotelemetry/go.sum b/pkg/resourcetotelemetry/go.sum index 8de21c99d0604..330d7e24e19d0 100644 --- a/pkg/resourcetotelemetry/go.sum +++ b/pkg/resourcetotelemetry/go.sum @@ -255,18 +255,18 @@ github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1 go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A= go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/component v0.67.0 h1:GCBRZAqk4yNaT4L1uwlbbwophFHrxYccLZ4Uj1Ifs/M= +go.opentelemetry.io/collector/component v0.67.0/go.mod h1:Txa2lm9oe7xsGQN8u7GdUIrRpAHFIKsTO4Qi3/CSmKk= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/metric v0.33.0 h1:xQAyl7uGEYvrLAiV/09iTJlp1pZnQ9Wl793qbVvED1E= diff --git a/pkg/resourcetotelemetry/resource_to_telemetry.go b/pkg/resourcetotelemetry/resource_to_telemetry.go index d36b425b0ed83..0c482225fca39 100644 --- a/pkg/resourcetotelemetry/resource_to_telemetry.go +++ b/pkg/resourcetotelemetry/resource_to_telemetry.go @@ -17,8 +17,8 @@ package resourcetotelemetry // import "github.com/open-telemetry/opentelemetry-c import ( "context" - "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/consumer" + "go.opentelemetry.io/collector/exporter" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" ) @@ -36,11 +36,11 @@ type Settings struct { } type wrapperMetricsExporter struct { - component.MetricsExporter + exporter.Metrics } func (wme *wrapperMetricsExporter) ConsumeMetrics(ctx context.Context, md pmetric.Metrics) error { - return wme.MetricsExporter.ConsumeMetrics(ctx, convertToMetricsAttributes(md)) + return wme.Metrics.ConsumeMetrics(ctx, convertToMetricsAttributes(md)) } func (wme *wrapperMetricsExporter) Capabilities() consumer.Capabilities { @@ -48,13 +48,13 @@ func (wme *wrapperMetricsExporter) Capabilities() consumer.Capabilities { return consumer.Capabilities{MutatesData: false} } -// WrapMetricsExporter wraps a given component.MetricsExporter and based on the given settings +// WrapMetricsExporter wraps a given exporter.Metrics and based on the given settings // converts incoming resource attributes to metrics attributes. -func WrapMetricsExporter(set Settings, exporter component.MetricsExporter) component.MetricsExporter { +func WrapMetricsExporter(set Settings, exporter exporter.Metrics) exporter.Metrics { if !set.Enabled { return exporter } - return &wrapperMetricsExporter{MetricsExporter: exporter} + return &wrapperMetricsExporter{Metrics: exporter} } func convertToMetricsAttributes(md pmetric.Metrics) pmetric.Metrics { diff --git a/pkg/stanza/adapter/factory.go b/pkg/stanza/adapter/factory.go index af91828a8cf18..7cf6e5a7c2861 100644 --- a/pkg/stanza/adapter/factory.go +++ b/pkg/stanza/adapter/factory.go @@ -20,6 +20,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/obsreport" + rcvr "go.opentelemetry.io/collector/receiver" "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/operator" "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/pipeline" @@ -34,21 +35,21 @@ type LogReceiverType interface { } // NewFactory creates a factory for a Stanza-based receiver -func NewFactory(logReceiverType LogReceiverType, sl component.StabilityLevel) component.ReceiverFactory { - return component.NewReceiverFactory( +func NewFactory(logReceiverType LogReceiverType, sl component.StabilityLevel) rcvr.Factory { + return rcvr.NewFactory( logReceiverType.Type(), logReceiverType.CreateDefaultConfig, - component.WithLogsReceiver(createLogsReceiver(logReceiverType), sl), + rcvr.WithLogs(createLogsReceiver(logReceiverType), sl), ) } -func createLogsReceiver(logReceiverType LogReceiverType) component.CreateLogsReceiverFunc { +func createLogsReceiver(logReceiverType LogReceiverType) rcvr.CreateLogsFunc { return func( ctx context.Context, - params component.ReceiverCreateSettings, + params rcvr.CreateSettings, cfg component.Config, nextConsumer consumer.Logs, - ) (component.LogsReceiver, error) { + ) (rcvr.Logs, error) { inputCfg := logReceiverType.InputConfig(cfg) baseCfg := logReceiverType.BaseConfig(cfg) diff --git a/pkg/stanza/adapter/factory_test.go b/pkg/stanza/adapter/factory_test.go index e449f0b8a6ec9..92e0a45e585a0 100644 --- a/pkg/stanza/adapter/factory_test.go +++ b/pkg/stanza/adapter/factory_test.go @@ -20,8 +20,8 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/consumer/consumertest" + "go.opentelemetry.io/collector/receiver/receivertest" "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/operator" "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/operator/parser/json" @@ -37,7 +37,7 @@ func TestCreateReceiver(t *testing.T) { Builder: json.NewConfig(), }, } - receiver, err := factory.CreateLogsReceiver(context.Background(), componenttest.NewNopReceiverCreateSettings(), cfg, consumertest.NewNop()) + receiver, err := factory.CreateLogsReceiver(context.Background(), receivertest.NewNopCreateSettings(), cfg, consumertest.NewNop()) require.NoError(t, err, "receiver creation failed") require.NotNil(t, receiver, "receiver creation failed") }) @@ -50,7 +50,7 @@ func TestCreateReceiver(t *testing.T) { Builder: regex.NewConfig(), }, } - receiver, err := factory.CreateLogsReceiver(context.Background(), componenttest.NewNopReceiverCreateSettings(), badCfg, consumertest.NewNop()) + receiver, err := factory.CreateLogsReceiver(context.Background(), receivertest.NewNopCreateSettings(), badCfg, consumertest.NewNop()) require.Error(t, err, "receiver creation should fail if parser configs aren't valid") require.Nil(t, receiver, "receiver creation should fail if parser configs aren't valid") }) diff --git a/pkg/stanza/adapter/integration_test.go b/pkg/stanza/adapter/integration_test.go index 60bd09ea41f0f..ff31d4c5f072f 100644 --- a/pkg/stanza/adapter/integration_test.go +++ b/pkg/stanza/adapter/integration_test.go @@ -25,6 +25,7 @@ import ( "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/consumer/consumertest" "go.opentelemetry.io/collector/obsreport" + "go.opentelemetry.io/collector/receiver/receivertest" "go.uber.org/zap" "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/operator" @@ -49,7 +50,7 @@ func createNoopReceiver(nextConsumer consumer.Logs) (*receiver, error) { receiverID := component.NewID("test") obsrecv, err := obsreport.NewReceiver(obsreport.ReceiverSettings{ ReceiverID: receiverID, - ReceiverCreateSettings: componenttest.NewNopReceiverCreateSettings(), + ReceiverCreateSettings: receivertest.NewNopCreateSettings(), }) if err != nil { return nil, err diff --git a/pkg/stanza/adapter/receiver.go b/pkg/stanza/adapter/receiver.go index 19b0445c09269..c99b1735868bb 100644 --- a/pkg/stanza/adapter/receiver.go +++ b/pkg/stanza/adapter/receiver.go @@ -23,6 +23,7 @@ import ( "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/extension/experimental/storage" "go.opentelemetry.io/collector/obsreport" + rcvr "go.opentelemetry.io/collector/receiver" "go.uber.org/multierr" "go.uber.org/zap" @@ -46,7 +47,7 @@ type receiver struct { } // Ensure this receiver adheres to required interface -var _ component.LogsReceiver = (*receiver)(nil) +var _ rcvr.Logs = (*receiver)(nil) // Start tells the receiver to start func (r *receiver) Start(ctx context.Context, host component.Host) error { diff --git a/pkg/stanza/adapter/receiver_test.go b/pkg/stanza/adapter/receiver_test.go index 7db4c0175eab0..24fabfeacb2e2 100644 --- a/pkg/stanza/adapter/receiver_test.go +++ b/pkg/stanza/adapter/receiver_test.go @@ -26,6 +26,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/consumer/consumertest" + "go.opentelemetry.io/collector/receiver/receivertest" "go.uber.org/zap" "gopkg.in/yaml.v2" @@ -42,7 +43,7 @@ func TestStart(t *testing.T) { logsReceiver, err := factory.CreateLogsReceiver( context.Background(), - componenttest.NewNopReceiverCreateSettings(), + receivertest.NewNopCreateSettings(), factory.CreateDefaultConfig(), mockConsumer, ) @@ -72,7 +73,7 @@ func TestHandleStartError(t *testing.T) { cfg := factory.CreateDefaultConfig().(*TestConfig) cfg.Input = NewUnstartableConfig() - receiver, err := factory.CreateLogsReceiver(context.Background(), componenttest.NewNopReceiverCreateSettings(), cfg, mockConsumer) + receiver, err := factory.CreateLogsReceiver(context.Background(), receivertest.NewNopCreateSettings(), cfg, mockConsumer) require.NoError(t, err, "receiver should successfully build") err = receiver.Start(context.Background(), componenttest.NewNopHost()) @@ -83,7 +84,7 @@ func TestHandleConsumeError(t *testing.T) { mockConsumer := &mockLogsRejecter{} factory := NewFactory(TestReceiverType{}, component.StabilityLevelDevelopment) - logsReceiver, err := factory.CreateLogsReceiver(context.Background(), componenttest.NewNopReceiverCreateSettings(), factory.CreateDefaultConfig(), mockConsumer) + logsReceiver, err := factory.CreateLogsReceiver(context.Background(), receivertest.NewNopCreateSettings(), factory.CreateDefaultConfig(), mockConsumer) require.NoError(t, err, "receiver should successfully build") err = logsReceiver.Start(context.Background(), componenttest.NewNopHost()) diff --git a/pkg/stanza/adapter/storage_test.go b/pkg/stanza/adapter/storage_test.go index 47eee3885a9c7..5d3127080c8d0 100644 --- a/pkg/stanza/adapter/storage_test.go +++ b/pkg/stanza/adapter/storage_test.go @@ -22,6 +22,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/consumer/consumertest" + rcvr "go.opentelemetry.io/collector/receiver" "github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage/storagetest" ) @@ -115,7 +116,7 @@ func TestFailOnNonStorageExtension(t *testing.T) { } func createReceiver(t *testing.T, storageID component.ID) *receiver { - params := component.ReceiverCreateSettings{ + params := rcvr.CreateSettings{ TelemetrySettings: componenttest.NewNopTelemetrySettings(), } diff --git a/pkg/stanza/go.mod b/pkg/stanza/go.mod index 40e994afb1f76..2e1ed63874b34 100644 --- a/pkg/stanza/go.mod +++ b/pkg/stanza/go.mod @@ -10,13 +10,13 @@ require ( github.com/json-iterator/go v1.1.12 github.com/observiq/ctimefmt v1.0.0 github.com/observiq/nanojack v0.0.0-20201106172433-343928847ebc - github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage v0.66.0 + github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage v0.67.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector v0.67.0 + go.opentelemetry.io/collector/component v0.67.0 + go.opentelemetry.io/collector/confmap v0.67.0 + go.opentelemetry.io/collector/consumer v0.67.0 + go.opentelemetry.io/collector/pdata v1.0.0-rc1 go.uber.org/atomic v1.10.0 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.24.0 @@ -42,7 +42,7 @@ require ( github.com/rogpeppe/go-internal v1.6.1 // indirect github.com/stretchr/objx v0.5.0 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/featuregate v0.67.0 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/pkg/stanza/go.sum b/pkg/stanza/go.sum index 7ea64631c82a6..5b694b5acaba6 100644 --- a/pkg/stanza/go.sum +++ b/pkg/stanza/go.sum @@ -311,18 +311,18 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/component v0.67.0 h1:GCBRZAqk4yNaT4L1uwlbbwophFHrxYccLZ4Uj1Ifs/M= +go.opentelemetry.io/collector/component v0.67.0/go.mod h1:Txa2lm9oe7xsGQN8u7GdUIrRpAHFIKsTO4Qi3/CSmKk= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/pkg/translator/jaeger/go.mod b/pkg/translator/jaeger/go.mod index 842ffebd5c37a..5c7560b6f957e 100644 --- a/pkg/translator/jaeger/go.mod +++ b/pkg/translator/jaeger/go.mod @@ -4,10 +4,10 @@ go 1.18 require ( github.com/jaegertracing/jaeger v1.39.1-0.20221110195127-14c11365a856 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.66.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.67.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/pdata v1.0.0-rc1 + go.opentelemetry.io/collector/semconv v0.67.0 ) require ( diff --git a/pkg/translator/jaeger/go.sum b/pkg/translator/jaeger/go.sum index 58de3adb6204f..0c888c1fa78f7 100644 --- a/pkg/translator/jaeger/go.sum +++ b/pkg/translator/jaeger/go.sum @@ -48,10 +48,10 @@ github.com/uber/jaeger-lib v2.4.1+incompatible h1:td4jdvLcExb4cBISKIpHuGoVXh+dVK github.com/uber/jaeger-lib v2.4.1+incompatible/go.mod h1:ComeNDZlWwrWnDv8aPp0Ba6+uUTzImX/AauajbLI56U= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 h1:Q5L9Urod3c8as6ZYaoaqBjarx/HXxsxy34DFZIU2fO4= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= +go.opentelemetry.io/collector/semconv v0.67.0 h1:zLAvcQa6Kgow52FFLrmk7/9ZVtEYyA73+xDtCcFG78Q= +go.opentelemetry.io/collector/semconv v0.67.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ= go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= diff --git a/pkg/translator/loki/go.mod b/pkg/translator/loki/go.mod index c6b815e8c4143..82c22af812215 100644 --- a/pkg/translator/loki/go.mod +++ b/pkg/translator/loki/go.mod @@ -5,11 +5,11 @@ go 1.18 require ( github.com/go-logfmt/logfmt v0.5.1 github.com/gogo/protobuf v1.3.2 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.66.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.67.0 github.com/prometheus/common v0.37.0 github.com/prometheus/prometheus v0.40.5 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/pdata v1.0.0-rc1 google.golang.org/grpc v1.51.0 ) diff --git a/pkg/translator/loki/go.sum b/pkg/translator/loki/go.sum index cd504b23d728f..0fe3113e9f833 100644 --- a/pkg/translator/loki/go.sum +++ b/pkg/translator/loki/go.sum @@ -218,8 +218,8 @@ 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/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ= go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= diff --git a/pkg/translator/opencensus/go.mod b/pkg/translator/opencensus/go.mod index 4555b48b81d86..8dafb3b623d35 100644 --- a/pkg/translator/opencensus/go.mod +++ b/pkg/translator/opencensus/go.mod @@ -6,11 +6,11 @@ require ( github.com/census-instrumentation/opencensus-proto v0.4.1 github.com/golang/protobuf v1.5.2 github.com/google/go-cmp v0.5.9 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.66.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.67.0 github.com/stretchr/testify v1.8.1 go.opencensus.io v0.24.0 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/pdata v1.0.0-rc1 + go.opentelemetry.io/collector/semconv v0.67.0 google.golang.org/protobuf v1.28.1 ) diff --git a/pkg/translator/opencensus/go.sum b/pkg/translator/opencensus/go.sum index 81cc9db533a41..e5ae1c0c94fb9 100644 --- a/pkg/translator/opencensus/go.sum +++ b/pkg/translator/opencensus/go.sum @@ -76,10 +76,10 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 h1:Q5L9Urod3c8as6ZYaoaqBjarx/HXxsxy34DFZIU2fO4= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= +go.opentelemetry.io/collector/semconv v0.67.0 h1:zLAvcQa6Kgow52FFLrmk7/9ZVtEYyA73+xDtCcFG78Q= +go.opentelemetry.io/collector/semconv v0.67.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ= go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= diff --git a/pkg/translator/prometheus/go.mod b/pkg/translator/prometheus/go.mod index a7a432f9ba2d6..2a345db608e48 100644 --- a/pkg/translator/prometheus/go.mod +++ b/pkg/translator/prometheus/go.mod @@ -3,10 +3,10 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/ go 1.18 require ( - github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.66.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.67.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/featuregate v0.67.0 + go.opentelemetry.io/collector/pdata v1.0.0-rc1 ) require ( diff --git a/pkg/translator/prometheus/go.sum b/pkg/translator/prometheus/go.sum index 7da244823c2ee..7a6c9163c2246 100644 --- a/pkg/translator/prometheus/go.sum +++ b/pkg/translator/prometheus/go.sum @@ -81,10 +81,10 @@ github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKs github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ= diff --git a/pkg/translator/prometheusremotewrite/go.mod b/pkg/translator/prometheusremotewrite/go.mod index 591a39bde9bf8..debd02b6f27fe 100644 --- a/pkg/translator/prometheusremotewrite/go.mod +++ b/pkg/translator/prometheusremotewrite/go.mod @@ -3,14 +3,14 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/ go 1.18 require ( - github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheus v0.66.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheus v0.67.0 github.com/prometheus/common v0.37.0 github.com/prometheus/prometheus v0.40.5 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/consumer v0.67.0 + go.opentelemetry.io/collector/pdata v1.0.0-rc1 + go.opentelemetry.io/collector/semconv v0.67.0 go.uber.org/multierr v1.8.0 ) @@ -24,7 +24,7 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rogpeppe/go-internal v1.9.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/featuregate v0.67.0 // indirect go.uber.org/atomic v1.10.0 // indirect golang.org/x/net v0.3.0 // indirect golang.org/x/sys v0.3.0 // indirect diff --git a/pkg/translator/prometheusremotewrite/go.sum b/pkg/translator/prometheusremotewrite/go.sum index 1ab93d9f8d486..3ae0cf1b8ba6e 100644 --- a/pkg/translator/prometheusremotewrite/go.sum +++ b/pkg/translator/prometheusremotewrite/go.sum @@ -213,15 +213,15 @@ 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 v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 h1:Q5L9Urod3c8as6ZYaoaqBjarx/HXxsxy34DFZIU2fO4= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= +go.opentelemetry.io/collector/semconv v0.67.0 h1:zLAvcQa6Kgow52FFLrmk7/9ZVtEYyA73+xDtCcFG78Q= +go.opentelemetry.io/collector/semconv v0.67.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ= go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= diff --git a/pkg/translator/signalfx/go.mod b/pkg/translator/signalfx/go.mod index ed805115632b1..9925d3dfdaefc 100644 --- a/pkg/translator/signalfx/go.mod +++ b/pkg/translator/signalfx/go.mod @@ -3,10 +3,10 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/ go 1.18 require ( - github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.66.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.67.0 github.com/signalfx/com_signalfx_metrics_protobuf v0.0.3 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/pdata v1.0.0-rc1 go.uber.org/multierr v1.8.0 ) diff --git a/pkg/translator/signalfx/go.sum b/pkg/translator/signalfx/go.sum index 1698ab106d000..b031d9f7e4048 100644 --- a/pkg/translator/signalfx/go.sum +++ b/pkg/translator/signalfx/go.sum @@ -59,8 +59,8 @@ github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKs github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ= go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= diff --git a/pkg/translator/zipkin/go.mod b/pkg/translator/zipkin/go.mod index 6d4530f509e67..4d53696d4c603 100644 --- a/pkg/translator/zipkin/go.mod +++ b/pkg/translator/zipkin/go.mod @@ -4,11 +4,11 @@ go 1.18 require ( github.com/jaegertracing/jaeger v1.39.1-0.20221110195127-14c11365a856 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.66.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.67.0 github.com/openzipkin/zipkin-go v0.4.1 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/pdata v1.0.0-rc1 + go.opentelemetry.io/collector/semconv v0.67.0 ) require ( diff --git a/pkg/translator/zipkin/go.sum b/pkg/translator/zipkin/go.sum index d539aff07a169..a9786634b93dc 100644 --- a/pkg/translator/zipkin/go.sum +++ b/pkg/translator/zipkin/go.sum @@ -50,10 +50,10 @@ github.com/uber/jaeger-lib v2.4.1+incompatible h1:td4jdvLcExb4cBISKIpHuGoVXh+dVK github.com/uber/jaeger-lib v2.4.1+incompatible/go.mod h1:ComeNDZlWwrWnDv8aPp0Ba6+uUTzImX/AauajbLI56U= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 h1:Q5L9Urod3c8as6ZYaoaqBjarx/HXxsxy34DFZIU2fO4= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= +go.opentelemetry.io/collector/semconv v0.67.0 h1:zLAvcQa6Kgow52FFLrmk7/9ZVtEYyA73+xDtCcFG78Q= +go.opentelemetry.io/collector/semconv v0.67.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ= go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= diff --git a/pkg/winperfcounters/internal/third_party/telegraf/win_perf_counters/performance_query_test.go b/pkg/winperfcounters/internal/third_party/telegraf/win_perf_counters/performance_query_test.go index 62050d52244ce..426397a13cfe7 100644 --- a/pkg/winperfcounters/internal/third_party/telegraf/win_perf_counters/performance_query_test.go +++ b/pkg/winperfcounters/internal/third_party/telegraf/win_perf_counters/performance_query_test.go @@ -1,36 +1,36 @@ -//go:build windows -// +build windows - -package win_perf_counters - -import ( - "testing" - "unicode/utf16" - - "github.com/stretchr/testify/require" -) - -func TestUTF16PtrToString(t *testing.T) { - t.Run("String 'Hello World'", func(t *testing.T) { - testPtr := (*uint16)(&utf16.Encode([]rune("Hello World\000"))[0]) - strOut := UTF16PtrToString(testPtr) - require.Equal(t, "Hello World", strOut) - }) - - t.Run("nil pointer", func(t *testing.T) { - strOut := UTF16PtrToString(nil) - require.Equal(t, "", strOut) - }) -} - -func TestUTF16ToStringArray(t *testing.T) { - testStr := "First String\000Second String\000Final String\000\000" - testStrUTF16 := utf16.Encode([]rune(testStr)) - - strs := UTF16ToStringArray(testStrUTF16) - require.Equal(t, []string{ - "First String", - "Second String", - "Final String", - }, strs) -} +//go:build windows +// +build windows + +package win_perf_counters + +import ( + "testing" + "unicode/utf16" + + "github.com/stretchr/testify/require" +) + +func TestUTF16PtrToString(t *testing.T) { + t.Run("String 'Hello World'", func(t *testing.T) { + testPtr := (*uint16)(&utf16.Encode([]rune("Hello World\000"))[0]) + strOut := UTF16PtrToString(testPtr) + require.Equal(t, "Hello World", strOut) + }) + + t.Run("nil pointer", func(t *testing.T) { + strOut := UTF16PtrToString(nil) + require.Equal(t, "", strOut) + }) +} + +func TestUTF16ToStringArray(t *testing.T) { + testStr := "First String\000Second String\000Final String\000\000" + testStrUTF16 := utf16.Encode([]rune(testStr)) + + strs := UTF16ToStringArray(testStrUTF16) + require.Equal(t, []string{ + "First String", + "Second String", + "Final String", + }, strs) +} diff --git a/processor/attributesprocessor/go.mod b/processor/attributesprocessor/go.mod index 7c2b46374e6f0..5482a86c7cc62 100644 --- a/processor/attributesprocessor/go.mod +++ b/processor/attributesprocessor/go.mod @@ -3,16 +3,16 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/processor/attri go 1.18 require ( - github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/filter v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.66.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/filter v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.67.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector v0.67.0 + go.opentelemetry.io/collector/component v0.67.0 + go.opentelemetry.io/collector/confmap v0.67.0 + go.opentelemetry.io/collector/consumer v0.67.0 + go.opentelemetry.io/collector/pdata v1.0.0-rc1 + go.opentelemetry.io/collector/semconv v0.67.0 go.uber.org/zap v1.24.0 ) @@ -32,7 +32,7 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/featuregate v0.67.0 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/processor/attributesprocessor/go.sum b/processor/attributesprocessor/go.sum index 253f7d9972434..2a22b15d5e735 100644 --- a/processor/attributesprocessor/go.sum +++ b/processor/attributesprocessor/go.sum @@ -278,20 +278,20 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 h1:Q5L9Urod3c8as6ZYaoaqBjarx/HXxsxy34DFZIU2fO4= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/component v0.67.0 h1:GCBRZAqk4yNaT4L1uwlbbwophFHrxYccLZ4Uj1Ifs/M= +go.opentelemetry.io/collector/component v0.67.0/go.mod h1:Txa2lm9oe7xsGQN8u7GdUIrRpAHFIKsTO4Qi3/CSmKk= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= +go.opentelemetry.io/collector/semconv v0.67.0 h1:zLAvcQa6Kgow52FFLrmk7/9ZVtEYyA73+xDtCcFG78Q= +go.opentelemetry.io/collector/semconv v0.67.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/metric v0.33.0 h1:xQAyl7uGEYvrLAiV/09iTJlp1pZnQ9Wl793qbVvED1E= diff --git a/processor/cumulativetodeltaprocessor/go.mod b/processor/cumulativetodeltaprocessor/go.mod index 8afea6f29de92..ee53086c5f28d 100644 --- a/processor/cumulativetodeltaprocessor/go.mod +++ b/processor/cumulativetodeltaprocessor/go.mod @@ -3,14 +3,14 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/processor/cumul go 1.18 require ( - github.com/open-telemetry/opentelemetry-collector-contrib/internal/filter v0.66.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/filter v0.67.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector v0.67.0 + go.opentelemetry.io/collector/component v0.67.0 + go.opentelemetry.io/collector/confmap v0.67.0 + go.opentelemetry.io/collector/consumer v0.67.0 + go.opentelemetry.io/collector/featuregate v0.67.0 + go.opentelemetry.io/collector/pdata v1.0.0-rc1 go.uber.org/atomic v1.10.0 go.uber.org/zap v1.24.0 ) diff --git a/processor/cumulativetodeltaprocessor/go.sum b/processor/cumulativetodeltaprocessor/go.sum index 159b4093fa806..2995c26579417 100644 --- a/processor/cumulativetodeltaprocessor/go.sum +++ b/processor/cumulativetodeltaprocessor/go.sum @@ -257,18 +257,18 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/component v0.67.0 h1:GCBRZAqk4yNaT4L1uwlbbwophFHrxYccLZ4Uj1Ifs/M= +go.opentelemetry.io/collector/component v0.67.0/go.mod h1:Txa2lm9oe7xsGQN8u7GdUIrRpAHFIKsTO4Qi3/CSmKk= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/metric v0.33.0 h1:xQAyl7uGEYvrLAiV/09iTJlp1pZnQ9Wl793qbVvED1E= diff --git a/processor/deltatorateprocessor/go.mod b/processor/deltatorateprocessor/go.mod index b0b9041cbce76..5aedda5d6845b 100644 --- a/processor/deltatorateprocessor/go.mod +++ b/processor/deltatorateprocessor/go.mod @@ -4,11 +4,11 @@ go 1.18 require ( github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector v0.67.0 + go.opentelemetry.io/collector/component v0.67.0 + go.opentelemetry.io/collector/confmap v0.67.0 + go.opentelemetry.io/collector/consumer v0.67.0 + go.opentelemetry.io/collector/pdata v1.0.0-rc1 go.uber.org/zap v1.24.0 ) @@ -28,7 +28,7 @@ require ( github.com/pelletier/go-toml v1.9.4 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/featuregate v0.67.0 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/processor/deltatorateprocessor/go.sum b/processor/deltatorateprocessor/go.sum index 612bf3eb88698..8e62775bce434 100644 --- a/processor/deltatorateprocessor/go.sum +++ b/processor/deltatorateprocessor/go.sum @@ -270,18 +270,18 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/component v0.67.0 h1:GCBRZAqk4yNaT4L1uwlbbwophFHrxYccLZ4Uj1Ifs/M= +go.opentelemetry.io/collector/component v0.67.0/go.mod h1:Txa2lm9oe7xsGQN8u7GdUIrRpAHFIKsTO4Qi3/CSmKk= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/metric v0.33.0 h1:xQAyl7uGEYvrLAiV/09iTJlp1pZnQ9Wl793qbVvED1E= diff --git a/processor/filterprocessor/go.mod b/processor/filterprocessor/go.mod index 826b46d92f068..afb8d5d51fe10 100644 --- a/processor/filterprocessor/go.mod +++ b/processor/filterprocessor/go.mod @@ -3,15 +3,15 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/processor/filte go 1.18 require ( - github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/filter v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.66.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/filter v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.67.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector v0.67.0 + go.opentelemetry.io/collector/component v0.67.0 + go.opentelemetry.io/collector/confmap v0.67.0 + go.opentelemetry.io/collector/consumer v0.67.0 + go.opentelemetry.io/collector/pdata v1.0.0-rc1 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.24.0 ) @@ -34,8 +34,8 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect - go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/featuregate v0.67.0 // indirect + go.opentelemetry.io/collector/semconv v0.67.0 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/processor/filterprocessor/go.sum b/processor/filterprocessor/go.sum index 2ece780a43825..8060091aea407 100644 --- a/processor/filterprocessor/go.sum +++ b/processor/filterprocessor/go.sum @@ -282,20 +282,20 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 h1:Q5L9Urod3c8as6ZYaoaqBjarx/HXxsxy34DFZIU2fO4= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/component v0.67.0 h1:GCBRZAqk4yNaT4L1uwlbbwophFHrxYccLZ4Uj1Ifs/M= +go.opentelemetry.io/collector/component v0.67.0/go.mod h1:Txa2lm9oe7xsGQN8u7GdUIrRpAHFIKsTO4Qi3/CSmKk= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= +go.opentelemetry.io/collector/semconv v0.67.0 h1:zLAvcQa6Kgow52FFLrmk7/9ZVtEYyA73+xDtCcFG78Q= +go.opentelemetry.io/collector/semconv v0.67.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/metric v0.33.0 h1:xQAyl7uGEYvrLAiV/09iTJlp1pZnQ9Wl793qbVvED1E= diff --git a/processor/groupbyattrsprocessor/go.mod b/processor/groupbyattrsprocessor/go.mod index c07f1b5f00bea..12a3daca16fb9 100644 --- a/processor/groupbyattrsprocessor/go.mod +++ b/processor/groupbyattrsprocessor/go.mod @@ -5,11 +5,11 @@ go 1.18 require ( github.com/stretchr/testify v1.8.1 go.opencensus.io v0.24.0 - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector v0.67.0 + go.opentelemetry.io/collector/component v0.67.0 + go.opentelemetry.io/collector/confmap v0.67.0 + go.opentelemetry.io/collector/consumer v0.67.0 + go.opentelemetry.io/collector/pdata v1.0.0-rc1 go.uber.org/zap v1.24.0 ) @@ -28,7 +28,7 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pelletier/go-toml v1.9.4 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/featuregate v0.67.0 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/processor/groupbyattrsprocessor/go.sum b/processor/groupbyattrsprocessor/go.sum index 332cb361baafd..54a3300561832 100644 --- a/processor/groupbyattrsprocessor/go.sum +++ b/processor/groupbyattrsprocessor/go.sum @@ -284,18 +284,18 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/component v0.67.0 h1:GCBRZAqk4yNaT4L1uwlbbwophFHrxYccLZ4Uj1Ifs/M= +go.opentelemetry.io/collector/component v0.67.0/go.mod h1:Txa2lm9oe7xsGQN8u7GdUIrRpAHFIKsTO4Qi3/CSmKk= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/processor/groupbytraceprocessor/go.mod b/processor/groupbytraceprocessor/go.mod index 2c9c90e49b77f..99d85dc5fd062 100644 --- a/processor/groupbytraceprocessor/go.mod +++ b/processor/groupbytraceprocessor/go.mod @@ -3,13 +3,13 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/processor/group go 1.18 require ( - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchpersignal v0.66.0 + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchpersignal v0.67.0 github.com/stretchr/testify v1.8.1 go.opencensus.io v0.24.0 - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector v0.67.0 + go.opentelemetry.io/collector/component v0.67.0 + go.opentelemetry.io/collector/consumer v0.67.0 + go.opentelemetry.io/collector/pdata v1.0.0-rc1 go.uber.org/atomic v1.10.0 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.24.0 @@ -30,8 +30,8 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pelletier/go-toml v1.9.4 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/confmap v0.67.0 // indirect + go.opentelemetry.io/collector/featuregate v0.67.0 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/processor/groupbytraceprocessor/go.sum b/processor/groupbytraceprocessor/go.sum index 332cb361baafd..54a3300561832 100644 --- a/processor/groupbytraceprocessor/go.sum +++ b/processor/groupbytraceprocessor/go.sum @@ -284,18 +284,18 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/component v0.67.0 h1:GCBRZAqk4yNaT4L1uwlbbwophFHrxYccLZ4Uj1Ifs/M= +go.opentelemetry.io/collector/component v0.67.0/go.mod h1:Txa2lm9oe7xsGQN8u7GdUIrRpAHFIKsTO4Qi3/CSmKk= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/processor/k8sattributesprocessor/go.mod b/processor/k8sattributesprocessor/go.mod index e4502a522bb88..c00cf6dcef6f6 100644 --- a/processor/k8sattributesprocessor/go.mod +++ b/processor/k8sattributesprocessor/go.mod @@ -3,15 +3,15 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/processor/k8sat go 1.18 require ( - github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.66.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.67.0 github.com/stretchr/testify v1.8.1 go.opencensus.io v0.24.0 - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector v0.67.0 + go.opentelemetry.io/collector/component v0.67.0 + go.opentelemetry.io/collector/confmap v0.67.0 + go.opentelemetry.io/collector/consumer v0.67.0 + go.opentelemetry.io/collector/pdata v1.0.0-rc1 + go.opentelemetry.io/collector/semconv v0.67.0 go.uber.org/zap v1.24.0 k8s.io/api v0.25.4 k8s.io/apimachinery v0.25.4 @@ -53,7 +53,7 @@ require ( github.com/pkg/errors v0.9.1 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/spf13/pflag v1.0.5 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/featuregate v0.67.0 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/processor/k8sattributesprocessor/go.sum b/processor/k8sattributesprocessor/go.sum index 9b95ed17c307e..eab7370f13a4b 100644 --- a/processor/k8sattributesprocessor/go.sum +++ b/processor/k8sattributesprocessor/go.sum @@ -438,20 +438,20 @@ go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 h1:Q5L9Urod3c8as6ZYaoaqBjarx/HXxsxy34DFZIU2fO4= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/component v0.67.0 h1:GCBRZAqk4yNaT4L1uwlbbwophFHrxYccLZ4Uj1Ifs/M= +go.opentelemetry.io/collector/component v0.67.0/go.mod h1:Txa2lm9oe7xsGQN8u7GdUIrRpAHFIKsTO4Qi3/CSmKk= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= +go.opentelemetry.io/collector/semconv v0.67.0 h1:zLAvcQa6Kgow52FFLrmk7/9ZVtEYyA73+xDtCcFG78Q= +go.opentelemetry.io/collector/semconv v0.67.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/metric v0.33.0 h1:xQAyl7uGEYvrLAiV/09iTJlp1pZnQ9Wl793qbVvED1E= diff --git a/processor/logstransformprocessor/go.mod b/processor/logstransformprocessor/go.mod index db79b76bee7c7..a7f431e05789c 100644 --- a/processor/logstransformprocessor/go.mod +++ b/processor/logstransformprocessor/go.mod @@ -3,14 +3,14 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/processor/logst go 1.18 require ( - github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.66.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.67.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector v0.67.0 + go.opentelemetry.io/collector/component v0.67.0 + go.opentelemetry.io/collector/confmap v0.67.0 + go.opentelemetry.io/collector/consumer v0.67.0 + go.opentelemetry.io/collector/pdata v1.0.0-rc1 go.uber.org/zap v1.24.0 ) @@ -31,7 +31,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rogpeppe/go-internal v1.8.1 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/featuregate v0.67.0 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/processor/logstransformprocessor/go.sum b/processor/logstransformprocessor/go.sum index a57893e5ed4cd..b4f0a1e50b54e 100644 --- a/processor/logstransformprocessor/go.sum +++ b/processor/logstransformprocessor/go.sum @@ -293,18 +293,18 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/component v0.67.0 h1:GCBRZAqk4yNaT4L1uwlbbwophFHrxYccLZ4Uj1Ifs/M= +go.opentelemetry.io/collector/component v0.67.0/go.mod h1:Txa2lm9oe7xsGQN8u7GdUIrRpAHFIKsTO4Qi3/CSmKk= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/processor/metricsgenerationprocessor/go.mod b/processor/metricsgenerationprocessor/go.mod index 631a85f6b48e4..72db76b45bc02 100644 --- a/processor/metricsgenerationprocessor/go.mod +++ b/processor/metricsgenerationprocessor/go.mod @@ -4,11 +4,11 @@ go 1.18 require ( github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector v0.67.0 + go.opentelemetry.io/collector/component v0.67.0 + go.opentelemetry.io/collector/confmap v0.67.0 + go.opentelemetry.io/collector/consumer v0.67.0 + go.opentelemetry.io/collector/pdata v1.0.0-rc1 go.uber.org/zap v1.24.0 ) @@ -28,7 +28,7 @@ require ( github.com/pelletier/go-toml v1.9.4 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/featuregate v0.67.0 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/processor/metricsgenerationprocessor/go.sum b/processor/metricsgenerationprocessor/go.sum index 612bf3eb88698..8e62775bce434 100644 --- a/processor/metricsgenerationprocessor/go.sum +++ b/processor/metricsgenerationprocessor/go.sum @@ -270,18 +270,18 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/component v0.67.0 h1:GCBRZAqk4yNaT4L1uwlbbwophFHrxYccLZ4Uj1Ifs/M= +go.opentelemetry.io/collector/component v0.67.0/go.mod h1:Txa2lm9oe7xsGQN8u7GdUIrRpAHFIKsTO4Qi3/CSmKk= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/metric v0.33.0 h1:xQAyl7uGEYvrLAiV/09iTJlp1pZnQ9Wl793qbVvED1E= diff --git a/processor/metricstransformprocessor/go.mod b/processor/metricstransformprocessor/go.mod index 1b6382c813046..4af33ebce7380 100644 --- a/processor/metricstransformprocessor/go.mod +++ b/processor/metricstransformprocessor/go.mod @@ -3,13 +3,13 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/processor/metri go 1.18 require ( - github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest v0.66.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest v0.67.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector v0.67.0 + go.opentelemetry.io/collector/component v0.67.0 + go.opentelemetry.io/collector/confmap v0.67.0 + go.opentelemetry.io/collector/consumer v0.67.0 + go.opentelemetry.io/collector/pdata v1.0.0-rc1 go.uber.org/zap v1.24.0 ) @@ -30,7 +30,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rogpeppe/go-internal v1.8.1 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/featuregate v0.67.0 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/processor/metricstransformprocessor/go.sum b/processor/metricstransformprocessor/go.sum index 503113531746d..e38b9c6867d91 100644 --- a/processor/metricstransformprocessor/go.sum +++ b/processor/metricstransformprocessor/go.sum @@ -264,18 +264,18 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/component v0.67.0 h1:GCBRZAqk4yNaT4L1uwlbbwophFHrxYccLZ4Uj1Ifs/M= +go.opentelemetry.io/collector/component v0.67.0/go.mod h1:Txa2lm9oe7xsGQN8u7GdUIrRpAHFIKsTO4Qi3/CSmKk= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/metric v0.33.0 h1:xQAyl7uGEYvrLAiV/09iTJlp1pZnQ9Wl793qbVvED1E= diff --git a/processor/probabilisticsamplerprocessor/config_test.go b/processor/probabilisticsamplerprocessor/config_test.go index 7eed26e8cbffc..7aab7192aafd8 100644 --- a/processor/probabilisticsamplerprocessor/config_test.go +++ b/processor/probabilisticsamplerprocessor/config_test.go @@ -24,7 +24,7 @@ import ( "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/confmap/confmaptest" - "go.opentelemetry.io/collector/service/servicetest" + "go.opentelemetry.io/collector/otelcol/otelcoltest" ) func TestLoadConfig(t *testing.T) { @@ -82,6 +82,6 @@ func TestLoadInvalidConfig(t *testing.T) { factory := NewFactory() factories.Processors[typeStr] = factory - _, err = servicetest.LoadConfigAndValidate(filepath.Join("testdata", "invalid.yaml"), factories) + _, err = otelcoltest.LoadConfigAndValidate(filepath.Join("testdata", "invalid.yaml"), factories) require.ErrorContains(t, err, "negative sampling rate: -15.30") } diff --git a/processor/probabilisticsamplerprocessor/go.mod b/processor/probabilisticsamplerprocessor/go.mod index 80ea7ebb62631..2a11773b09c7b 100644 --- a/processor/probabilisticsamplerprocessor/go.mod +++ b/processor/probabilisticsamplerprocessor/go.mod @@ -3,15 +3,15 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/processor/proba go 1.18 require ( - github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.66.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.67.0 github.com/stretchr/testify v1.8.1 go.opencensus.io v0.24.0 - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector v0.67.0 + go.opentelemetry.io/collector/component v0.67.0 + go.opentelemetry.io/collector/confmap v0.67.0 + go.opentelemetry.io/collector/consumer v0.67.0 + go.opentelemetry.io/collector/pdata v1.0.0-rc1 + go.opentelemetry.io/collector/semconv v0.67.0 go.uber.org/zap v1.24.0 ) @@ -54,8 +54,8 @@ require ( github.com/tklauser/go-sysconf v0.3.11 // indirect github.com/tklauser/numcpus v0.6.0 // indirect github.com/yusufpapurcu/wmi v1.2.2 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect - go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/featuregate v0.67.0 // indirect + go.opentelemetry.io/collector/processor/batchprocessor v0.67.0 // indirect go.opentelemetry.io/contrib/propagators/b3 v1.11.1 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.33.0 // indirect diff --git a/processor/probabilisticsamplerprocessor/go.sum b/processor/probabilisticsamplerprocessor/go.sum index 7e6b121a3b1f3..17f7a30fa180c 100644 --- a/processor/probabilisticsamplerprocessor/go.sum +++ b/processor/probabilisticsamplerprocessor/go.sum @@ -398,23 +398,23 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/extension/zpagesextension v0.66.0 h1:tPqSKH5K3VhTT0XXVoWL3woWBSTJqnXZQRt0ZLSCoCc= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221202005155-1c54042beb70 h1:Y4e8NnVevonnAgmjX9Z7QIMA32yMqHAOnAlh8SzTS8c= -go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:Pi1CsKDQFoDrUP1i3+VdE6s2Xuji7bOGFBgqHK0J32E= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 h1:Q5L9Urod3c8as6ZYaoaqBjarx/HXxsxy34DFZIU2fO4= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/component v0.67.0 h1:GCBRZAqk4yNaT4L1uwlbbwophFHrxYccLZ4Uj1Ifs/M= +go.opentelemetry.io/collector/component v0.67.0/go.mod h1:Txa2lm9oe7xsGQN8u7GdUIrRpAHFIKsTO4Qi3/CSmKk= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/extension/zpagesextension v0.67.0 h1:TRW8vZwE+/h2vJqqMDmyQO9X0sxcYCSXf5MyXozSLas= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= +go.opentelemetry.io/collector/processor/batchprocessor v0.67.0 h1:Qn4Ytth3q1trwTSAYYTzIRs4SBh9rz0xBou1nZB+Dko= +go.opentelemetry.io/collector/processor/batchprocessor v0.67.0/go.mod h1:+ZXCkUG9tlwbbVLi+PT9DjQ7vz+lfFSQqvW45snLYno= +go.opentelemetry.io/collector/semconv v0.67.0 h1:zLAvcQa6Kgow52FFLrmk7/9ZVtEYyA73+xDtCcFG78Q= +go.opentelemetry.io/collector/semconv v0.67.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/contrib/propagators/b3 v1.11.1 h1:icQ6ttRV+r/2fnU46BIo/g/mPu6Rs5Ug8Rtohe3KqzI= go.opentelemetry.io/contrib/propagators/b3 v1.11.1/go.mod h1:ECIveyMXgnl4gorxFcA7RYjJY/Ql9n20ubhbfDc3QfA= go.opentelemetry.io/contrib/zpages v0.36.4 h1:Z2VK5WsDhWs9VwZ1p0TM5RyusTOgAQfdMMDDQPRnlmY= diff --git a/processor/redactionprocessor/go.mod b/processor/redactionprocessor/go.mod index 482ee5637f929..598a8427dfb5d 100644 --- a/processor/redactionprocessor/go.mod +++ b/processor/redactionprocessor/go.mod @@ -4,11 +4,11 @@ go 1.18 require ( github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector v0.67.0 + go.opentelemetry.io/collector/component v0.67.0 + go.opentelemetry.io/collector/confmap v0.67.0 + go.opentelemetry.io/collector/consumer v0.67.0 + go.opentelemetry.io/collector/pdata v1.0.0-rc1 go.uber.org/zap v1.24.0 ) @@ -29,7 +29,7 @@ require ( github.com/pelletier/go-toml v1.9.4 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/featuregate v0.67.0 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/processor/redactionprocessor/go.sum b/processor/redactionprocessor/go.sum index 2a415ebf6304e..b427a5af814d3 100644 --- a/processor/redactionprocessor/go.sum +++ b/processor/redactionprocessor/go.sum @@ -271,18 +271,18 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/component v0.67.0 h1:GCBRZAqk4yNaT4L1uwlbbwophFHrxYccLZ4Uj1Ifs/M= +go.opentelemetry.io/collector/component v0.67.0/go.mod h1:Txa2lm9oe7xsGQN8u7GdUIrRpAHFIKsTO4Qi3/CSmKk= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/metric v0.33.0 h1:xQAyl7uGEYvrLAiV/09iTJlp1pZnQ9Wl793qbVvED1E= diff --git a/processor/resourcedetectionprocessor/go.mod b/processor/resourcedetectionprocessor/go.mod index b486b28a376ce..9dbc0ee1c5130 100644 --- a/processor/resourcedetectionprocessor/go.mod +++ b/processor/resourcedetectionprocessor/go.mod @@ -7,15 +7,15 @@ require ( github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v0.34.3-0.20221202192616-0186b89ba914 github.com/aws/aws-sdk-go v1.44.155 github.com/hashicorp/consul/api v1.18.0 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/ecsutil v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/metadataproviders v0.66.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/ecsutil v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/metadataproviders v0.67.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector v0.67.0 + go.opentelemetry.io/collector/component v0.67.0 + go.opentelemetry.io/collector/confmap v0.67.0 + go.opentelemetry.io/collector/consumer v0.67.0 + go.opentelemetry.io/collector/pdata v1.0.0-rc1 + go.opentelemetry.io/collector/semconv v0.67.0 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.24.0 k8s.io/apimachinery v0.25.4 @@ -69,7 +69,7 @@ require ( github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.66.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.67.0 // indirect github.com/opencontainers/go-digest v1.0.0 // indirect github.com/opencontainers/image-spec v1.0.2 // indirect github.com/pkg/errors v0.9.1 // indirect @@ -79,7 +79,7 @@ require ( github.com/sirupsen/logrus v1.8.1 // indirect github.com/stretchr/objx v0.5.0 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/featuregate v0.67.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect diff --git a/processor/resourcedetectionprocessor/go.sum b/processor/resourcedetectionprocessor/go.sum index 6ef6af3574497..1645c627760e7 100644 --- a/processor/resourcedetectionprocessor/go.sum +++ b/processor/resourcedetectionprocessor/go.sum @@ -394,20 +394,20 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 h1:Q5L9Urod3c8as6ZYaoaqBjarx/HXxsxy34DFZIU2fO4= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/component v0.67.0 h1:GCBRZAqk4yNaT4L1uwlbbwophFHrxYccLZ4Uj1Ifs/M= +go.opentelemetry.io/collector/component v0.67.0/go.mod h1:Txa2lm9oe7xsGQN8u7GdUIrRpAHFIKsTO4Qi3/CSmKk= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= +go.opentelemetry.io/collector/semconv v0.67.0 h1:zLAvcQa6Kgow52FFLrmk7/9ZVtEYyA73+xDtCcFG78Q= +go.opentelemetry.io/collector/semconv v0.67.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 h1:aUEBEdCa6iamGzg6fuYxDA8ThxvOG240mAvWDU+XLio= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4/go.mod h1:l2MdsbKTocpPS5nQZscqTR9jd8u96VYZdcpF8Sye7mA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= diff --git a/processor/resourceprocessor/go.mod b/processor/resourceprocessor/go.mod index 448851c4dca11..7ce0c8de4dee6 100644 --- a/processor/resourceprocessor/go.mod +++ b/processor/resourceprocessor/go.mod @@ -3,13 +3,13 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/processor/resou go 1.18 require ( - github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.66.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.67.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector v0.67.0 + go.opentelemetry.io/collector/component v0.67.0 + go.opentelemetry.io/collector/confmap v0.67.0 + go.opentelemetry.io/collector/consumer v0.67.0 + go.opentelemetry.io/collector/pdata v1.0.0-rc1 go.uber.org/zap v1.24.0 ) @@ -28,7 +28,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rogpeppe/go-internal v1.6.1 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/featuregate v0.67.0 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/processor/resourceprocessor/go.sum b/processor/resourceprocessor/go.sum index 433809d30cf76..31480f1255d5c 100644 --- a/processor/resourceprocessor/go.sum +++ b/processor/resourceprocessor/go.sum @@ -260,18 +260,18 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/component v0.67.0 h1:GCBRZAqk4yNaT4L1uwlbbwophFHrxYccLZ4Uj1Ifs/M= +go.opentelemetry.io/collector/component v0.67.0/go.mod h1:Txa2lm9oe7xsGQN8u7GdUIrRpAHFIKsTO4Qi3/CSmKk= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/metric v0.33.0 h1:xQAyl7uGEYvrLAiV/09iTJlp1pZnQ9Wl793qbVvED1E= diff --git a/processor/routingprocessor/factory_test.go b/processor/routingprocessor/factory_test.go index 7f60126b40377..dbd2534f37e5f 100644 --- a/processor/routingprocessor/factory_test.go +++ b/processor/routingprocessor/factory_test.go @@ -27,6 +27,7 @@ import ( "go.opentelemetry.io/collector/config/configgrpc" "go.opentelemetry.io/collector/confmap/confmaptest" "go.opentelemetry.io/collector/consumer/consumertest" + "go.opentelemetry.io/collector/exporter/exportertest" "go.opentelemetry.io/collector/exporter/otlpexporter" "go.opentelemetry.io/collector/pdata/ptrace" "go.opentelemetry.io/collector/processor/processorhelper" @@ -161,10 +162,10 @@ func TestProcessorDoesNotFailToBuildExportersWithMultiplePipelines(t *testing.T) }, } - otlpTracesExporter, err := otlpExporterFactory.CreateTracesExporter(context.Background(), componenttest.NewNopExporterCreateSettings(), otlpConfig) + otlpTracesExporter, err := otlpExporterFactory.CreateTracesExporter(context.Background(), exportertest.NewNopCreateSettings(), otlpConfig) require.NoError(t, err) - otlpMetricsExporter, err := otlpExporterFactory.CreateMetricsExporter(context.Background(), componenttest.NewNopExporterCreateSettings(), otlpConfig) + otlpMetricsExporter, err := otlpExporterFactory.CreateMetricsExporter(context.Background(), exportertest.NewNopCreateSettings(), otlpConfig) require.NoError(t, err) host := newMockHost(map[component.DataType]map[component.ID]component.Component{ diff --git a/processor/routingprocessor/go.mod b/processor/routingprocessor/go.mod index acb8343aeb906..b951aff58a9a7 100644 --- a/processor/routingprocessor/go.mod +++ b/processor/routingprocessor/go.mod @@ -3,14 +3,14 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/processor/routi go 1.18 require ( - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.66.0 + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.67.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/exporter/otlpexporter v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector v0.67.0 + go.opentelemetry.io/collector/component v0.67.0 + go.opentelemetry.io/collector/confmap v0.67.0 + go.opentelemetry.io/collector/consumer v0.67.0 + go.opentelemetry.io/collector/exporter/otlpexporter v0.67.0 + go.opentelemetry.io/collector/pdata v1.0.0-rc1 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.24.0 google.golang.org/grpc v1.51.0 @@ -42,7 +42,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rogpeppe/go-internal v1.6.2 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/featuregate v0.67.0 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect diff --git a/processor/routingprocessor/go.sum b/processor/routingprocessor/go.sum index 68e53fa4e2879..8c68646800a33 100644 --- a/processor/routingprocessor/go.sum +++ b/processor/routingprocessor/go.sum @@ -309,20 +309,20 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/exporter/otlpexporter v0.66.1-0.20221202005155-1c54042beb70 h1:m9GPfziw/079Xt7/Pfby/5obJhtqR19WKkgQQ/VxNZo= -go.opentelemetry.io/collector/exporter/otlpexporter v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:bCD3trc7OqeEVCgyQdO3kwGgogZMjcMu2tX49SFv1lU= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/component v0.67.0 h1:GCBRZAqk4yNaT4L1uwlbbwophFHrxYccLZ4Uj1Ifs/M= +go.opentelemetry.io/collector/component v0.67.0/go.mod h1:Txa2lm9oe7xsGQN8u7GdUIrRpAHFIKsTO4Qi3/CSmKk= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/exporter/otlpexporter v0.67.0 h1:AxejzV7pxCQjdIsIBLQPbeub2SqbyAsu09TA1BG0jcs= +go.opentelemetry.io/collector/exporter/otlpexporter v0.67.0/go.mod h1:urludZR9ya0gUNf7JXzKL06gX2Anu4BDa6UfCvI61Hw= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4 h1:PRXhsszxTt5bbPriTjmaweWUsAnJYeWBhUMLRetUgBU= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4/go.mod h1:05eWWy6ZWzmpeImD3UowLTB3VjDMU1yxQ+ENuVWDM3c= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= diff --git a/processor/routingprocessor/logs.go b/processor/routingprocessor/logs.go index a4ba6c2570881..a46c9200397a1 100644 --- a/processor/routingprocessor/logs.go +++ b/processor/routingprocessor/logs.go @@ -19,6 +19,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/consumer" + "go.opentelemetry.io/collector/exporter" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/plog" "go.uber.org/multierr" @@ -35,7 +36,7 @@ type logProcessor struct { config *Config extractor extractor - router router[component.LogsExporter, ottllog.TransformContext] + router router[exporter.Logs, ottllog.TransformContext] } func newLogProcessor(settings component.TelemetrySettings, config component.Config) *logProcessor { @@ -44,7 +45,7 @@ func newLogProcessor(settings component.TelemetrySettings, config component.Conf return &logProcessor{ logger: settings.Logger, config: cfg, - router: newRouter[component.LogsExporter, ottllog.TransformContext]( + router: newRouter[exporter.Logs, ottllog.TransformContext]( cfg.Table, cfg.DefaultExporters, settings, @@ -78,7 +79,7 @@ func (p *logProcessor) ConsumeLogs(ctx context.Context, l plog.Logs) error { } type logsGroup struct { - exporters []component.LogsExporter + exporters []exporter.Logs logs plog.Logs } @@ -127,7 +128,7 @@ func (p *logProcessor) route(ctx context.Context, l plog.Logs) error { func (p *logProcessor) group( key string, groups map[string]logsGroup, - exporters []component.LogsExporter, + exporters []exporter.Logs, spans plog.ResourceLogs, ) { group, ok := groups[key] diff --git a/processor/routingprocessor/metrics.go b/processor/routingprocessor/metrics.go index f5cbf02441da2..9f970470a32b5 100644 --- a/processor/routingprocessor/metrics.go +++ b/processor/routingprocessor/metrics.go @@ -19,6 +19,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/consumer" + "go.opentelemetry.io/collector/exporter" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" "go.uber.org/multierr" @@ -35,7 +36,7 @@ type metricsProcessor struct { config *Config extractor extractor - router router[component.MetricsExporter, ottldatapoint.TransformContext] + router router[exporter.Metrics, ottldatapoint.TransformContext] } func newMetricProcessor(settings component.TelemetrySettings, config component.Config) *metricsProcessor { @@ -44,7 +45,7 @@ func newMetricProcessor(settings component.TelemetrySettings, config component.C return &metricsProcessor{ logger: settings.Logger, config: cfg, - router: newRouter[component.MetricsExporter]( + router: newRouter[exporter.Metrics]( cfg.Table, cfg.DefaultExporters, settings, @@ -78,7 +79,7 @@ func (p *metricsProcessor) ConsumeMetrics(ctx context.Context, m pmetric.Metrics } type metricsGroup struct { - exporters []component.MetricsExporter + exporters []exporter.Metrics metrics pmetric.Metrics } @@ -130,7 +131,7 @@ func (p *metricsProcessor) route(ctx context.Context, tm pmetric.Metrics) error func (p *metricsProcessor) group( key string, groups map[string]metricsGroup, - exporters []component.MetricsExporter, + exporters []exporter.Metrics, metrics pmetric.ResourceMetrics, ) { group, ok := groups[key] diff --git a/processor/routingprocessor/router.go b/processor/routingprocessor/router.go index fd4e38d2dc605..46f5a3a3654a2 100644 --- a/processor/routingprocessor/router.go +++ b/processor/routingprocessor/router.go @@ -27,8 +27,8 @@ import ( var errExporterNotFound = errors.New("exporter not found") // router registers exporters and default exporters for an exporter. router can -// be instantiated with component.TracesExporter, component.MetricsExporter, and -// component.LogsExporter type arguments. +// be instantiated with exporter.Traces, exporter.Metrics, and +// exporter.Logs type arguments. type router[E component.Component, K any] struct { logger *zap.Logger parser ottl.Parser[K] diff --git a/processor/routingprocessor/traces.go b/processor/routingprocessor/traces.go index 70e6d24267d3d..b8014e6b52da2 100644 --- a/processor/routingprocessor/traces.go +++ b/processor/routingprocessor/traces.go @@ -19,6 +19,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/consumer" + "go.opentelemetry.io/collector/exporter" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/ptrace" "go.uber.org/multierr" @@ -35,7 +36,7 @@ type tracesProcessor struct { config *Config extractor extractor - router router[component.TracesExporter, ottlspan.TransformContext] + router router[exporter.Traces, ottlspan.TransformContext] } func newTracesProcessor(settings component.TelemetrySettings, config component.Config) *tracesProcessor { @@ -44,7 +45,7 @@ func newTracesProcessor(settings component.TelemetrySettings, config component.C return &tracesProcessor{ logger: settings.Logger, config: cfg, - router: newRouter[component.TracesExporter, ottlspan.TransformContext]( + router: newRouter[exporter.Traces, ottlspan.TransformContext]( cfg.Table, cfg.DefaultExporters, settings, @@ -79,7 +80,7 @@ func (p *tracesProcessor) ConsumeTraces(ctx context.Context, t ptrace.Traces) er } type spanGroup struct { - exporters []component.TracesExporter + exporters []exporter.Traces traces ptrace.Traces } @@ -125,7 +126,7 @@ func (p *tracesProcessor) route(ctx context.Context, t ptrace.Traces) error { return errs } -func (p *tracesProcessor) group(key string, groups map[string]spanGroup, exporters []component.TracesExporter, spans ptrace.ResourceSpans) { +func (p *tracesProcessor) group(key string, groups map[string]spanGroup, exporters []exporter.Traces, spans ptrace.ResourceSpans) { group, ok := groups[key] if !ok { group.traces = ptrace.NewTraces() diff --git a/processor/routingprocessor/traces_test.go b/processor/routingprocessor/traces_test.go index 1b33f6b870965..251f2c8981c76 100644 --- a/processor/routingprocessor/traces_test.go +++ b/processor/routingprocessor/traces_test.go @@ -21,10 +21,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/configgrpc" "go.opentelemetry.io/collector/consumer/consumertest" + "go.opentelemetry.io/collector/exporter/exportertest" "go.opentelemetry.io/collector/exporter/otlpexporter" "go.opentelemetry.io/collector/pdata/ptrace" "go.uber.org/zap" @@ -52,7 +52,7 @@ func TestTraces_RegisterExportersForValidRoute(t *testing.T) { Endpoint: "example.com:1234", }, } - otlpExp, err := otlpExpFactory.CreateTracesExporter(context.Background(), componenttest.NewNopExporterCreateSettings(), otlpConfig) + otlpExp, err := otlpExpFactory.CreateTracesExporter(context.Background(), exportertest.NewNopCreateSettings(), otlpConfig) require.NoError(t, err) host := newMockHost(map[component.DataType]map[component.ID]component.Component{ diff --git a/processor/schemaprocessor/go.mod b/processor/schemaprocessor/go.mod index 4b118e24d78ac..cb0567916059f 100644 --- a/processor/schemaprocessor/go.mod +++ b/processor/schemaprocessor/go.mod @@ -4,11 +4,11 @@ go 1.18 require ( github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector v0.67.0 + go.opentelemetry.io/collector/component v0.67.0 + go.opentelemetry.io/collector/confmap v0.67.0 + go.opentelemetry.io/collector/consumer v0.67.0 + go.opentelemetry.io/collector/pdata v1.0.0-rc1 go.uber.org/zap v1.24.0 ) @@ -35,7 +35,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rs/cors v1.8.2 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/featuregate v0.67.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect diff --git a/processor/schemaprocessor/go.sum b/processor/schemaprocessor/go.sum index 35762e821bc88..a4764968dc04f 100644 --- a/processor/schemaprocessor/go.sum +++ b/processor/schemaprocessor/go.sum @@ -283,18 +283,18 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/component v0.67.0 h1:GCBRZAqk4yNaT4L1uwlbbwophFHrxYccLZ4Uj1Ifs/M= +go.opentelemetry.io/collector/component v0.67.0/go.mod h1:Txa2lm9oe7xsGQN8u7GdUIrRpAHFIKsTO4Qi3/CSmKk= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 h1:aUEBEdCa6iamGzg6fuYxDA8ThxvOG240mAvWDU+XLio= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4/go.mod h1:l2MdsbKTocpPS5nQZscqTR9jd8u96VYZdcpF8Sye7mA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= diff --git a/processor/servicegraphprocessor/config_test.go b/processor/servicegraphprocessor/config_test.go index af358ad0afe2d..4194ef3a6ecf7 100644 --- a/processor/servicegraphprocessor/config_test.go +++ b/processor/servicegraphprocessor/config_test.go @@ -24,7 +24,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" - "go.opentelemetry.io/collector/service/servicetest" + "go.opentelemetry.io/collector/otelcol/otelcoltest" ) func TestLoadConfig(t *testing.T) { @@ -35,7 +35,7 @@ func TestLoadConfig(t *testing.T) { factories.Processors[typeStr] = NewFactory() // Test - cfg, err := servicetest.LoadConfigAndValidate(filepath.Join("testdata", "service-graph-config.yaml"), factories) + cfg, err := otelcoltest.LoadConfigAndValidate(filepath.Join("testdata", "service-graph-config.yaml"), factories) // Verify require.NoError(t, err) diff --git a/processor/servicegraphprocessor/go.mod b/processor/servicegraphprocessor/go.mod index 1cdcc8391db4e..51c850ad37f12 100644 --- a/processor/servicegraphprocessor/go.mod +++ b/processor/servicegraphprocessor/go.mod @@ -5,12 +5,12 @@ go 1.18 require ( github.com/stretchr/testify v1.8.1 go.opencensus.io v0.24.0 - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/exporter/otlpexporter v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector v0.67.0 + go.opentelemetry.io/collector/component v0.67.0 + go.opentelemetry.io/collector/consumer v0.67.0 + go.opentelemetry.io/collector/exporter/otlpexporter v0.67.0 + go.opentelemetry.io/collector/pdata v1.0.0-rc1 + go.opentelemetry.io/collector/semconv v0.67.0 go.uber.org/zap v1.24.0 ) @@ -61,9 +61,9 @@ require ( github.com/tklauser/go-sysconf v0.3.11 // indirect github.com/tklauser/numcpus v0.6.0 // indirect github.com/yusufpapurcu/wmi v1.2.2 // indirect - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect - go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/confmap v0.67.0 // indirect + go.opentelemetry.io/collector/featuregate v0.67.0 // indirect + go.opentelemetry.io/collector/processor/batchprocessor v0.67.0 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4 // indirect go.opentelemetry.io/contrib/propagators/b3 v1.11.1 // indirect go.opentelemetry.io/otel v1.11.1 // indirect diff --git a/processor/servicegraphprocessor/go.sum b/processor/servicegraphprocessor/go.sum index 3dbc3968ec81a..f0633c2082914 100644 --- a/processor/servicegraphprocessor/go.sum +++ b/processor/servicegraphprocessor/go.sum @@ -425,25 +425,25 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/exporter/otlpexporter v0.66.1-0.20221202005155-1c54042beb70 h1:m9GPfziw/079Xt7/Pfby/5obJhtqR19WKkgQQ/VxNZo= -go.opentelemetry.io/collector/exporter/otlpexporter v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:bCD3trc7OqeEVCgyQdO3kwGgogZMjcMu2tX49SFv1lU= -go.opentelemetry.io/collector/extension/zpagesextension v0.66.0 h1:tPqSKH5K3VhTT0XXVoWL3woWBSTJqnXZQRt0ZLSCoCc= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221202005155-1c54042beb70 h1:Y4e8NnVevonnAgmjX9Z7QIMA32yMqHAOnAlh8SzTS8c= -go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:Pi1CsKDQFoDrUP1i3+VdE6s2Xuji7bOGFBgqHK0J32E= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 h1:Q5L9Urod3c8as6ZYaoaqBjarx/HXxsxy34DFZIU2fO4= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/component v0.67.0 h1:GCBRZAqk4yNaT4L1uwlbbwophFHrxYccLZ4Uj1Ifs/M= +go.opentelemetry.io/collector/component v0.67.0/go.mod h1:Txa2lm9oe7xsGQN8u7GdUIrRpAHFIKsTO4Qi3/CSmKk= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/exporter/otlpexporter v0.67.0 h1:AxejzV7pxCQjdIsIBLQPbeub2SqbyAsu09TA1BG0jcs= +go.opentelemetry.io/collector/exporter/otlpexporter v0.67.0/go.mod h1:urludZR9ya0gUNf7JXzKL06gX2Anu4BDa6UfCvI61Hw= +go.opentelemetry.io/collector/extension/zpagesextension v0.67.0 h1:TRW8vZwE+/h2vJqqMDmyQO9X0sxcYCSXf5MyXozSLas= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= +go.opentelemetry.io/collector/processor/batchprocessor v0.67.0 h1:Qn4Ytth3q1trwTSAYYTzIRs4SBh9rz0xBou1nZB+Dko= +go.opentelemetry.io/collector/processor/batchprocessor v0.67.0/go.mod h1:+ZXCkUG9tlwbbVLi+PT9DjQ7vz+lfFSQqvW45snLYno= +go.opentelemetry.io/collector/semconv v0.67.0 h1:zLAvcQa6Kgow52FFLrmk7/9ZVtEYyA73+xDtCcFG78Q= +go.opentelemetry.io/collector/semconv v0.67.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4 h1:PRXhsszxTt5bbPriTjmaweWUsAnJYeWBhUMLRetUgBU= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4/go.mod h1:05eWWy6ZWzmpeImD3UowLTB3VjDMU1yxQ+ENuVWDM3c= go.opentelemetry.io/contrib/propagators/b3 v1.11.1 h1:icQ6ttRV+r/2fnU46BIo/g/mPu6Rs5Ug8Rtohe3KqzI= diff --git a/processor/servicegraphprocessor/processor.go b/processor/servicegraphprocessor/processor.go index c14e85565cd3d..947953af71a0b 100644 --- a/processor/servicegraphprocessor/processor.go +++ b/processor/servicegraphprocessor/processor.go @@ -26,6 +26,7 @@ import ( "go.opencensus.io/stats" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/consumer" + "go.opentelemetry.io/collector/exporter" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" "go.opentelemetry.io/collector/pdata/ptrace" @@ -110,7 +111,7 @@ func (p *processor) Start(_ context.Context, host component.Host) error { // The available list of exporters come from any configured metrics pipelines' exporters. for k, exp := range exporters[component.DataTypeMetrics] { - metricsExp, ok := exp.(component.MetricsExporter) + metricsExp, ok := exp.(exporter.Metrics) if k.String() == p.config.MetricsExporter && ok { p.metricsExporter = metricsExp break diff --git a/processor/servicegraphprocessor/processor_test.go b/processor/servicegraphprocessor/processor_test.go index 19bc574770c75..9bacd18321f80 100644 --- a/processor/servicegraphprocessor/processor_test.go +++ b/processor/servicegraphprocessor/processor_test.go @@ -27,6 +27,8 @@ import ( "go.opentelemetry.io/collector/config/configgrpc" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/consumer/consumertest" + "go.opentelemetry.io/collector/exporter" + "go.opentelemetry.io/collector/exporter/exportertest" "go.opentelemetry.io/collector/exporter/otlpexporter" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" @@ -225,7 +227,7 @@ func sampleTraces() ptrace.Traces { return traces } -func newOTLPExporters(t *testing.T) (component.ID, component.MetricsExporter, component.TracesExporter) { +func newOTLPExporters(t *testing.T) (component.ID, exporter.Metrics, exporter.Traces) { otlpExpFactory := otlpexporter.NewFactory() otlpID := component.NewID("otlp") otlpConfig := &otlpexporter.Config{ @@ -234,7 +236,7 @@ func newOTLPExporters(t *testing.T) (component.ID, component.MetricsExporter, co Endpoint: "example.com:1234", }, } - expCreationParams := componenttest.NewNopExporterCreateSettings() + expCreationParams := exportertest.NewNopCreateSettings() mexp, err := otlpExpFactory.CreateMetricsExporter(context.Background(), expCreationParams, otlpConfig) require.NoError(t, err) texp, err := otlpExpFactory.CreateTracesExporter(context.Background(), expCreationParams, otlpConfig) @@ -258,9 +260,9 @@ func (m *mockHost) GetExporters() map[component.DataType]map[component.ID]compon return m.exps } -var _ component.MetricsExporter = (*mockMetricsExporter)(nil) +var _ exporter.Metrics = (*mockMetricsExporter)(nil) -func newMockMetricsExporter(verifyFunc func(md pmetric.Metrics) error) component.MetricsExporter { +func newMockMetricsExporter(verifyFunc func(md pmetric.Metrics) error) exporter.Metrics { return &mockMetricsExporter{verify: verifyFunc} } diff --git a/processor/spanmetricsprocessor/config_test.go b/processor/spanmetricsprocessor/config_test.go index 54aaeaa9037f4..4ddae32c5f72d 100644 --- a/processor/spanmetricsprocessor/config_test.go +++ b/processor/spanmetricsprocessor/config_test.go @@ -25,10 +25,10 @@ import ( "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/exporter/otlpexporter" + "go.opentelemetry.io/collector/otelcol/otelcoltest" "go.opentelemetry.io/collector/pdata/pmetric" "go.opentelemetry.io/collector/processor/batchprocessor" "go.opentelemetry.io/collector/receiver/otlpreceiver" - "go.opentelemetry.io/collector/service/servicetest" "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/jaegerexporter" "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusexporter" @@ -94,7 +94,7 @@ func TestLoadConfig(t *testing.T) { factories.Exporters["jaeger"] = jaegerexporter.NewFactory() // Test - cfg, err := servicetest.LoadConfigAndValidate(filepath.Join("testdata", tc.configFile), factories) + cfg, err := otelcoltest.LoadConfigAndValidate(filepath.Join("testdata", tc.configFile), factories) // Verify require.NoError(t, err) diff --git a/processor/spanmetricsprocessor/go.mod b/processor/spanmetricsprocessor/go.mod index dbf4881bf2397..7fa3186c6688f 100644 --- a/processor/spanmetricsprocessor/go.mod +++ b/processor/spanmetricsprocessor/go.mod @@ -4,20 +4,20 @@ go 1.18 require ( github.com/hashicorp/golang-lru v0.5.4 - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/jaegerexporter v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusexporter v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver v0.66.0 + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/jaegerexporter v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusexporter v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver v0.67.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/exporter/otlpexporter v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/receiver/otlpreceiver v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector v0.67.0 + go.opentelemetry.io/collector/component v0.67.0 + go.opentelemetry.io/collector/consumer v0.67.0 + go.opentelemetry.io/collector/exporter/otlpexporter v0.67.0 + go.opentelemetry.io/collector/featuregate v0.67.0 + go.opentelemetry.io/collector/pdata v1.0.0-rc1 + go.opentelemetry.io/collector/processor/batchprocessor v0.67.0 + go.opentelemetry.io/collector/receiver/otlpreceiver v0.67.0 + go.opentelemetry.io/collector/semconv v0.67.0 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.24.0 google.golang.org/grpc v1.51.0 @@ -58,9 +58,9 @@ require ( github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/mostynb/go-grpc-compression v1.1.17 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheus v0.66.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheus v0.67.0 // indirect github.com/opentracing/opentracing-go v1.2.0 // indirect github.com/ovh/go-ovh v1.3.0 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect @@ -81,7 +81,7 @@ require ( github.com/uber/jaeger-lib v2.4.1+incompatible // indirect github.com/yusufpapurcu/wmi v1.2.2 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a // indirect + go.opentelemetry.io/collector/confmap v0.67.0 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 // indirect go.opentelemetry.io/contrib/propagators/b3 v1.11.1 // indirect diff --git a/processor/spanmetricsprocessor/go.sum b/processor/spanmetricsprocessor/go.sum index c8db4d41e84ac..5fa7185dceb37 100644 --- a/processor/spanmetricsprocessor/go.sum +++ b/processor/spanmetricsprocessor/go.sum @@ -606,27 +606,27 @@ go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/ go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/exporter/otlpexporter v0.66.1-0.20221202005155-1c54042beb70 h1:m9GPfziw/079Xt7/Pfby/5obJhtqR19WKkgQQ/VxNZo= -go.opentelemetry.io/collector/exporter/otlpexporter v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:bCD3trc7OqeEVCgyQdO3kwGgogZMjcMu2tX49SFv1lU= -go.opentelemetry.io/collector/extension/zpagesextension v0.66.0 h1:tPqSKH5K3VhTT0XXVoWL3woWBSTJqnXZQRt0ZLSCoCc= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221202005155-1c54042beb70 h1:Y4e8NnVevonnAgmjX9Z7QIMA32yMqHAOnAlh8SzTS8c= -go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:Pi1CsKDQFoDrUP1i3+VdE6s2Xuji7bOGFBgqHK0J32E= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.66.1-0.20221202005155-1c54042beb70 h1:KBbbPVDV7o5w857g6ePphdu4MV87jrcQevFYDA1okUk= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:0Py8RNjNiFRH6/F+vM2uptdaw9hMj1FBdv0ySntM2gE= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 h1:Q5L9Urod3c8as6ZYaoaqBjarx/HXxsxy34DFZIU2fO4= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/component v0.67.0 h1:GCBRZAqk4yNaT4L1uwlbbwophFHrxYccLZ4Uj1Ifs/M= +go.opentelemetry.io/collector/component v0.67.0/go.mod h1:Txa2lm9oe7xsGQN8u7GdUIrRpAHFIKsTO4Qi3/CSmKk= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/exporter/otlpexporter v0.67.0 h1:AxejzV7pxCQjdIsIBLQPbeub2SqbyAsu09TA1BG0jcs= +go.opentelemetry.io/collector/exporter/otlpexporter v0.67.0/go.mod h1:urludZR9ya0gUNf7JXzKL06gX2Anu4BDa6UfCvI61Hw= +go.opentelemetry.io/collector/extension/zpagesextension v0.67.0 h1:TRW8vZwE+/h2vJqqMDmyQO9X0sxcYCSXf5MyXozSLas= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= +go.opentelemetry.io/collector/processor/batchprocessor v0.67.0 h1:Qn4Ytth3q1trwTSAYYTzIRs4SBh9rz0xBou1nZB+Dko= +go.opentelemetry.io/collector/processor/batchprocessor v0.67.0/go.mod h1:+ZXCkUG9tlwbbVLi+PT9DjQ7vz+lfFSQqvW45snLYno= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.67.0 h1:pMluLYSSAH7n8zkPWYkWGY/pALrVxG9rHX8J/WDrcx0= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.67.0/go.mod h1:GIJc0eu4N2oJB420N3NhSFJ1IhAgCwvlTCMGWxKhXgg= +go.opentelemetry.io/collector/semconv v0.67.0 h1:zLAvcQa6Kgow52FFLrmk7/9ZVtEYyA73+xDtCcFG78Q= +go.opentelemetry.io/collector/semconv v0.67.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4 h1:PRXhsszxTt5bbPriTjmaweWUsAnJYeWBhUMLRetUgBU= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4/go.mod h1:05eWWy6ZWzmpeImD3UowLTB3VjDMU1yxQ+ENuVWDM3c= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 h1:aUEBEdCa6iamGzg6fuYxDA8ThxvOG240mAvWDU+XLio= diff --git a/processor/spanmetricsprocessor/processor.go b/processor/spanmetricsprocessor/processor.go index 95cc86f4e8115..9392e07efb7f2 100644 --- a/processor/spanmetricsprocessor/processor.go +++ b/processor/spanmetricsprocessor/processor.go @@ -26,6 +26,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/consumer" + "go.opentelemetry.io/collector/exporter" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" "go.opentelemetry.io/collector/pdata/ptrace" @@ -66,7 +67,7 @@ type processorImp struct { logger *zap.Logger config Config - metricsExporter component.MetricsExporter + metricsExporter exporter.Metrics nextConsumer consumer.Traces // Additional dimensions to add to metrics. @@ -202,7 +203,7 @@ func (p *processorImp) Start(ctx context.Context, host component.Host) error { // The available list of exporters come from any configured metrics pipelines' exporters. for k, exp := range exporters[component.DataTypeMetrics] { - metricsExp, ok := exp.(component.MetricsExporter) + metricsExp, ok := exp.(exporter.Metrics) if !ok { return fmt.Errorf("the exporter %q isn't a metrics exporter", k.String()) } diff --git a/processor/spanmetricsprocessor/processor_test.go b/processor/spanmetricsprocessor/processor_test.go index 76ab6426971b1..54c65236adfa7 100644 --- a/processor/spanmetricsprocessor/processor_test.go +++ b/processor/spanmetricsprocessor/processor_test.go @@ -29,6 +29,8 @@ import ( "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/configgrpc" "go.opentelemetry.io/collector/consumer/consumertest" + "go.opentelemetry.io/collector/exporter" + "go.opentelemetry.io/collector/exporter/exportertest" "go.opentelemetry.io/collector/exporter/otlpexporter" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" @@ -620,7 +622,7 @@ func initSpan(span span, s ptrace.Span) { s.SetSpanID(pcommon.SpanID([8]byte{byte(42)})) } -func newOTLPExporters(t *testing.T) (component.ID, component.MetricsExporter, component.TracesExporter) { +func newOTLPExporters(t *testing.T) (component.ID, exporter.Metrics, exporter.Traces) { otlpExpFactory := otlpexporter.NewFactory() otlpID := component.NewID("otlp") otlpConfig := &otlpexporter.Config{ @@ -629,7 +631,7 @@ func newOTLPExporters(t *testing.T) (component.ID, component.MetricsExporter, co Endpoint: "example.com:1234", }, } - expCreationParams := componenttest.NewNopExporterCreateSettings() + expCreationParams := exportertest.NewNopCreateSettings() mexp, err := otlpExpFactory.CreateMetricsExporter(context.Background(), expCreationParams, otlpConfig) require.NoError(t, err) texp, err := otlpExpFactory.CreateTracesExporter(context.Background(), expCreationParams, otlpConfig) diff --git a/processor/spanprocessor/go.mod b/processor/spanprocessor/go.mod index 39a8257ebaa84..e9a3cea203c10 100644 --- a/processor/spanprocessor/go.mod +++ b/processor/spanprocessor/go.mod @@ -3,16 +3,16 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/processor/spanp go 1.18 require ( - github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/filter v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.66.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/filter v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.67.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector v0.67.0 + go.opentelemetry.io/collector/component v0.67.0 + go.opentelemetry.io/collector/confmap v0.67.0 + go.opentelemetry.io/collector/consumer v0.67.0 + go.opentelemetry.io/collector/pdata v1.0.0-rc1 + go.opentelemetry.io/collector/semconv v0.67.0 ) require ( @@ -30,7 +30,7 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/featuregate v0.67.0 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/processor/spanprocessor/go.sum b/processor/spanprocessor/go.sum index 3ee53e1424aa1..64ca16502e139 100644 --- a/processor/spanprocessor/go.sum +++ b/processor/spanprocessor/go.sum @@ -263,20 +263,20 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 h1:Q5L9Urod3c8as6ZYaoaqBjarx/HXxsxy34DFZIU2fO4= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/component v0.67.0 h1:GCBRZAqk4yNaT4L1uwlbbwophFHrxYccLZ4Uj1Ifs/M= +go.opentelemetry.io/collector/component v0.67.0/go.mod h1:Txa2lm9oe7xsGQN8u7GdUIrRpAHFIKsTO4Qi3/CSmKk= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= +go.opentelemetry.io/collector/semconv v0.67.0 h1:zLAvcQa6Kgow52FFLrmk7/9ZVtEYyA73+xDtCcFG78Q= +go.opentelemetry.io/collector/semconv v0.67.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/metric v0.33.0 h1:xQAyl7uGEYvrLAiV/09iTJlp1pZnQ9Wl793qbVvED1E= diff --git a/processor/tailsamplingprocessor/go.mod b/processor/tailsamplingprocessor/go.mod index da0a98d9ce858..1709946756b82 100644 --- a/processor/tailsamplingprocessor/go.mod +++ b/processor/tailsamplingprocessor/go.mod @@ -5,14 +5,14 @@ go 1.18 require ( github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da github.com/google/uuid v1.3.0 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.66.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.67.0 github.com/stretchr/testify v1.8.1 go.opencensus.io v0.24.0 - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector v0.67.0 + go.opentelemetry.io/collector/component v0.67.0 + go.opentelemetry.io/collector/confmap v0.67.0 + go.opentelemetry.io/collector/consumer v0.67.0 + go.opentelemetry.io/collector/pdata v1.0.0-rc1 go.opentelemetry.io/otel/trace v1.11.1 go.uber.org/atomic v1.10.0 go.uber.org/goleak v1.2.0 @@ -33,7 +33,7 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rogpeppe/go-internal v1.9.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/featuregate v0.67.0 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.uber.org/multierr v1.8.0 // indirect diff --git a/processor/tailsamplingprocessor/go.sum b/processor/tailsamplingprocessor/go.sum index c81b0665b3d72..9df4197efe46c 100644 --- a/processor/tailsamplingprocessor/go.sum +++ b/processor/tailsamplingprocessor/go.sum @@ -276,18 +276,18 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/component v0.67.0 h1:GCBRZAqk4yNaT4L1uwlbbwophFHrxYccLZ4Uj1Ifs/M= +go.opentelemetry.io/collector/component v0.67.0/go.mod h1:Txa2lm9oe7xsGQN8u7GdUIrRpAHFIKsTO4Qi3/CSmKk= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/processor/transformprocessor/go.mod b/processor/transformprocessor/go.mod index 8cc5f6c2e954c..76cea7ba3d085 100644 --- a/processor/transformprocessor/go.mod +++ b/processor/transformprocessor/go.mod @@ -3,13 +3,13 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/processor/trans go 1.18 require ( - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.66.0 + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.67.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector v0.67.0 + go.opentelemetry.io/collector/component v0.67.0 + go.opentelemetry.io/collector/confmap v0.67.0 + go.opentelemetry.io/collector/consumer v0.67.0 + go.opentelemetry.io/collector/pdata v1.0.0-rc1 go.uber.org/zap v1.24.0 ) @@ -31,7 +31,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rogpeppe/go-internal v1.6.1 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/featuregate v0.67.0 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/processor/transformprocessor/go.sum b/processor/transformprocessor/go.sum index be02402abd5bd..7897c758fab99 100644 --- a/processor/transformprocessor/go.sum +++ b/processor/transformprocessor/go.sum @@ -269,18 +269,18 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/component v0.67.0 h1:GCBRZAqk4yNaT4L1uwlbbwophFHrxYccLZ4Uj1Ifs/M= +go.opentelemetry.io/collector/component v0.67.0/go.mod h1:Txa2lm9oe7xsGQN8u7GdUIrRpAHFIKsTO4Qi3/CSmKk= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/metric v0.33.0 h1:xQAyl7uGEYvrLAiV/09iTJlp1pZnQ9Wl793qbVvED1E= diff --git a/receiver/activedirectorydsreceiver/factory.go b/receiver/activedirectorydsreceiver/factory.go index 8a3e55aa3b8cf..c9b494f676cbd 100644 --- a/receiver/activedirectorydsreceiver/factory.go +++ b/receiver/activedirectorydsreceiver/factory.go @@ -19,6 +19,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" + "go.opentelemetry.io/collector/receiver" "go.opentelemetry.io/collector/receiver/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/activedirectorydsreceiver/internal/metadata" @@ -30,11 +31,11 @@ const ( stability = component.StabilityLevelBeta ) -func NewFactory() component.ReceiverFactory { - return component.NewReceiverFactory( +func NewFactory() receiver.Factory { + return receiver.NewFactory( typeStr, createDefaultConfig, - component.WithMetricsReceiver(createMetricsReceiver, stability), + receiver.WithMetrics(createMetricsReceiver, stability), ) } diff --git a/receiver/activedirectorydsreceiver/factory_others.go b/receiver/activedirectorydsreceiver/factory_others.go index 111b402617298..f5d615290a024 100644 --- a/receiver/activedirectorydsreceiver/factory_others.go +++ b/receiver/activedirectorydsreceiver/factory_others.go @@ -23,15 +23,16 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/consumer" + "go.opentelemetry.io/collector/receiver" ) var errReceiverNotSupported = fmt.Errorf("The '%s' receiver is only supported on Windows", typeStr) func createMetricsReceiver( _ context.Context, - _ component.ReceiverCreateSettings, + _ receiver.CreateSettings, _ component.Config, _ consumer.Metrics, -) (component.MetricsReceiver, error) { +) (receiver.Metrics, error) { return nil, errReceiverNotSupported } diff --git a/receiver/activedirectorydsreceiver/factory_others_test.go b/receiver/activedirectorydsreceiver/factory_others_test.go index ff0c945e1a5c2..8c31bfb72bf58 100644 --- a/receiver/activedirectorydsreceiver/factory_others_test.go +++ b/receiver/activedirectorydsreceiver/factory_others_test.go @@ -22,14 +22,14 @@ import ( "testing" "github.com/stretchr/testify/require" - "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/consumer/consumertest" + "go.opentelemetry.io/collector/receiver" ) func TestCreateMetricsReceiver(t *testing.T) { t.Parallel() - recv, err := createMetricsReceiver(context.Background(), component.ReceiverCreateSettings{}, &Config{}, &consumertest.MetricsSink{}) + recv, err := createMetricsReceiver(context.Background(), receiver.CreateSettings{}, &Config{}, &consumertest.MetricsSink{}) require.Nil(t, recv) require.ErrorIs(t, err, errReceiverNotSupported) } diff --git a/receiver/activedirectorydsreceiver/factory_windows.go b/receiver/activedirectorydsreceiver/factory_windows.go index 51661489fa928..7f7294c6ef59b 100644 --- a/receiver/activedirectorydsreceiver/factory_windows.go +++ b/receiver/activedirectorydsreceiver/factory_windows.go @@ -23,6 +23,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/consumer" + "go.opentelemetry.io/collector/receiver" "go.opentelemetry.io/collector/receiver/scraperhelper" ) @@ -30,10 +31,10 @@ var errConfigNotActiveDirectory = fmt.Errorf("config is not valid for the '%s' r func createMetricsReceiver( ctx context.Context, - params component.ReceiverCreateSettings, + params receiver.CreateSettings, rConf component.Config, consumer consumer.Metrics, -) (component.MetricsReceiver, error) { +) (receiver.Metrics, error) { c, ok := rConf.(*Config) if !ok { return nil, errConfigNotActiveDirectory diff --git a/receiver/activedirectorydsreceiver/factory_windows_test.go b/receiver/activedirectorydsreceiver/factory_windows_test.go index 8b7fd9ca5409b..73d0dee800274 100644 --- a/receiver/activedirectorydsreceiver/factory_windows_test.go +++ b/receiver/activedirectorydsreceiver/factory_windows_test.go @@ -22,15 +22,15 @@ import ( "testing" "github.com/stretchr/testify/require" - "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/consumer/consumertest" + "go.opentelemetry.io/collector/receiver/receivertest" ) func TestCreateMetricsReceiver(t *testing.T) { t.Run("Nil config gives error", func(t *testing.T) { recv, err := createMetricsReceiver( context.Background(), - componenttest.NewNopReceiverCreateSettings(), + receivertest.NewNopCreateSettings(), nil, &consumertest.MetricsSink{}, ) @@ -43,7 +43,7 @@ func TestCreateMetricsReceiver(t *testing.T) { t.Run("Metrics receiver is created with default config", func(t *testing.T) { recv, err := createMetricsReceiver( context.Background(), - componenttest.NewNopReceiverCreateSettings(), + receivertest.NewNopCreateSettings(), createDefaultConfig(), &consumertest.MetricsSink{}, ) diff --git a/receiver/activedirectorydsreceiver/go.mod b/receiver/activedirectorydsreceiver/go.mod index cf90e4259476c..9e9e5577aa2d9 100644 --- a/receiver/activedirectorydsreceiver/go.mod +++ b/receiver/activedirectorydsreceiver/go.mod @@ -4,14 +4,14 @@ go 1.18 require ( github.com/google/go-cmp v0.5.9 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/winperfcounters v0.66.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/winperfcounters v0.67.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector v0.67.0 + go.opentelemetry.io/collector/component v0.67.0 + go.opentelemetry.io/collector/confmap v0.67.0 + go.opentelemetry.io/collector/consumer v0.67.0 + go.opentelemetry.io/collector/pdata v1.0.0-rc1 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.24.0 ) @@ -30,7 +30,7 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/featuregate v0.67.0 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/receiver/activedirectorydsreceiver/go.sum b/receiver/activedirectorydsreceiver/go.sum index 5de7b773cd41d..96c742c460dbe 100644 --- a/receiver/activedirectorydsreceiver/go.sum +++ b/receiver/activedirectorydsreceiver/go.sum @@ -280,18 +280,18 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/component v0.67.0 h1:GCBRZAqk4yNaT4L1uwlbbwophFHrxYccLZ4Uj1Ifs/M= +go.opentelemetry.io/collector/component v0.67.0/go.mod h1:Txa2lm9oe7xsGQN8u7GdUIrRpAHFIKsTO4Qi3/CSmKk= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/receiver/activedirectorydsreceiver/integration_test.go b/receiver/activedirectorydsreceiver/integration_test.go index ce81928de74a2..12e28bc9ff1f4 100644 --- a/receiver/activedirectorydsreceiver/integration_test.go +++ b/receiver/activedirectorydsreceiver/integration_test.go @@ -24,6 +24,7 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/consumer/consumertest" + "go.opentelemetry.io/collector/receiver/receivertest" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest/golden" @@ -39,7 +40,7 @@ func TestIntegration(t *testing.T) { fact := NewFactory() consumer := &consumertest.MetricsSink{} - recv, err := fact.CreateMetricsReceiver(context.Background(), componenttest.NewNopReceiverCreateSettings(), fact.CreateDefaultConfig(), consumer) + recv, err := fact.CreateMetricsReceiver(context.Background(), receivertest.NewNopCreateSettings(), fact.CreateDefaultConfig(), consumer) require.NoError(t, err) diff --git a/receiver/activedirectorydsreceiver/internal/metadata/generated_metrics.go b/receiver/activedirectorydsreceiver/internal/metadata/generated_metrics.go index 39b56c7cacd92..b1e6a877faa4e 100644 --- a/receiver/activedirectorydsreceiver/internal/metadata/generated_metrics.go +++ b/receiver/activedirectorydsreceiver/internal/metadata/generated_metrics.go @@ -9,6 +9,7 @@ import ( "go.opentelemetry.io/collector/confmap" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" + "go.opentelemetry.io/collector/receiver" ) // MetricSettings provides common settings for a particular metric. @@ -1276,7 +1277,7 @@ func WithStartTime(startTime pcommon.Timestamp) metricBuilderOption { } } -func NewMetricsBuilder(ms MetricsSettings, settings component.ReceiverCreateSettings, options ...metricBuilderOption) *MetricsBuilder { +func NewMetricsBuilder(ms MetricsSettings, settings receiver.CreateSettings, options ...metricBuilderOption) *MetricsBuilder { mb := &MetricsBuilder{ startTime: pcommon.NewTimestampFromTime(time.Now()), metricsBuffer: pmetric.NewMetrics(), diff --git a/receiver/activedirectorydsreceiver/internal/metadata/generated_metrics_test.go b/receiver/activedirectorydsreceiver/internal/metadata/generated_metrics_test.go index ed1cc45deda04..0cb8695198d80 100644 --- a/receiver/activedirectorydsreceiver/internal/metadata/generated_metrics_test.go +++ b/receiver/activedirectorydsreceiver/internal/metadata/generated_metrics_test.go @@ -7,9 +7,9 @@ import ( "testing" "github.com/stretchr/testify/assert" - "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" + "go.opentelemetry.io/collector/receiver/receivertest" "go.uber.org/zap" "go.uber.org/zap/zaptest/observer" ) @@ -17,7 +17,7 @@ import ( func TestDefaultMetrics(t *testing.T) { start := pcommon.Timestamp(1_000_000_000) ts := pcommon.Timestamp(1_000_001_000) - mb := NewMetricsBuilder(DefaultMetricsSettings(), componenttest.NewNopReceiverCreateSettings(), WithStartTime(start)) + mb := NewMetricsBuilder(DefaultMetricsSettings(), receivertest.NewNopCreateSettings(), WithStartTime(start)) enabledMetrics := make(map[string]bool) enabledMetrics["active_directory.ds.bind.rate"] = true @@ -113,7 +113,7 @@ func TestAllMetrics(t *testing.T) { ActiveDirectoryDsThreadCount: MetricSettings{Enabled: true}, } observedZapCore, observedLogs := observer.New(zap.WarnLevel) - settings := componenttest.NewNopReceiverCreateSettings() + settings := receivertest.NewNopCreateSettings() settings.Logger = zap.New(observedZapCore) mb := NewMetricsBuilder(metricsSettings, settings, WithStartTime(start)) @@ -441,7 +441,7 @@ func TestNoMetrics(t *testing.T) { ActiveDirectoryDsThreadCount: MetricSettings{Enabled: false}, } observedZapCore, observedLogs := observer.New(zap.WarnLevel) - settings := componenttest.NewNopReceiverCreateSettings() + settings := receivertest.NewNopCreateSettings() settings.Logger = zap.New(observedZapCore) mb := NewMetricsBuilder(metricsSettings, settings, WithStartTime(start)) diff --git a/receiver/activedirectorydsreceiver/scraper.go b/receiver/activedirectorydsreceiver/scraper.go index a41df87cec883..557dc7ba0ed87 100644 --- a/receiver/activedirectorydsreceiver/scraper.go +++ b/receiver/activedirectorydsreceiver/scraper.go @@ -25,6 +25,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" + "go.opentelemetry.io/collector/receiver" "go.opentelemetry.io/collector/receiver/scrapererror" "go.uber.org/multierr" @@ -36,7 +37,7 @@ type activeDirectoryDSScraper struct { w *watchers } -func newActiveDirectoryDSScraper(ms metadata.MetricsSettings, params component.ReceiverCreateSettings) *activeDirectoryDSScraper { +func newActiveDirectoryDSScraper(ms metadata.MetricsSettings, params receiver.CreateSettings) *activeDirectoryDSScraper { return &activeDirectoryDSScraper{ mb: metadata.NewMetricsBuilder(ms, params), } diff --git a/receiver/activedirectorydsreceiver/scraper_test.go b/receiver/activedirectorydsreceiver/scraper_test.go index 864deaa2a19cf..c557408dbc53e 100644 --- a/receiver/activedirectorydsreceiver/scraper_test.go +++ b/receiver/activedirectorydsreceiver/scraper_test.go @@ -24,7 +24,7 @@ import ( "testing" "github.com/stretchr/testify/require" - "go.opentelemetry.io/collector/component/componenttest" + "go.opentelemetry.io/collector/receiver/receivertest" "go.opentelemetry.io/collector/receiver/scrapererror" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest" @@ -46,7 +46,7 @@ func TestScrape(t *testing.T) { require.NoError(t, err) scraper := &activeDirectoryDSScraper{ - mb: metadata.NewMetricsBuilder(metadata.DefaultMetricsSettings(), componenttest.NewNopReceiverCreateSettings()), + mb: metadata.NewMetricsBuilder(metadata.DefaultMetricsSettings(), receivertest.NewNopCreateSettings()), w: mockWatchers, } @@ -78,7 +78,7 @@ func TestScrape(t *testing.T) { mockWatchers.counterNameToWatcher[draInboundValuesDNs].(*mockPerfCounterWatcher).scrapeErr = draInboundValuesDNErr scraper := &activeDirectoryDSScraper{ - mb: metadata.NewMetricsBuilder(metadata.DefaultMetricsSettings(), componenttest.NewNopReceiverCreateSettings()), + mb: metadata.NewMetricsBuilder(metadata.DefaultMetricsSettings(), receivertest.NewNopCreateSettings()), w: mockWatchers, } @@ -113,7 +113,7 @@ func TestScrape(t *testing.T) { mockWatchers.counterNameToWatcher[draInboundValuesDNs].(*mockPerfCounterWatcher).closeErr = draInboundValuesDNErr scraper := &activeDirectoryDSScraper{ - mb: metadata.NewMetricsBuilder(metadata.DefaultMetricsSettings(), componenttest.NewNopReceiverCreateSettings()), + mb: metadata.NewMetricsBuilder(metadata.DefaultMetricsSettings(), receivertest.NewNopCreateSettings()), w: mockWatchers, } @@ -132,7 +132,7 @@ func TestScrape(t *testing.T) { require.NoError(t, err) scraper := &activeDirectoryDSScraper{ - mb: metadata.NewMetricsBuilder(metadata.DefaultMetricsSettings(), componenttest.NewNopReceiverCreateSettings()), + mb: metadata.NewMetricsBuilder(metadata.DefaultMetricsSettings(), receivertest.NewNopCreateSettings()), w: mockWatchers, } diff --git a/receiver/aerospikereceiver/factory.go b/receiver/aerospikereceiver/factory.go index 5752bf08db12b..bf8b001ff6e46 100644 --- a/receiver/aerospikereceiver/factory.go +++ b/receiver/aerospikereceiver/factory.go @@ -21,6 +21,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer" + "go.opentelemetry.io/collector/receiver" "go.opentelemetry.io/collector/receiver/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/aerospikereceiver/internal/metadata" @@ -35,21 +36,21 @@ const ( ) // NewFactory creates a new ReceiverFactory with default configuration -func NewFactory() component.ReceiverFactory { - return component.NewReceiverFactory( +func NewFactory() receiver.Factory { + return receiver.NewFactory( typeStr, createDefaultConfig, - component.WithMetricsReceiver(createMetricsReceiver, stability), + receiver.WithMetrics(createMetricsReceiver, stability), ) } // createMetricsReceiver creates a new MetricsReceiver using scraperhelper func createMetricsReceiver( _ context.Context, - params component.ReceiverCreateSettings, + params receiver.CreateSettings, rConf component.Config, consumer consumer.Metrics, -) (component.MetricsReceiver, error) { +) (receiver.Metrics, error) { cfg := rConf.(*Config) receiver, err := newAerospikeReceiver(params, cfg, consumer) if err != nil { diff --git a/receiver/aerospikereceiver/go.mod b/receiver/aerospikereceiver/go.mod index e65c079d7c18d..898dd0ed78c72 100644 --- a/receiver/aerospikereceiver/go.mod +++ b/receiver/aerospikereceiver/go.mod @@ -4,14 +4,14 @@ go 1.18 require ( github.com/aerospike/aerospike-client-go/v6 v6.7.0 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest v0.66.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest v0.67.0 github.com/stretchr/testify v1.8.1 github.com/testcontainers/testcontainers-go v0.15.0 - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector v0.67.0 + go.opentelemetry.io/collector/component v0.67.0 + go.opentelemetry.io/collector/confmap v0.67.0 + go.opentelemetry.io/collector/consumer v0.67.0 + go.opentelemetry.io/collector/pdata v1.0.0-rc1 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.24.0 ) @@ -53,7 +53,7 @@ require ( github.com/stretchr/objx v0.5.0 // indirect github.com/yuin/gopher-lua v0.0.0-20220504180219-658193537a64 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/featuregate v0.67.0 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/receiver/aerospikereceiver/go.sum b/receiver/aerospikereceiver/go.sum index 4473f57765600..d9df64f466b56 100644 --- a/receiver/aerospikereceiver/go.sum +++ b/receiver/aerospikereceiver/go.sum @@ -834,18 +834,18 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/component v0.67.0 h1:GCBRZAqk4yNaT4L1uwlbbwophFHrxYccLZ4Uj1Ifs/M= +go.opentelemetry.io/collector/component v0.67.0/go.mod h1:Txa2lm9oe7xsGQN8u7GdUIrRpAHFIKsTO4Qi3/CSmKk= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/receiver/aerospikereceiver/integration_test.go b/receiver/aerospikereceiver/integration_test.go index 8d150ce1cddac..61a9bc30359ac 100644 --- a/receiver/aerospikereceiver/integration_test.go +++ b/receiver/aerospikereceiver/integration_test.go @@ -33,7 +33,9 @@ import ( "github.com/testcontainers/testcontainers-go/wait" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/consumer/consumertest" + "go.opentelemetry.io/collector/receiver/receivertest" + "github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest/golden" ) @@ -299,7 +301,7 @@ func TestAerospikeIntegration(t *testing.T) { cfg.ScraperControllerSettings.CollectionInterval = 100 * time.Millisecond consumer := new(consumertest.MetricsSink) - settings := componenttest.NewNopReceiverCreateSettings() + settings := receivertest.NewNopCreateSettings() receiver, err := f.CreateMetricsReceiver(context.Background(), settings, cfg, consumer) require.NoError(t, err, "failed creating metrics receiver") require.NoError(t, receiver.Start(context.Background(), componenttest.NewNopHost()), "failed starting metrics receiver") @@ -321,7 +323,7 @@ func TestAerospikeIntegration(t *testing.T) { cfg.CollectClusterMetrics = true consumer = new(consumertest.MetricsSink) - settings = componenttest.NewNopReceiverCreateSettings() + settings = receivertest.NewNopCreateSettings() receiver, err = f.CreateMetricsReceiver(context.Background(), settings, cfg, consumer) require.NoError(t, err, "failed creating metrics receiver") time.Sleep(time.Second / 2) diff --git a/receiver/aerospikereceiver/internal/metadata/generated_metrics.go b/receiver/aerospikereceiver/internal/metadata/generated_metrics.go index 6e64f4e3bfc61..cf723ee55e760 100644 --- a/receiver/aerospikereceiver/internal/metadata/generated_metrics.go +++ b/receiver/aerospikereceiver/internal/metadata/generated_metrics.go @@ -11,6 +11,7 @@ import ( "go.opentelemetry.io/collector/confmap" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" + "go.opentelemetry.io/collector/receiver" ) // MetricSettings provides common settings for a particular metric. @@ -1193,7 +1194,7 @@ func WithStartTime(startTime pcommon.Timestamp) metricBuilderOption { } } -func NewMetricsBuilder(ms MetricsSettings, settings component.ReceiverCreateSettings, options ...metricBuilderOption) *MetricsBuilder { +func NewMetricsBuilder(ms MetricsSettings, settings receiver.CreateSettings, options ...metricBuilderOption) *MetricsBuilder { mb := &MetricsBuilder{ startTime: pcommon.NewTimestampFromTime(time.Now()), metricsBuffer: pmetric.NewMetrics(), diff --git a/receiver/aerospikereceiver/internal/metadata/generated_metrics_test.go b/receiver/aerospikereceiver/internal/metadata/generated_metrics_test.go index 7153e1791a739..4c8d915385fe5 100644 --- a/receiver/aerospikereceiver/internal/metadata/generated_metrics_test.go +++ b/receiver/aerospikereceiver/internal/metadata/generated_metrics_test.go @@ -7,9 +7,9 @@ import ( "testing" "github.com/stretchr/testify/assert" - "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" + "go.opentelemetry.io/collector/receiver/receivertest" "go.uber.org/zap" "go.uber.org/zap/zaptest/observer" ) @@ -17,7 +17,7 @@ import ( func TestDefaultMetrics(t *testing.T) { start := pcommon.Timestamp(1_000_000_000) ts := pcommon.Timestamp(1_000_001_000) - mb := NewMetricsBuilder(DefaultMetricsSettings(), componenttest.NewNopReceiverCreateSettings(), WithStartTime(start)) + mb := NewMetricsBuilder(DefaultMetricsSettings(), receivertest.NewNopCreateSettings(), WithStartTime(start)) enabledMetrics := make(map[string]bool) enabledMetrics["aerospike.namespace.disk.available"] = true @@ -97,7 +97,7 @@ func TestAllMetrics(t *testing.T) { AerospikeNodeQueryTracked: MetricSettings{Enabled: true}, } observedZapCore, observedLogs := observer.New(zap.WarnLevel) - settings := componenttest.NewNopReceiverCreateSettings() + settings := receivertest.NewNopCreateSettings() settings.Logger = zap.New(observedZapCore) mb := NewMetricsBuilder(metricsSettings, settings, WithStartTime(start)) @@ -374,7 +374,7 @@ func TestNoMetrics(t *testing.T) { AerospikeNodeQueryTracked: MetricSettings{Enabled: false}, } observedZapCore, observedLogs := observer.New(zap.WarnLevel) - settings := componenttest.NewNopReceiverCreateSettings() + settings := receivertest.NewNopCreateSettings() settings.Logger = zap.New(observedZapCore) mb := NewMetricsBuilder(metricsSettings, settings, WithStartTime(start)) diff --git a/receiver/aerospikereceiver/scraper.go b/receiver/aerospikereceiver/scraper.go index 1a3d5c1fca13e..ef91d65af421d 100644 --- a/receiver/aerospikereceiver/scraper.go +++ b/receiver/aerospikereceiver/scraper.go @@ -27,6 +27,7 @@ import ( "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" + "go.opentelemetry.io/collector/receiver" "go.opentelemetry.io/collector/receiver/scrapererror" "go.uber.org/zap" @@ -49,7 +50,7 @@ type clientFactoryFunc func() (Aerospike, error) // newAerospikeReceiver creates a new aerospikeReceiver connected to the endpoint provided in cfg // // If the host or port can't be parsed from endpoint, an error is returned. -func newAerospikeReceiver(params component.ReceiverCreateSettings, cfg *Config, consumer consumer.Metrics) (*aerospikeReceiver, error) { +func newAerospikeReceiver(params receiver.CreateSettings, cfg *Config, consumer consumer.Metrics) (*aerospikeReceiver, error) { var err error var tlsCfg *tls.Config if cfg.TLS != nil { diff --git a/receiver/aerospikereceiver/scraper_test.go b/receiver/aerospikereceiver/scraper_test.go index a66779afe552b..01ea01fb50dfc 100644 --- a/receiver/aerospikereceiver/scraper_test.go +++ b/receiver/aerospikereceiver/scraper_test.go @@ -21,11 +21,12 @@ import ( "time" "github.com/stretchr/testify/require" - "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" + "go.opentelemetry.io/collector/receiver" + "go.opentelemetry.io/collector/receiver/receivertest" "go.uber.org/zap" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest" @@ -59,7 +60,7 @@ func TestNewAerospikeReceiver_BadEndpoint(t *testing.T) { t.Parallel() cfg := &Config{Endpoint: tc.endpoint} - receiver, err := newAerospikeReceiver(component.ReceiverCreateSettings{}, cfg, cs) + receiver, err := newAerospikeReceiver(receiver.CreateSettings{}, cfg, cs) require.ErrorContains(t, err, tc.errMsg) require.Nil(t, receiver) }) @@ -73,7 +74,7 @@ func TestScrape_CollectClusterMetrics(t *testing.T) { require.NoError(t, err) now := pcommon.NewTimestampFromTime(time.Now().UTC()) - expectedMB := metadata.NewMetricsBuilder(metadata.DefaultMetricsSettings(), componenttest.NewNopReceiverCreateSettings()) + expectedMB := metadata.NewMetricsBuilder(metadata.DefaultMetricsSettings(), receivertest.NewNopCreateSettings()) require.NoError(t, expectedMB.RecordAerospikeNodeConnectionOpenDataPoint(now, "22", metadata.AttributeConnectionTypeClient)) expectedMB.EmitForResource(metadata.WithAerospikeNodeName("BB990C28F270008")) @@ -139,7 +140,7 @@ func TestScrape_CollectClusterMetrics(t *testing.T) { receiver := &aerospikeReceiver{ clientFactory: clientFactory, - mb: metadata.NewMetricsBuilder(metadata.DefaultMetricsSettings(), componenttest.NewNopReceiverCreateSettings()), + mb: metadata.NewMetricsBuilder(metadata.DefaultMetricsSettings(), receivertest.NewNopCreateSettings()), logger: logger.Sugar(), config: &Config{ CollectClusterMetrics: true, @@ -160,7 +161,7 @@ func TestScrape_CollectClusterMetrics(t *testing.T) { receiverConnErr := &aerospikeReceiver{ clientFactory: clientFactoryNeg, - mb: metadata.NewMetricsBuilder(metadata.DefaultMetricsSettings(), componenttest.NewNopReceiverCreateSettings()), + mb: metadata.NewMetricsBuilder(metadata.DefaultMetricsSettings(), receivertest.NewNopCreateSettings()), logger: logger.Sugar(), config: &Config{ CollectClusterMetrics: true, diff --git a/receiver/apachereceiver/factory.go b/receiver/apachereceiver/factory.go index fd2e8ee51fec2..ad09d13deff98 100644 --- a/receiver/apachereceiver/factory.go +++ b/receiver/apachereceiver/factory.go @@ -23,6 +23,7 @@ import ( "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/consumer" + "go.opentelemetry.io/collector/receiver" "go.opentelemetry.io/collector/receiver/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/apachereceiver/internal/metadata" @@ -37,11 +38,11 @@ const ( ) // NewFactory creates a factory for apache receiver. -func NewFactory() component.ReceiverFactory { - return component.NewReceiverFactory( +func NewFactory() receiver.Factory { + return receiver.NewFactory( typeStr, createDefaultConfig, - component.WithMetricsReceiver(createMetricsReceiver, stability)) + receiver.WithMetrics(createMetricsReceiver, stability)) } func createDefaultConfig() component.Config { @@ -77,10 +78,10 @@ func parseResourseAttributes(endpoint string) (string, string, error) { func createMetricsReceiver( _ context.Context, - params component.ReceiverCreateSettings, + params receiver.CreateSettings, rConf component.Config, consumer consumer.Metrics, -) (component.MetricsReceiver, error) { +) (receiver.Metrics, error) { cfg := rConf.(*Config) serverName, port, err := parseResourseAttributes(cfg.Endpoint) if err != nil { diff --git a/receiver/apachereceiver/factory_test.go b/receiver/apachereceiver/factory_test.go index f1dbbc9d419c5..72c369bff60bf 100644 --- a/receiver/apachereceiver/factory_test.go +++ b/receiver/apachereceiver/factory_test.go @@ -21,8 +21,8 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/consumer/consumertest" + "go.opentelemetry.io/collector/receiver/receivertest" "go.opentelemetry.io/collector/receiver/scraperhelper" ) @@ -41,7 +41,7 @@ func TestCreateMetricsReceiver(t *testing.T) { factory := NewFactory() metricsReceiver, err := factory.CreateMetricsReceiver( context.Background(), - componenttest.NewNopReceiverCreateSettings(), + receivertest.NewNopCreateSettings(), &Config{ ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ CollectionInterval: 10 * time.Second, diff --git a/receiver/apachereceiver/go.mod b/receiver/apachereceiver/go.mod index 4bd3cb2c7cb42..52b6e2b2eb2ba 100644 --- a/receiver/apachereceiver/go.mod +++ b/receiver/apachereceiver/go.mod @@ -3,15 +3,15 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/receiver/apache go 1.18 require ( - github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest v0.66.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest v0.67.0 github.com/stretchr/testify v1.8.1 github.com/testcontainers/testcontainers-go v0.15.0 - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector v0.67.0 + go.opentelemetry.io/collector/component v0.67.0 + go.opentelemetry.io/collector/confmap v0.67.0 + go.opentelemetry.io/collector/consumer v0.67.0 + go.opentelemetry.io/collector/featuregate v0.67.0 + go.opentelemetry.io/collector/pdata v1.0.0-rc1 go.uber.org/zap v1.24.0 ) diff --git a/receiver/apachereceiver/go.sum b/receiver/apachereceiver/go.sum index 3415b043e3dbe..9c94f35373c4d 100644 --- a/receiver/apachereceiver/go.sum +++ b/receiver/apachereceiver/go.sum @@ -828,18 +828,18 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/component v0.67.0 h1:GCBRZAqk4yNaT4L1uwlbbwophFHrxYccLZ4Uj1Ifs/M= +go.opentelemetry.io/collector/component v0.67.0/go.mod h1:Txa2lm9oe7xsGQN8u7GdUIrRpAHFIKsTO4Qi3/CSmKk= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 h1:aUEBEdCa6iamGzg6fuYxDA8ThxvOG240mAvWDU+XLio= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4/go.mod h1:l2MdsbKTocpPS5nQZscqTR9jd8u96VYZdcpF8Sye7mA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= diff --git a/receiver/apachereceiver/integration_test.go b/receiver/apachereceiver/integration_test.go index 7f76d0e1287c2..36c0f443c218f 100644 --- a/receiver/apachereceiver/integration_test.go +++ b/receiver/apachereceiver/integration_test.go @@ -35,6 +35,7 @@ import ( "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/consumer/consumertest" "go.opentelemetry.io/collector/featuregate" + "go.opentelemetry.io/collector/receiver/receivertest" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest/golden" @@ -66,7 +67,7 @@ func TestApacheIntegration(t *testing.T) { cfg.Endpoint = fmt.Sprintf("http://%s/server-status?auto", net.JoinHostPort(hostname, "8081")) consumer := new(consumertest.MetricsSink) - settings := componenttest.NewNopReceiverCreateSettings() + settings := receivertest.NewNopCreateSettings() rcvr, err := f.CreateMetricsReceiver(context.Background(), settings, cfg, consumer) require.NoError(t, err, "failed creating metrics receiver") require.NoError(t, rcvr.Start(context.Background(), componenttest.NewNopHost())) diff --git a/receiver/apachereceiver/internal/metadata/generated_metrics.go b/receiver/apachereceiver/internal/metadata/generated_metrics.go index 29d2edce95fd4..eefe8ddd3fb82 100644 --- a/receiver/apachereceiver/internal/metadata/generated_metrics.go +++ b/receiver/apachereceiver/internal/metadata/generated_metrics.go @@ -11,6 +11,7 @@ import ( "go.opentelemetry.io/collector/confmap" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" + "go.opentelemetry.io/collector/receiver" ) // MetricSettings provides common settings for a particular metric. @@ -881,7 +882,7 @@ func WithStartTime(startTime pcommon.Timestamp) metricBuilderOption { } } -func NewMetricsBuilder(ms MetricsSettings, settings component.ReceiverCreateSettings, options ...metricBuilderOption) *MetricsBuilder { +func NewMetricsBuilder(ms MetricsSettings, settings receiver.CreateSettings, options ...metricBuilderOption) *MetricsBuilder { mb := &MetricsBuilder{ startTime: pcommon.NewTimestampFromTime(time.Now()), metricsBuffer: pmetric.NewMetrics(), diff --git a/receiver/apachereceiver/internal/metadata/generated_metrics_test.go b/receiver/apachereceiver/internal/metadata/generated_metrics_test.go index 7420db8e77dc7..ca2d044ccbbcb 100644 --- a/receiver/apachereceiver/internal/metadata/generated_metrics_test.go +++ b/receiver/apachereceiver/internal/metadata/generated_metrics_test.go @@ -7,9 +7,9 @@ import ( "testing" "github.com/stretchr/testify/assert" - "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" + "go.opentelemetry.io/collector/receiver/receivertest" "go.uber.org/zap" "go.uber.org/zap/zaptest/observer" ) @@ -17,7 +17,7 @@ import ( func TestDefaultMetrics(t *testing.T) { start := pcommon.Timestamp(1_000_000_000) ts := pcommon.Timestamp(1_000_001_000) - mb := NewMetricsBuilder(DefaultMetricsSettings(), componenttest.NewNopReceiverCreateSettings(), WithStartTime(start)) + mb := NewMetricsBuilder(DefaultMetricsSettings(), receivertest.NewNopCreateSettings(), WithStartTime(start)) enabledMetrics := make(map[string]bool) enabledMetrics["apache.cpu.load"] = true @@ -89,7 +89,7 @@ func TestAllMetrics(t *testing.T) { ApacheWorkers: MetricSettings{Enabled: true}, } observedZapCore, observedLogs := observer.New(zap.WarnLevel) - settings := componenttest.NewNopReceiverCreateSettings() + settings := receivertest.NewNopCreateSettings() settings.Logger = zap.New(observedZapCore) mb := NewMetricsBuilder(metricsSettings, settings, WithStartTime(start)) @@ -313,7 +313,7 @@ func TestNoMetrics(t *testing.T) { ApacheWorkers: MetricSettings{Enabled: false}, } observedZapCore, observedLogs := observer.New(zap.WarnLevel) - settings := componenttest.NewNopReceiverCreateSettings() + settings := receivertest.NewNopCreateSettings() settings.Logger = zap.New(observedZapCore) mb := NewMetricsBuilder(metricsSettings, settings, WithStartTime(start)) diff --git a/receiver/apachereceiver/scraper.go b/receiver/apachereceiver/scraper.go index eb03de7e7b3a9..323903110c617 100644 --- a/receiver/apachereceiver/scraper.go +++ b/receiver/apachereceiver/scraper.go @@ -28,6 +28,7 @@ import ( "go.opentelemetry.io/collector/featuregate" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" + "go.opentelemetry.io/collector/receiver" "go.opentelemetry.io/collector/receiver/scrapererror" "go.uber.org/zap" @@ -69,7 +70,7 @@ type apacheScraper struct { } func newApacheScraper( - settings component.ReceiverCreateSettings, + settings receiver.CreateSettings, cfg *Config, serverName string, port string, diff --git a/receiver/apachereceiver/scraper_test.go b/receiver/apachereceiver/scraper_test.go index 8f3faf1a4ac04..adbe32ab28992 100644 --- a/receiver/apachereceiver/scraper_test.go +++ b/receiver/apachereceiver/scraper_test.go @@ -29,6 +29,7 @@ import ( "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/config/configtls" + "go.opentelemetry.io/collector/receiver/receivertest" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest/golden" @@ -45,7 +46,7 @@ func TestScraper(t *testing.T) { serverName, port, err := parseResourseAttributes(cfg.Endpoint) require.NoError(t, err) - scraper := newApacheScraper(componenttest.NewNopReceiverCreateSettings(), cfg, serverName, port) + scraper := newApacheScraper(receivertest.NewNopCreateSettings(), cfg, serverName, port) err = scraper.start(context.Background(), componenttest.NewNopHost()) require.NoError(t, err) @@ -66,7 +67,7 @@ func TestScraper(t *testing.T) { } func TestScraperFailedStart(t *testing.T) { - sc := newApacheScraper(componenttest.NewNopReceiverCreateSettings(), &Config{ + sc := newApacheScraper(receivertest.NewNopCreateSettings(), &Config{ HTTPClientSettings: confighttp.HTTPClientSettings{ Endpoint: "localhost:8080", TLSSetting: configtls.TLSClientSetting{ @@ -168,7 +169,7 @@ BytesPerSec: 73.12 func TestScraperError(t *testing.T) { t.Run("no client", func(t *testing.T) { - sc := newApacheScraper(componenttest.NewNopReceiverCreateSettings(), &Config{}, "", "") + sc := newApacheScraper(receivertest.NewNopCreateSettings(), &Config{}, "", "") sc.httpClient = nil _, err := sc.scrape(context.Background()) diff --git a/receiver/awscloudwatchreceiver/factory.go b/receiver/awscloudwatchreceiver/factory.go index 8c8d1ba71de67..4f42bbb6ec855 100644 --- a/receiver/awscloudwatchreceiver/factory.go +++ b/receiver/awscloudwatchreceiver/factory.go @@ -20,6 +20,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer" + "go.opentelemetry.io/collector/receiver" ) const ( @@ -28,20 +29,20 @@ const ( ) // NewFactory returns the component factory for the awscloudwatchreceiver -func NewFactory() component.ReceiverFactory { - return component.NewReceiverFactory( +func NewFactory() receiver.Factory { + return receiver.NewFactory( typeStr, createDefaultConfig, - component.WithLogsReceiver(createLogsReceiver, stabilityLevel), + receiver.WithLogs(createLogsReceiver, stabilityLevel), ) } func createLogsReceiver( ctx context.Context, - params component.ReceiverCreateSettings, + params receiver.CreateSettings, rConf component.Config, consumer consumer.Logs, -) (component.LogsReceiver, error) { +) (receiver.Logs, error) { cfg := rConf.(*Config) rcvr := newLogsReceiver(cfg, params.Logger, consumer) return rcvr, nil diff --git a/receiver/awscloudwatchreceiver/factory_test.go b/receiver/awscloudwatchreceiver/factory_test.go index ceafa8a681e3f..6a8c4242a1e89 100644 --- a/receiver/awscloudwatchreceiver/factory_test.go +++ b/receiver/awscloudwatchreceiver/factory_test.go @@ -19,7 +19,7 @@ import ( "testing" "github.com/stretchr/testify/require" - "go.opentelemetry.io/collector/component/componenttest" + "go.opentelemetry.io/collector/receiver/receivertest" ) func TestType(t *testing.T) { @@ -33,7 +33,7 @@ func TestCreateLogsReceiver(t *testing.T) { cfg.Region = "us-west-2" _, err := NewFactory().CreateLogsReceiver( context.Background(), - componenttest.NewNopReceiverCreateSettings(), + receivertest.NewNopCreateSettings(), cfg, nil, ) diff --git a/receiver/awscloudwatchreceiver/go.mod b/receiver/awscloudwatchreceiver/go.mod index 5861ccc1c188b..20c458007e129 100644 --- a/receiver/awscloudwatchreceiver/go.mod +++ b/receiver/awscloudwatchreceiver/go.mod @@ -5,11 +5,11 @@ go 1.18 require ( github.com/aws/aws-sdk-go v1.44.155 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector v0.67.0 + go.opentelemetry.io/collector/component v0.67.0 + go.opentelemetry.io/collector/confmap v0.67.0 + go.opentelemetry.io/collector/consumer v0.67.0 + go.opentelemetry.io/collector/pdata v1.0.0-rc1 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.24.0 ) @@ -28,7 +28,7 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/stretchr/objx v0.5.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/featuregate v0.67.0 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/receiver/awscloudwatchreceiver/go.sum b/receiver/awscloudwatchreceiver/go.sum index 5ea0b1e6d9e8b..b73f5570ccda9 100644 --- a/receiver/awscloudwatchreceiver/go.sum +++ b/receiver/awscloudwatchreceiver/go.sum @@ -263,18 +263,18 @@ github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5t go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A= go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/component v0.67.0 h1:GCBRZAqk4yNaT4L1uwlbbwophFHrxYccLZ4Uj1Ifs/M= +go.opentelemetry.io/collector/component v0.67.0/go.mod h1:Txa2lm9oe7xsGQN8u7GdUIrRpAHFIKsTO4Qi3/CSmKk= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/metric v0.33.0 h1:xQAyl7uGEYvrLAiV/09iTJlp1pZnQ9Wl793qbVvED1E= diff --git a/receiver/awscloudwatchreceiver/integration_test.go b/receiver/awscloudwatchreceiver/integration_test.go index 525f4aa278c60..60a1023569ca1 100644 --- a/receiver/awscloudwatchreceiver/integration_test.go +++ b/receiver/awscloudwatchreceiver/integration_test.go @@ -29,6 +29,7 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/consumer/consumertest" + "go.opentelemetry.io/collector/receiver/receivertest" ) func TestLoggingIntegration(t *testing.T) { @@ -48,7 +49,7 @@ func TestLoggingIntegration(t *testing.T) { } recv, err := NewFactory().CreateLogsReceiver( context.Background(), - componenttest.NewNopReceiverCreateSettings(), + receivertest.NewNopCreateSettings(), cfg, sink, ) diff --git a/receiver/awscontainerinsightreceiver/factory.go b/receiver/awscontainerinsightreceiver/factory.go index 66f430fc744bf..1c3bf5afa7b46 100644 --- a/receiver/awscontainerinsightreceiver/factory.go +++ b/receiver/awscontainerinsightreceiver/factory.go @@ -21,6 +21,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer" + "go.opentelemetry.io/collector/receiver" ) // Factory for awscontainerinsightreceiver @@ -48,11 +49,11 @@ const ( ) // NewFactory creates a factory for AWS container insight receiver -func NewFactory() component.ReceiverFactory { - return component.NewReceiverFactory( +func NewFactory() receiver.Factory { + return receiver.NewFactory( typeStr, createDefaultConfig, - component.WithMetricsReceiver(createMetricsReceiver, stability)) + receiver.WithMetrics(createMetricsReceiver, stability)) } // createDefaultConfig returns a default config for the receiver. @@ -70,10 +71,10 @@ func createDefaultConfig() component.Config { // CreateMetricsReceiver creates an AWS Container Insight receiver. func createMetricsReceiver( _ context.Context, - params component.ReceiverCreateSettings, + params receiver.CreateSettings, baseCfg component.Config, consumer consumer.Metrics, -) (component.MetricsReceiver, error) { +) (receiver.Metrics, error) { rCfg := baseCfg.(*Config) return newAWSContainerInsightReceiver(params.TelemetrySettings, rCfg, consumer) diff --git a/receiver/awscontainerinsightreceiver/factory_test.go b/receiver/awscontainerinsightreceiver/factory_test.go index c28af3d7080f9..143d3b675a844 100644 --- a/receiver/awscontainerinsightreceiver/factory_test.go +++ b/receiver/awscontainerinsightreceiver/factory_test.go @@ -20,8 +20,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/consumer/consumertest" + "go.opentelemetry.io/collector/receiver/receivertest" ) func TestNewFactory(t *testing.T) { @@ -32,7 +32,7 @@ func TestNewFactory(t *testing.T) { func TestCreateMetricsReceiver(t *testing.T) { metricsReceiver, _ := createMetricsReceiver( context.Background(), - componenttest.NewNopReceiverCreateSettings(), + receivertest.NewNopCreateSettings(), createDefaultConfig(), consumertest.NewNop(), ) diff --git a/receiver/awscontainerinsightreceiver/go.mod b/receiver/awscontainerinsightreceiver/go.mod index e2b3a9a44516c..f8ece2a154b47 100644 --- a/receiver/awscontainerinsightreceiver/go.mod +++ b/receiver/awscontainerinsightreceiver/go.mod @@ -5,19 +5,19 @@ go 1.18 require ( github.com/aws/aws-sdk-go v1.44.155 github.com/google/cadvisor v0.46.0 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/containerinsight v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/k8s v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/metrics v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/kubelet v0.66.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/containerinsight v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/k8s v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/metrics v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/kubelet v0.67.0 github.com/shirou/gopsutil/v3 v3.22.10 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector v0.67.0 + go.opentelemetry.io/collector/component v0.67.0 + go.opentelemetry.io/collector/confmap v0.67.0 + go.opentelemetry.io/collector/consumer v0.67.0 + go.opentelemetry.io/collector/pdata v1.0.0-rc1 go.uber.org/zap v1.24.0 k8s.io/api v0.25.4 k8s.io/apimachinery v0.25.4 @@ -81,7 +81,7 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/mrunalp/fileutils v0.5.0 // indirect github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.66.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.67.0 // indirect github.com/opencontainers/go-digest v1.0.0 // indirect github.com/opencontainers/image-spec v1.0.2 // indirect github.com/opencontainers/runc v1.1.4 // indirect @@ -106,7 +106,7 @@ require ( github.com/vishvananda/netlink v1.1.1-0.20201029203352-d40f9887b852 // indirect github.com/vishvananda/netns v0.0.0-20200728191858-db3c7e526aae // indirect github.com/yusufpapurcu/wmi v1.2.2 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/featuregate v0.67.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect diff --git a/receiver/awscontainerinsightreceiver/go.sum b/receiver/awscontainerinsightreceiver/go.sum index c7b8df2d20051..bb40c8b005d38 100644 --- a/receiver/awscontainerinsightreceiver/go.sum +++ b/receiver/awscontainerinsightreceiver/go.sum @@ -576,18 +576,18 @@ 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 v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/component v0.67.0 h1:GCBRZAqk4yNaT4L1uwlbbwophFHrxYccLZ4Uj1Ifs/M= +go.opentelemetry.io/collector/component v0.67.0/go.mod h1:Txa2lm9oe7xsGQN8u7GdUIrRpAHFIKsTO4Qi3/CSmKk= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 h1:aUEBEdCa6iamGzg6fuYxDA8ThxvOG240mAvWDU+XLio= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4/go.mod h1:l2MdsbKTocpPS5nQZscqTR9jd8u96VYZdcpF8Sye7mA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= diff --git a/receiver/awscontainerinsightreceiver/receiver.go b/receiver/awscontainerinsightreceiver/receiver.go index 4096981dbbcdd..9e7ff18465676 100644 --- a/receiver/awscontainerinsightreceiver/receiver.go +++ b/receiver/awscontainerinsightreceiver/receiver.go @@ -22,6 +22,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/pdata/pmetric" + "go.opentelemetry.io/collector/receiver" "go.uber.org/zap" ci "github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/containerinsight" @@ -32,13 +33,13 @@ import ( "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver/internal/stores" ) -var _ component.MetricsReceiver = (*awsContainerInsightReceiver)(nil) +var _ receiver.Metrics = (*awsContainerInsightReceiver)(nil) type metricsProvider interface { GetMetrics() []pmetric.Metrics } -// awsContainerInsightReceiver implements the component.MetricsReceiver +// awsContainerInsightReceiver implements the receiver.Metrics type awsContainerInsightReceiver struct { settings component.TelemetrySettings nextConsumer consumer.Metrics @@ -52,7 +53,7 @@ type awsContainerInsightReceiver struct { func newAWSContainerInsightReceiver( settings component.TelemetrySettings, config *Config, - nextConsumer consumer.Metrics) (component.MetricsReceiver, error) { + nextConsumer consumer.Metrics) (receiver.Metrics, error) { if nextConsumer == nil { return nil, component.ErrNilNextConsumer } diff --git a/receiver/awsecscontainermetricsreceiver/factory.go b/receiver/awsecscontainermetricsreceiver/factory.go index 3402365809db2..4d100282bf3fb 100644 --- a/receiver/awsecscontainermetricsreceiver/factory.go +++ b/receiver/awsecscontainermetricsreceiver/factory.go @@ -23,6 +23,7 @@ import ( "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/consumer" + "go.opentelemetry.io/collector/receiver" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/ecsutil" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/ecsutil/endpoints" @@ -41,11 +42,11 @@ const ( ) // NewFactory creates a factory for AWS ECS Container Metrics receiver. -func NewFactory() component.ReceiverFactory { - return component.NewReceiverFactory( +func NewFactory() receiver.Factory { + return receiver.NewFactory( typeStr, createDefaultConfig, - component.WithMetricsReceiver(createMetricsReceiver, stability)) + receiver.WithMetrics(createMetricsReceiver, stability)) } // createDefaultConfig returns a default config for the receiver. @@ -59,10 +60,10 @@ func createDefaultConfig() component.Config { // CreateMetricsReceiver creates an AWS ECS Container Metrics receiver. func createMetricsReceiver( ctx context.Context, - params component.ReceiverCreateSettings, + params receiver.CreateSettings, baseCfg component.Config, consumer consumer.Metrics, -) (component.MetricsReceiver, error) { +) (receiver.Metrics, error) { endpoint, err := endpoints.GetTMEV4FromEnv() if err != nil || endpoint == nil { return nil, fmt.Errorf("unable to detect task metadata endpoint: %w", err) diff --git a/receiver/awsecscontainermetricsreceiver/factory_test.go b/receiver/awsecscontainermetricsreceiver/factory_test.go index a763b0dc37696..077258cfa0244 100644 --- a/receiver/awsecscontainermetricsreceiver/factory_test.go +++ b/receiver/awsecscontainermetricsreceiver/factory_test.go @@ -21,6 +21,7 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/consumer/consumertest" + "go.opentelemetry.io/collector/receiver/receivertest" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/ecsutil/endpoints" ) @@ -33,7 +34,7 @@ func TestValidConfig(t *testing.T) { func TestCreateMetricsReceiver(t *testing.T) { metricsReceiver, err := createMetricsReceiver( context.Background(), - componenttest.NewNopReceiverCreateSettings(), + receivertest.NewNopCreateSettings(), createDefaultConfig(), consumertest.NewNop(), ) @@ -46,7 +47,7 @@ func TestCreateMetricsReceiverWithEnv(t *testing.T) { metricsReceiver, err := createMetricsReceiver( context.Background(), - componenttest.NewNopReceiverCreateSettings(), + receivertest.NewNopCreateSettings(), createDefaultConfig(), consumertest.NewNop(), ) @@ -59,7 +60,7 @@ func TestCreateMetricsReceiverWithBadUrl(t *testing.T) { metricsReceiver, err := createMetricsReceiver( context.Background(), - componenttest.NewNopReceiverCreateSettings(), + receivertest.NewNopCreateSettings(), createDefaultConfig(), consumertest.NewNop(), ) @@ -70,7 +71,7 @@ func TestCreateMetricsReceiverWithBadUrl(t *testing.T) { func TestCreateMetricsReceiverWithNilConsumer(t *testing.T) { metricsReceiver, err := createMetricsReceiver( context.Background(), - componenttest.NewNopReceiverCreateSettings(), + receivertest.NewNopCreateSettings(), createDefaultConfig(), nil, ) diff --git a/receiver/awsecscontainermetricsreceiver/go.mod b/receiver/awsecscontainermetricsreceiver/go.mod index d5ede521741f0..3a6adbc596245 100644 --- a/receiver/awsecscontainermetricsreceiver/go.mod +++ b/receiver/awsecscontainermetricsreceiver/go.mod @@ -3,15 +3,15 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsecs go 1.18 require ( - github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/ecsutil v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.66.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/ecsutil v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.67.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector v0.67.0 + go.opentelemetry.io/collector/component v0.67.0 + go.opentelemetry.io/collector/confmap v0.67.0 + go.opentelemetry.io/collector/consumer v0.67.0 + go.opentelemetry.io/collector/pdata v1.0.0-rc1 + go.opentelemetry.io/collector/semconv v0.67.0 go.uber.org/zap v1.24.0 ) @@ -33,7 +33,7 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rs/cors v1.8.2 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/featuregate v0.67.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect diff --git a/receiver/awsecscontainermetricsreceiver/go.sum b/receiver/awsecscontainermetricsreceiver/go.sum index 5c83ceb20247f..eca61c55156c8 100644 --- a/receiver/awsecscontainermetricsreceiver/go.sum +++ b/receiver/awsecscontainermetricsreceiver/go.sum @@ -271,20 +271,20 @@ github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1 go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A= go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 h1:Q5L9Urod3c8as6ZYaoaqBjarx/HXxsxy34DFZIU2fO4= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/component v0.67.0 h1:GCBRZAqk4yNaT4L1uwlbbwophFHrxYccLZ4Uj1Ifs/M= +go.opentelemetry.io/collector/component v0.67.0/go.mod h1:Txa2lm9oe7xsGQN8u7GdUIrRpAHFIKsTO4Qi3/CSmKk= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= +go.opentelemetry.io/collector/semconv v0.67.0 h1:zLAvcQa6Kgow52FFLrmk7/9ZVtEYyA73+xDtCcFG78Q= +go.opentelemetry.io/collector/semconv v0.67.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 h1:aUEBEdCa6iamGzg6fuYxDA8ThxvOG240mAvWDU+XLio= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4/go.mod h1:l2MdsbKTocpPS5nQZscqTR9jd8u96VYZdcpF8Sye7mA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= diff --git a/receiver/awsecscontainermetricsreceiver/receiver.go b/receiver/awsecscontainermetricsreceiver/receiver.go index 0c6fa2b395649..76b4a488889f8 100644 --- a/receiver/awsecscontainermetricsreceiver/receiver.go +++ b/receiver/awsecscontainermetricsreceiver/receiver.go @@ -20,15 +20,16 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/consumer" + "go.opentelemetry.io/collector/receiver" "go.uber.org/zap" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/ecsutil" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsecscontainermetricsreceiver/internal/awsecscontainermetrics" ) -var _ component.MetricsReceiver = (*awsEcsContainerMetricsReceiver)(nil) +var _ receiver.Metrics = (*awsEcsContainerMetricsReceiver)(nil) -// awsEcsContainerMetricsReceiver implements the component.MetricsReceiver for aws ecs container metrics. +// awsEcsContainerMetricsReceiver implements the receiver.Metrics for aws ecs container metrics. type awsEcsContainerMetricsReceiver struct { logger *zap.Logger nextConsumer consumer.Metrics @@ -43,7 +44,7 @@ func newAWSECSContainermetrics( logger *zap.Logger, config *Config, nextConsumer consumer.Metrics, - rest ecsutil.RestClient) (component.MetricsReceiver, error) { + rest ecsutil.RestClient) (receiver.Metrics, error) { if nextConsumer == nil { return nil, component.ErrNilNextConsumer } diff --git a/receiver/awsfirehosereceiver/factory.go b/receiver/awsfirehosereceiver/factory.go index 1ed55199735cb..d0a98d99b601d 100644 --- a/receiver/awsfirehosereceiver/factory.go +++ b/receiver/awsfirehosereceiver/factory.go @@ -22,6 +22,7 @@ import ( "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/consumer" + "go.opentelemetry.io/collector/receiver" "go.uber.org/zap" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsfirehosereceiver/internal/unmarshaler" @@ -44,11 +45,11 @@ var ( // NewFactory creates a receiver factory for awsfirehose. Currently, only // available in metrics pipelines. -func NewFactory() component.ReceiverFactory { - return component.NewReceiverFactory( +func NewFactory() receiver.Factory { + return receiver.NewFactory( typeStr, createDefaultConfig, - component.WithMetricsReceiver(createMetricsReceiver, stability)) + receiver.WithMetrics(createMetricsReceiver, stability)) } // validateRecordType checks the available record types for the @@ -84,9 +85,9 @@ func createDefaultConfig() component.Config { // createMetricsReceiver implements the CreateMetricsReceiver function type. func createMetricsReceiver( _ context.Context, - set component.ReceiverCreateSettings, + set receiver.CreateSettings, cfg component.Config, nextConsumer consumer.Metrics, -) (component.MetricsReceiver, error) { +) (receiver.Metrics, error) { return newMetricsReceiver(cfg.(*Config), set, defaultMetricsUnmarshalers(set.Logger), nextConsumer) } diff --git a/receiver/awsfirehosereceiver/factory_test.go b/receiver/awsfirehosereceiver/factory_test.go index d4549deccd8d4..3df74023e1d02 100644 --- a/receiver/awsfirehosereceiver/factory_test.go +++ b/receiver/awsfirehosereceiver/factory_test.go @@ -21,6 +21,7 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/consumer/consumertest" + "go.opentelemetry.io/collector/receiver/receivertest" ) func TestValidConfig(t *testing.T) { @@ -31,7 +32,7 @@ func TestValidConfig(t *testing.T) { func TestCreateMetricsReceiver(t *testing.T) { r, err := createMetricsReceiver( context.Background(), - componenttest.NewNopReceiverCreateSettings(), + receivertest.NewNopCreateSettings(), createDefaultConfig(), consumertest.NewNop(), ) diff --git a/receiver/awsfirehosereceiver/go.mod b/receiver/awsfirehosereceiver/go.mod index 8b1160b5b8e7a..d65c1f7847326 100644 --- a/receiver/awsfirehosereceiver/go.mod +++ b/receiver/awsfirehosereceiver/go.mod @@ -4,12 +4,12 @@ go 1.18 require ( github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector v0.67.0 + go.opentelemetry.io/collector/component v0.67.0 + go.opentelemetry.io/collector/confmap v0.67.0 + go.opentelemetry.io/collector/consumer v0.67.0 + go.opentelemetry.io/collector/pdata v1.0.0-rc1 + go.opentelemetry.io/collector/semconv v0.67.0 go.uber.org/zap v1.24.0 ) @@ -34,7 +34,7 @@ require ( github.com/pelletier/go-toml v1.9.4 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rs/cors v1.8.2 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/featuregate v0.67.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect diff --git a/receiver/awsfirehosereceiver/go.sum b/receiver/awsfirehosereceiver/go.sum index c7ead5601639a..8644c68c07e6d 100644 --- a/receiver/awsfirehosereceiver/go.sum +++ b/receiver/awsfirehosereceiver/go.sum @@ -277,20 +277,20 @@ github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1 go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A= go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 h1:Q5L9Urod3c8as6ZYaoaqBjarx/HXxsxy34DFZIU2fO4= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/component v0.67.0 h1:GCBRZAqk4yNaT4L1uwlbbwophFHrxYccLZ4Uj1Ifs/M= +go.opentelemetry.io/collector/component v0.67.0/go.mod h1:Txa2lm9oe7xsGQN8u7GdUIrRpAHFIKsTO4Qi3/CSmKk= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= +go.opentelemetry.io/collector/semconv v0.67.0 h1:zLAvcQa6Kgow52FFLrmk7/9ZVtEYyA73+xDtCcFG78Q= +go.opentelemetry.io/collector/semconv v0.67.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 h1:aUEBEdCa6iamGzg6fuYxDA8ThxvOG240mAvWDU+XLio= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4/go.mod h1:l2MdsbKTocpPS5nQZscqTR9jd8u96VYZdcpF8Sye7mA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= diff --git a/receiver/awsfirehosereceiver/metrics_receiver.go b/receiver/awsfirehosereceiver/metrics_receiver.go index cf6395441a4b6..0209942a9f2ce 100644 --- a/receiver/awsfirehosereceiver/metrics_receiver.go +++ b/receiver/awsfirehosereceiver/metrics_receiver.go @@ -20,6 +20,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/consumer" + "go.opentelemetry.io/collector/receiver" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsfirehosereceiver/internal/unmarshaler" ) @@ -41,10 +42,10 @@ var _ firehoseConsumer = (*metricsConsumer)(nil) // with a metricsConsumer. func newMetricsReceiver( config *Config, - set component.ReceiverCreateSettings, + set receiver.CreateSettings, unmarshalers map[string]unmarshaler.MetricsUnmarshaler, nextConsumer consumer.Metrics, -) (component.MetricsReceiver, error) { +) (receiver.Metrics, error) { if nextConsumer == nil { return nil, component.ErrNilNextConsumer } diff --git a/receiver/awsfirehosereceiver/metrics_receiver_test.go b/receiver/awsfirehosereceiver/metrics_receiver_test.go index c9184d5150dd6..09238b162d40c 100644 --- a/receiver/awsfirehosereceiver/metrics_receiver_test.go +++ b/receiver/awsfirehosereceiver/metrics_receiver_test.go @@ -22,10 +22,10 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/consumer/consumertest" "go.opentelemetry.io/collector/pdata/pmetric" + "go.opentelemetry.io/collector/receiver/receivertest" "go.uber.org/zap" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsfirehosereceiver/internal/unmarshaler/unmarshalertest" @@ -67,7 +67,7 @@ func TestNewMetricsReceiver(t *testing.T) { cfg.RecordType = testCase.recordType got, err := newMetricsReceiver( cfg, - componenttest.NewNopReceiverCreateSettings(), + receivertest.NewNopCreateSettings(), defaultMetricsUnmarshalers(zap.NewNop()), testCase.consumer, ) diff --git a/receiver/awsfirehosereceiver/receiver.go b/receiver/awsfirehosereceiver/receiver.go index ffc20439258f3..83e4fd37bc8f5 100644 --- a/receiver/awsfirehosereceiver/receiver.go +++ b/receiver/awsfirehosereceiver/receiver.go @@ -27,6 +27,7 @@ import ( "time" "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/receiver" "go.uber.org/zap" ) @@ -55,7 +56,7 @@ type firehoseConsumer interface { // firehoseReceiver type firehoseReceiver struct { // settings is the base receiver settings. - settings component.ReceiverCreateSettings + settings receiver.CreateSettings // config is the configuration for the receiver. config *Config // server is the HTTP/HTTPS server set up to listen @@ -110,7 +111,7 @@ type firehoseCommonAttributes struct { CommonAttributes map[string]string `json:"commonAttributes"` } -var _ component.MetricsReceiver = (*firehoseReceiver)(nil) +var _ receiver.Metrics = (*firehoseReceiver)(nil) var _ http.Handler = (*firehoseReceiver)(nil) // Start spins up the receiver's HTTP server and makes the receiver start diff --git a/receiver/awsfirehosereceiver/receiver_test.go b/receiver/awsfirehosereceiver/receiver_test.go index 3884e016ecd12..b71cba4ed01c9 100644 --- a/receiver/awsfirehosereceiver/receiver_test.go +++ b/receiver/awsfirehosereceiver/receiver_test.go @@ -32,6 +32,7 @@ import ( "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confighttp" + "go.opentelemetry.io/collector/receiver/receivertest" ) const ( @@ -241,7 +242,7 @@ func TestFirehoseRequest(t *testing.T) { // testFirehoseReceiver is a convenience function for creating a test firehoseReceiver func testFirehoseReceiver(config *Config, consumer firehoseConsumer) *firehoseReceiver { return &firehoseReceiver{ - settings: componenttest.NewNopReceiverCreateSettings(), + settings: receivertest.NewNopCreateSettings(), config: config, consumer: consumer, } diff --git a/receiver/awsxrayreceiver/factory.go b/receiver/awsxrayreceiver/factory.go index fab809ae82fb0..d2e36ce0eb52e 100644 --- a/receiver/awsxrayreceiver/factory.go +++ b/receiver/awsxrayreceiver/factory.go @@ -21,6 +21,7 @@ import ( "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confignet" "go.opentelemetry.io/collector/consumer" + "go.opentelemetry.io/collector/receiver" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/proxy" awsxray "github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray" @@ -28,11 +29,11 @@ import ( ) // NewFactory creates a factory for AWS receiver. -func NewFactory() component.ReceiverFactory { - return component.NewReceiverFactory( +func NewFactory() receiver.Factory { + return receiver.NewFactory( awsxray.TypeStr, createDefaultConfig, - component.WithTracesReceiver(createTracesReceiver, component.StabilityLevelBeta)) + receiver.WithTraces(createTracesReceiver, component.StabilityLevelBeta)) } func createDefaultConfig() component.Config { @@ -53,9 +54,9 @@ func createDefaultConfig() component.Config { func createTracesReceiver( ctx context.Context, - params component.ReceiverCreateSettings, + params receiver.CreateSettings, cfg component.Config, - consumer consumer.Traces) (component.TracesReceiver, error) { + consumer consumer.Traces) (receiver.Traces, error) { rcfg := cfg.(*Config) return newReceiver(rcfg, consumer, params) } diff --git a/receiver/awsxrayreceiver/factory_test.go b/receiver/awsxrayreceiver/factory_test.go index c358e86af527b..ba9d63660d408 100644 --- a/receiver/awsxrayreceiver/factory_test.go +++ b/receiver/awsxrayreceiver/factory_test.go @@ -23,6 +23,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/consumer/consumertest" + "go.opentelemetry.io/collector/receiver/receivertest" awsxray "github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray" ) @@ -47,7 +48,7 @@ func TestCreateTracesReceiver(t *testing.T) { factory := NewFactory() _, err := factory.CreateTracesReceiver( context.Background(), - componenttest.NewNopReceiverCreateSettings(), + receivertest.NewNopCreateSettings(), factory.CreateDefaultConfig().(*Config), consumertest.NewNop(), ) @@ -58,7 +59,7 @@ func TestCreateMetricsReceiver(t *testing.T) { factory := NewFactory() _, err := factory.CreateMetricsReceiver( context.Background(), - componenttest.NewNopReceiverCreateSettings(), + receivertest.NewNopCreateSettings(), factory.CreateDefaultConfig().(*Config), consumertest.NewNop(), ) diff --git a/receiver/awsxrayreceiver/go.mod b/receiver/awsxrayreceiver/go.mod index 3e54d0af0c425..0da7dc35a6696 100644 --- a/receiver/awsxrayreceiver/go.mod +++ b/receiver/awsxrayreceiver/go.mod @@ -5,17 +5,17 @@ go 1.18 require ( github.com/aws/aws-sdk-go v1.44.155 github.com/google/uuid v1.3.0 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/proxy v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.66.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/proxy v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.67.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector v0.67.0 + go.opentelemetry.io/collector/component v0.67.0 + go.opentelemetry.io/collector/confmap v0.67.0 + go.opentelemetry.io/collector/consumer v0.67.0 + go.opentelemetry.io/collector/pdata v1.0.0-rc1 + go.opentelemetry.io/collector/semconv v0.67.0 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.24.0 ) @@ -49,7 +49,7 @@ require ( github.com/prometheus/statsd_exporter v0.22.7 // indirect github.com/rogpeppe/go-internal v1.6.1 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/featuregate v0.67.0 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.33.0 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect diff --git a/receiver/awsxrayreceiver/go.sum b/receiver/awsxrayreceiver/go.sum index 969e335ee1ab5..1004f423deb4b 100644 --- a/receiver/awsxrayreceiver/go.sum +++ b/receiver/awsxrayreceiver/go.sum @@ -378,20 +378,20 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 h1:Q5L9Urod3c8as6ZYaoaqBjarx/HXxsxy34DFZIU2fO4= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/component v0.67.0 h1:GCBRZAqk4yNaT4L1uwlbbwophFHrxYccLZ4Uj1Ifs/M= +go.opentelemetry.io/collector/component v0.67.0/go.mod h1:Txa2lm9oe7xsGQN8u7GdUIrRpAHFIKsTO4Qi3/CSmKk= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= +go.opentelemetry.io/collector/semconv v0.67.0 h1:zLAvcQa6Kgow52FFLrmk7/9ZVtEYyA73+xDtCcFG78Q= +go.opentelemetry.io/collector/semconv v0.67.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/receiver/awsxrayreceiver/internal/udppoller/poller.go b/receiver/awsxrayreceiver/internal/udppoller/poller.go index fa63694aca69b..2d6a0fccfd2ec 100644 --- a/receiver/awsxrayreceiver/internal/udppoller/poller.go +++ b/receiver/awsxrayreceiver/internal/udppoller/poller.go @@ -21,8 +21,8 @@ import ( "net" "sync" - "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/obsreport" + "go.opentelemetry.io/collector/receiver" "go.uber.org/zap" awsxray "github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray" @@ -87,7 +87,7 @@ type poller struct { } // New creates a new UDP poller -func New(cfg *Config, set component.ReceiverCreateSettings) (Poller, error) { +func New(cfg *Config, set receiver.CreateSettings) (Poller, error) { if cfg.Transport != Transport { return nil, fmt.Errorf( "X-Ray receiver only supports ingesting spans through UDP, provided: %s", diff --git a/receiver/awsxrayreceiver/internal/udppoller/poller_test.go b/receiver/awsxrayreceiver/internal/udppoller/poller_test.go index a5b853ae7e84e..7d85e85fde475 100644 --- a/receiver/awsxrayreceiver/internal/udppoller/poller_test.go +++ b/receiver/awsxrayreceiver/internal/udppoller/poller_test.go @@ -28,9 +28,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/obsreport" "go.opentelemetry.io/collector/obsreport/obsreporttest" + "go.opentelemetry.io/collector/receiver" + "go.opentelemetry.io/collector/receiver/receivertest" "go.uber.org/zap" "go.uber.org/zap/zapcore" "go.uber.org/zap/zaptest/observer" @@ -46,7 +47,7 @@ func TestNonUDPTransport(t *testing.T) { Transport: "tcp", NumOfPollerToStart: 2, }, - componenttest.NewNopReceiverCreateSettings(), + receivertest.NewNopCreateSettings(), ) assert.EqualError(t, err, "X-Ray receiver only supports ingesting spans through UDP, provided: tcp") @@ -59,7 +60,7 @@ func TestInvalidEndpoint(t *testing.T) { Transport: "udp", NumOfPollerToStart: 2, }, - componenttest.NewNopReceiverCreateSettings(), + receivertest.NewNopCreateSettings(), ) assert.EqualError(t, err, "address invalidAddr: missing port in address") } @@ -79,7 +80,7 @@ func TestUDPPortUnavailable(t *testing.T) { Endpoint: address, NumOfPollerToStart: 2, }, - componenttest.NewNopReceiverCreateSettings(), + receivertest.NewNopCreateSettings(), ) assert.Error(t, err, "should have failed to create a new receiver") @@ -98,7 +99,7 @@ func TestCloseStopsPoller(t *testing.T) { Endpoint: addr, NumOfPollerToStart: 2, }, - componenttest.NewNopReceiverCreateSettings(), + receivertest.NewNopCreateSettings(), ) assert.NoError(t, err, "poller should be created") @@ -155,7 +156,7 @@ func TestSuccessfullyPollPacket(t *testing.T) { } }, 10*time.Second, 5*time.Millisecond, "poller should return parsed segment") - assert.NoError(t, obsreporttest.CheckReceiverTraces(tt, receiverID, Transport, 2, 0)) + assert.NoError(t, tt.CheckReceiverTraces(Transport, 2, 0)) } func TestIncompletePacketNoSeparator(t *testing.T) { @@ -185,7 +186,7 @@ func TestIncompletePacketNoSeparator(t *testing.T) { fmt.Sprintf("unable to split incoming data as header and segment, incoming bytes: %v", rawData)) == 0 }, 10*time.Second, 5*time.Millisecond, "poller should reject segment") - assert.NoError(t, obsreporttest.CheckReceiverTraces(tt, receiverID, Transport, 0, 1)) + assert.NoError(t, tt.CheckReceiverTraces(Transport, 0, 1)) } func TestIncompletePacketNoBody(t *testing.T) { @@ -210,7 +211,7 @@ func TestIncompletePacketNoBody(t *testing.T) { lastEntry.Context[1].Integer == 1 }, 10*time.Second, 5*time.Millisecond, "poller should log missing body") - assert.NoError(t, obsreporttest.CheckReceiverTraces(tt, receiverID, Transport, 0, 1)) + assert.NoError(t, tt.CheckReceiverTraces(Transport, 0, 1)) } func TestNonJsonHeader(t *testing.T) { @@ -240,7 +241,7 @@ func TestNonJsonHeader(t *testing.T) { "invalid character 'o'") }, 10*time.Second, 5*time.Millisecond, "poller should reject segment") - assert.NoError(t, obsreporttest.CheckReceiverTraces(tt, receiverID, Transport, 0, 1)) + assert.NoError(t, tt.CheckReceiverTraces(Transport, 0, 1)) } func TestJsonInvalidHeader(t *testing.T) { @@ -276,7 +277,7 @@ func TestJsonInvalidHeader(t *testing.T) { ) }, 10*time.Second, 5*time.Millisecond, "poller should reject segment") - assert.NoError(t, obsreporttest.CheckReceiverTraces(tt, receiverID, Transport, 0, 1)) + assert.NoError(t, tt.CheckReceiverTraces(Transport, 0, 1)) } func TestSocketReadIrrecoverableNetError(t *testing.T) { @@ -312,7 +313,7 @@ func TestSocketReadIrrecoverableNetError(t *testing.T) { errors.Unwrap(lastEntry.Context[0].Interface.(error)).Error() == randErrStr.String() }, 10*time.Second, 5*time.Millisecond, "poller should exit due to irrecoverable net read error") - assert.NoError(t, obsreporttest.CheckReceiverTraces(tt, receiverID, Transport, 0, 1)) + assert.NoError(t, tt.CheckReceiverTraces(Transport, 0, 1)) } func TestSocketReadTimeOutNetError(t *testing.T) { @@ -349,7 +350,7 @@ func TestSocketReadTimeOutNetError(t *testing.T) { errors.Unwrap(lastEntry.Context[0].Interface.(error)).Error() == randErrStr.String() }, 10*time.Second, 5*time.Millisecond, "poller should encounter net read error") - assert.NoError(t, obsreporttest.CheckReceiverTraces(tt, receiverID, Transport, 0, 1)) + assert.NoError(t, tt.CheckReceiverTraces(Transport, 0, 1)) } func TestSocketGenericReadError(t *testing.T) { @@ -384,7 +385,7 @@ func TestSocketGenericReadError(t *testing.T) { errors.Unwrap(lastEntry.Context[0].Interface.(error)).Error() == randErrStr.String() }, 10*time.Second, 5*time.Millisecond, "poller should encounter generic socket read error") - assert.NoError(t, obsreporttest.CheckReceiverTraces(tt, receiverID, Transport, 0, 1)) + assert.NoError(t, tt.CheckReceiverTraces(Transport, 0, 1)) } type mockNetError struct { @@ -437,7 +438,7 @@ func (m *mockSocketConn) Close() error { return nil } func createAndOptionallyStartPoller( t *testing.T, start bool, - set component.ReceiverCreateSettings) (string, Poller, *observer.ObservedLogs) { + set receiver.CreateSettings) (string, Poller, *observer.ObservedLogs) { addr, err := findAvailableAddress() assert.NoError(t, err, "there should be address available") diff --git a/receiver/awsxrayreceiver/receiver.go b/receiver/awsxrayreceiver/receiver.go index 29d4f85153c08..55acb50856f27 100644 --- a/receiver/awsxrayreceiver/receiver.go +++ b/receiver/awsxrayreceiver/receiver.go @@ -21,6 +21,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/obsreport" + "go.opentelemetry.io/collector/receiver" "go.uber.org/multierr" "go.uber.org/zap" @@ -36,19 +37,19 @@ const ( maxPollerCount = 2 ) -// xrayReceiver implements the component.TracesReceiver interface for converting +// xrayReceiver implements the receiver.Traces interface for converting // AWS X-Ray segment document into the OT internal trace format. type xrayReceiver struct { poller udppoller.Poller server proxy.Server - settings component.ReceiverCreateSettings + settings receiver.CreateSettings consumer consumer.Traces obsrecv *obsreport.Receiver } func newReceiver(config *Config, consumer consumer.Traces, - set component.ReceiverCreateSettings) (component.TracesReceiver, error) { + set receiver.CreateSettings) (receiver.Traces, error) { if consumer == nil { return nil, component.ErrNilNextConsumer diff --git a/receiver/awsxrayreceiver/receiver_test.go b/receiver/awsxrayreceiver/receiver_test.go index f619573cfdecb..cd8f93011afce 100644 --- a/receiver/awsxrayreceiver/receiver_test.go +++ b/receiver/awsxrayreceiver/receiver_test.go @@ -33,6 +33,8 @@ import ( "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/consumer/consumertest" "go.opentelemetry.io/collector/obsreport/obsreporttest" + "go.opentelemetry.io/collector/receiver" + "go.opentelemetry.io/collector/receiver/receivertest" "go.uber.org/zap" "go.uber.org/zap/zapcore" "go.uber.org/zap/zaptest/observer" @@ -65,7 +67,7 @@ func TestConsumerCantBeNil(t *testing.T) { }, }, nil, - componenttest.NewNopReceiverCreateSettings(), + receivertest.NewNopCreateSettings(), ) assert.True(t, errors.Is(err, component.ErrNilNextConsumer), "consumer is nil should be detected") } @@ -88,7 +90,7 @@ func TestProxyCreationFailed(t *testing.T) { }, }, sink, - componenttest.NewNopReceiverCreateSettings(), + receivertest.NewNopCreateSettings(), ) assert.Error(t, err, "receiver creation should fail due to failure to create TCP proxy") } @@ -103,7 +105,7 @@ func TestPollerCreationFailed(t *testing.T) { }, }, sink, - componenttest.NewNopReceiverCreateSettings(), + receivertest.NewNopCreateSettings(), ) assert.Error(t, err, "receiver creation should fail due to failure to create UCP poller") } @@ -143,7 +145,7 @@ func TestSegmentsPassedToConsumer(t *testing.T) { return len(got) == 1 }, 10*time.Second, 5*time.Millisecond, "consumer should eventually get the X-Ray span") - assert.NoError(t, obsreporttest.CheckReceiverTraces(tt, receiverID, udppoller.Transport, 18, 0)) + assert.NoError(t, tt.CheckReceiverTraces(udppoller.Transport, 18, 0)) } func TestTranslatorErrorsOut(t *testing.T) { @@ -170,7 +172,7 @@ func TestTranslatorErrorsOut(t *testing.T) { "X-Ray segment to OT traces conversion failed") }, 10*time.Second, 5*time.Millisecond, "poller should log warning because consumer errored out") - assert.NoError(t, obsreporttest.CheckReceiverTraces(tt, receiverID, udppoller.Transport, 1, 1)) + assert.NoError(t, tt.CheckReceiverTraces(udppoller.Transport, 1, 1)) } func TestSegmentsConsumerErrorsOut(t *testing.T) { @@ -200,7 +202,7 @@ func TestSegmentsConsumerErrorsOut(t *testing.T) { "Trace consumer errored out") }, 10*time.Second, 5*time.Millisecond, "poller should log warning because consumer errored out") - assert.NoError(t, obsreporttest.CheckReceiverTraces(tt, receiverID, udppoller.Transport, 1, 1)) + assert.NoError(t, tt.CheckReceiverTraces(udppoller.Transport, 1, 1)) } func TestPollerCloseError(t *testing.T) { @@ -292,7 +294,7 @@ func createAndOptionallyStartReceiver( t *testing.T, csu consumer.Traces, start bool, - set component.ReceiverCreateSettings) (string, component.TracesReceiver, *observer.ObservedLogs) { + set receiver.CreateSettings) (string, receiver.Traces, *observer.ObservedLogs) { addr, err := findAvailableUDPAddress() assert.NoError(t, err, "there should be address available") tcpAddr := testutil.GetAvailableLocalAddress(t) diff --git a/receiver/azureblobreceiver/config_test.go b/receiver/azureblobreceiver/config_test.go index 524c5bea2f039..ef4bd424af746 100644 --- a/receiver/azureblobreceiver/config_test.go +++ b/receiver/azureblobreceiver/config_test.go @@ -23,7 +23,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" - "go.opentelemetry.io/collector/service/servicetest" + "go.opentelemetry.io/collector/otelcol/otelcoltest" ) func TestLoadConfig(t *testing.T) { @@ -32,7 +32,7 @@ func TestLoadConfig(t *testing.T) { factory := NewFactory() factories.Receivers[typeStr] = factory - cfg, err := servicetest.LoadConfigAndValidate(filepath.Join("testdata", "config.yaml"), factories) + cfg, err := otelcoltest.LoadConfigAndValidate(filepath.Join("testdata", "config.yaml"), factories) require.NoError(t, err) require.NotNil(t, cfg) diff --git a/receiver/azureblobreceiver/factory.go b/receiver/azureblobreceiver/factory.go index ae61f7d4e3333..579f9d57a02b7 100644 --- a/receiver/azureblobreceiver/factory.go +++ b/receiver/azureblobreceiver/factory.go @@ -21,6 +21,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer" + "go.opentelemetry.io/collector/receiver" "go.uber.org/zap" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent" @@ -42,16 +43,16 @@ type blobReceiverFactory struct { } // NewFactory returns a factory for Azure Blob receiver. -func NewFactory() component.ReceiverFactory { +func NewFactory() receiver.Factory { f := &blobReceiverFactory{ receivers: sharedcomponent.NewSharedComponents(), } - return component.NewReceiverFactory( + return receiver.NewFactory( typeStr, f.createDefaultConfig, - component.WithTracesReceiver(f.createTracesReceiver, component.StabilityLevelBeta), - component.WithLogsReceiver(f.createLogsReceiver, component.StabilityLevelBeta)) + receiver.WithTraces(f.createTracesReceiver, component.StabilityLevelBeta), + receiver.WithLogs(f.createLogsReceiver, component.StabilityLevelBeta)) } func (f *blobReceiverFactory) createDefaultConfig() component.Config { @@ -64,10 +65,10 @@ func (f *blobReceiverFactory) createDefaultConfig() component.Config { func (f *blobReceiverFactory) createLogsReceiver( ctx context.Context, - set component.ReceiverCreateSettings, + set receiver.CreateSettings, cfg component.Config, nextConsumer consumer.Logs, -) (component.LogsReceiver, error) { +) (receiver.Logs, error) { receiver, err := f.getReceiver(set, cfg) @@ -83,10 +84,10 @@ func (f *blobReceiverFactory) createLogsReceiver( func (f *blobReceiverFactory) createTracesReceiver( ctx context.Context, - set component.ReceiverCreateSettings, + set receiver.CreateSettings, cfg component.Config, nextConsumer consumer.Traces, -) (component.TracesReceiver, error) { +) (receiver.Traces, error) { receiver, err := f.getReceiver(set, cfg) @@ -100,7 +101,7 @@ func (f *blobReceiverFactory) createTracesReceiver( } func (f *blobReceiverFactory) getReceiver( - set component.ReceiverCreateSettings, + set receiver.CreateSettings, cfg component.Config) (component.Component, error) { var err error diff --git a/receiver/azureblobreceiver/factory_test.go b/receiver/azureblobreceiver/factory_test.go index 3955c96db77ea..6a5d2d3119dad 100644 --- a/receiver/azureblobreceiver/factory_test.go +++ b/receiver/azureblobreceiver/factory_test.go @@ -21,9 +21,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer/consumertest" + "go.opentelemetry.io/collector/receiver/receivertest" ) func TestNewFactory(t *testing.T) { @@ -35,7 +35,7 @@ func TestNewFactory(t *testing.T) { func TestCreateTracesReceiver(t *testing.T) { f := NewFactory() ctx := context.Background() - params := componenttest.NewNopReceiverCreateSettings() + params := receivertest.NewNopCreateSettings() receiver, err := f.CreateTracesReceiver(ctx, params, getConfig(), consumertest.NewNop()) require.NoError(t, err) @@ -45,7 +45,7 @@ func TestCreateTracesReceiver(t *testing.T) { func TestCreateLogsReceiver(t *testing.T) { f := NewFactory() ctx := context.Background() - params := componenttest.NewNopReceiverCreateSettings() + params := receivertest.NewNopCreateSettings() receiver, err := f.CreateLogsReceiver(ctx, params, getConfig(), consumertest.NewNop()) require.NoError(t, err) @@ -55,7 +55,7 @@ func TestCreateLogsReceiver(t *testing.T) { func TestTracesAndLogsReceiversAreSame(t *testing.T) { f := NewFactory() ctx := context.Background() - params := componenttest.NewNopReceiverCreateSettings() + params := receivertest.NewNopCreateSettings() config := getConfig() logsReceiver, err := f.CreateLogsReceiver(ctx, params, config, consumertest.NewNop()) require.NoError(t, err) diff --git a/receiver/azureblobreceiver/go.mod b/receiver/azureblobreceiver/go.mod index 4870feb2bc1dd..4837edb0dedfd 100644 --- a/receiver/azureblobreceiver/go.mod +++ b/receiver/azureblobreceiver/go.mod @@ -5,12 +5,12 @@ go 1.18 require ( github.com/Azure/azure-event-hubs-go/v3 v3.3.20 github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v0.3.0 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent v0.66.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent v0.67.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector v0.67.0 + go.opentelemetry.io/collector/component v0.67.0 + go.opentelemetry.io/collector/consumer v0.67.0 + go.opentelemetry.io/collector/pdata v1.0.0-rc1 go.uber.org/zap v1.24.0 ) @@ -72,10 +72,10 @@ require ( github.com/tklauser/numcpus v0.6.0 // indirect github.com/yusufpapurcu/wmi v1.2.2 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect - go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221202005155-1c54042beb70 // indirect - go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/confmap v0.67.0 // indirect + go.opentelemetry.io/collector/featuregate v0.67.0 // indirect + go.opentelemetry.io/collector/processor/batchprocessor v0.67.0 // indirect + go.opentelemetry.io/collector/semconv v0.67.0 // indirect go.opentelemetry.io/contrib/propagators/b3 v1.11.1 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.33.0 // indirect diff --git a/receiver/azureblobreceiver/go.sum b/receiver/azureblobreceiver/go.sum index 78b34ac3b1f63..fe8fd17b59b1a 100644 --- a/receiver/azureblobreceiver/go.sum +++ b/receiver/azureblobreceiver/go.sum @@ -485,23 +485,23 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/extension/zpagesextension v0.66.0 h1:tPqSKH5K3VhTT0XXVoWL3woWBSTJqnXZQRt0ZLSCoCc= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221202005155-1c54042beb70 h1:Y4e8NnVevonnAgmjX9Z7QIMA32yMqHAOnAlh8SzTS8c= -go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:Pi1CsKDQFoDrUP1i3+VdE6s2Xuji7bOGFBgqHK0J32E= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 h1:Q5L9Urod3c8as6ZYaoaqBjarx/HXxsxy34DFZIU2fO4= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/component v0.67.0 h1:GCBRZAqk4yNaT4L1uwlbbwophFHrxYccLZ4Uj1Ifs/M= +go.opentelemetry.io/collector/component v0.67.0/go.mod h1:Txa2lm9oe7xsGQN8u7GdUIrRpAHFIKsTO4Qi3/CSmKk= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/extension/zpagesextension v0.67.0 h1:TRW8vZwE+/h2vJqqMDmyQO9X0sxcYCSXf5MyXozSLas= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= +go.opentelemetry.io/collector/processor/batchprocessor v0.67.0 h1:Qn4Ytth3q1trwTSAYYTzIRs4SBh9rz0xBou1nZB+Dko= +go.opentelemetry.io/collector/processor/batchprocessor v0.67.0/go.mod h1:+ZXCkUG9tlwbbVLi+PT9DjQ7vz+lfFSQqvW45snLYno= +go.opentelemetry.io/collector/semconv v0.67.0 h1:zLAvcQa6Kgow52FFLrmk7/9ZVtEYyA73+xDtCcFG78Q= +go.opentelemetry.io/collector/semconv v0.67.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/contrib/propagators/b3 v1.11.1 h1:icQ6ttRV+r/2fnU46BIo/g/mPu6Rs5Ug8Rtohe3KqzI= go.opentelemetry.io/contrib/propagators/b3 v1.11.1/go.mod h1:ECIveyMXgnl4gorxFcA7RYjJY/Ql9n20ubhbfDc3QfA= go.opentelemetry.io/contrib/zpages v0.36.4 h1:Z2VK5WsDhWs9VwZ1p0TM5RyusTOgAQfdMMDDQPRnlmY= diff --git a/receiver/azureblobreceiver/receiver.go b/receiver/azureblobreceiver/receiver.go index ea73244eed108..fd806b9f81230 100644 --- a/receiver/azureblobreceiver/receiver.go +++ b/receiver/azureblobreceiver/receiver.go @@ -23,6 +23,7 @@ import ( "go.opentelemetry.io/collector/obsreport" "go.opentelemetry.io/collector/pdata/plog" "go.opentelemetry.io/collector/pdata/ptrace" + "go.opentelemetry.io/collector/receiver" "go.uber.org/zap" ) @@ -104,7 +105,7 @@ func (b *blobReceiver) consumeTracesJSON(ctx context.Context, json []byte) error } // Returns a new instance of the log receiver -func newReceiver(set component.ReceiverCreateSettings, blobEventHandler blobEventHandler) (component.Component, error) { +func newReceiver(set receiver.CreateSettings, blobEventHandler blobEventHandler) (component.Component, error) { obsrecv, err := obsreport.NewReceiver(obsreport.ReceiverSettings{ ReceiverID: set.ID, Transport: "event", diff --git a/receiver/azureblobreceiver/receiver_test.go b/receiver/azureblobreceiver/receiver_test.go index eb1e6aa1e8c58..93d0aeb345efd 100644 --- a/receiver/azureblobreceiver/receiver_test.go +++ b/receiver/azureblobreceiver/receiver_test.go @@ -21,8 +21,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/consumer/consumertest" + "go.opentelemetry.io/collector/receiver/receivertest" ) var ( @@ -67,7 +67,7 @@ func TestConsumeTracesJSON(t *testing.T) { } func getBlobReceiver(t *testing.T) (component.Component, error) { - set := componenttest.NewNopReceiverCreateSettings() + set := receivertest.NewNopCreateSettings() blobClient := newMockBlobClient() blobEventHandler := getBlobEventHandler(t, blobClient) diff --git a/receiver/azureeventhubreceiver/azure_formatter.go b/receiver/azureeventhubreceiver/azure_formatter.go index 502bffdf70b74..3161eba95372e 100644 --- a/receiver/azureeventhubreceiver/azure_formatter.go +++ b/receiver/azureeventhubreceiver/azure_formatter.go @@ -18,13 +18,14 @@ import ( eventhub "github.com/Azure/azure-event-hubs-go/v3" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/pdata/plog" + "go.opentelemetry.io/collector/receiver" ) type azureLogFormatConverter struct { buildInfo component.BuildInfo } -func newAzureLogFormatConverter(settings component.ReceiverCreateSettings) *azureLogFormatConverter { +func newAzureLogFormatConverter(settings receiver.CreateSettings) *azureLogFormatConverter { return &azureLogFormatConverter{buildInfo: settings.BuildInfo} } diff --git a/receiver/azureeventhubreceiver/client.go b/receiver/azureeventhubreceiver/client.go index 71112026c755a..cfd64a01c54dc 100644 --- a/receiver/azureeventhubreceiver/client.go +++ b/receiver/azureeventhubreceiver/client.go @@ -23,13 +23,14 @@ import ( "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/obsreport" "go.opentelemetry.io/collector/pdata/plog" + "go.opentelemetry.io/collector/receiver" "go.uber.org/zap" "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/adapter" ) type client struct { - settings component.ReceiverCreateSettings + settings receiver.CreateSettings consumer consumer.Logs config *Config obsrecv *obsreport.Receiver diff --git a/receiver/azureeventhubreceiver/client_test.go b/receiver/azureeventhubreceiver/client_test.go index 84acf64e89b95..c1c9511c7e4ea 100644 --- a/receiver/azureeventhubreceiver/client_test.go +++ b/receiver/azureeventhubreceiver/client_test.go @@ -26,6 +26,7 @@ import ( "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/consumer/consumertest" "go.opentelemetry.io/collector/obsreport" + "go.opentelemetry.io/collector/receiver/receivertest" ) type mockHubWrapper struct { @@ -67,7 +68,7 @@ func TestClient_Start(t *testing.T) { config.(*Config).Connection = "Endpoint=sb://namespace.servicebus.windows.net/;SharedAccessKeyName=RootManageSharedAccessKey;SharedAccessKey=superSecret1234=;EntityPath=hubName" c := &client{ - settings: componenttest.NewNopReceiverCreateSettings(), + settings: receivertest.NewNopCreateSettings(), consumer: consumertest.NewNop(), config: config.(*Config), convert: &rawConverter{}, @@ -88,11 +89,11 @@ func TestClient_handle(t *testing.T) { ReceiverID: component.NewID(typeStr), Transport: "", LongLivedCtx: false, - ReceiverCreateSettings: componenttest.NewNopReceiverCreateSettings(), + ReceiverCreateSettings: receivertest.NewNopCreateSettings(), }) require.NoError(t, err) c := &client{ - settings: componenttest.NewNopReceiverCreateSettings(), + settings: receivertest.NewNopCreateSettings(), consumer: sink, config: config.(*Config), obsrecv: obsrecv, diff --git a/receiver/azureeventhubreceiver/config_test.go b/receiver/azureeventhubreceiver/config_test.go index fc633ecc89717..7f2f568f16e65 100644 --- a/receiver/azureeventhubreceiver/config_test.go +++ b/receiver/azureeventhubreceiver/config_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" - "go.opentelemetry.io/collector/service/servicetest" + "go.opentelemetry.io/collector/otelcol/otelcoltest" ) func TestLoadConfig(t *testing.T) { @@ -31,7 +31,7 @@ func TestLoadConfig(t *testing.T) { factory := NewFactory() factories.Receivers[typeStr] = factory - cfg, err := servicetest.LoadConfigAndValidate(filepath.Join("testdata", "config.yaml"), factories) + cfg, err := otelcoltest.LoadConfigAndValidate(filepath.Join("testdata", "config.yaml"), factories) require.NoError(t, err) require.NotNil(t, cfg) diff --git a/receiver/azureeventhubreceiver/factory.go b/receiver/azureeventhubreceiver/factory.go index 10ffcd857f0c1..4c3668f921590 100644 --- a/receiver/azureeventhubreceiver/factory.go +++ b/receiver/azureeventhubreceiver/factory.go @@ -21,6 +21,7 @@ import ( "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/obsreport" + "go.opentelemetry.io/collector/receiver" ) const ( @@ -31,18 +32,18 @@ const ( ) // NewFactory creates a factory for the Azure Event Hub receiver. -func NewFactory() component.ReceiverFactory { - return component.NewReceiverFactory( +func NewFactory() receiver.Factory { + return receiver.NewFactory( typeStr, createDefaultConfig, - component.WithLogsReceiver(createLogsReceiver, stability)) + receiver.WithLogs(createLogsReceiver, stability)) } func createDefaultConfig() component.Config { return &Config{ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr))} } -func createLogsReceiver(_ context.Context, settings component.ReceiverCreateSettings, cfg component.Config, logs consumer.Logs) (component.LogsReceiver, error) { +func createLogsReceiver(_ context.Context, settings receiver.CreateSettings, cfg component.Config, logs consumer.Logs) (receiver.Logs, error) { obsrecv, err := obsreport.NewReceiver(obsreport.ReceiverSettings{ ReceiverID: settings.ID, diff --git a/receiver/azureeventhubreceiver/factory_test.go b/receiver/azureeventhubreceiver/factory_test.go index 251ca5dcdc550..e0bd9b219b2e1 100644 --- a/receiver/azureeventhubreceiver/factory_test.go +++ b/receiver/azureeventhubreceiver/factory_test.go @@ -20,9 +20,9 @@ import ( "github.com/stretchr/testify/assert" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer/consumertest" + "go.opentelemetry.io/collector/receiver/receivertest" ) func TestNewFactory(t *testing.T) { @@ -33,7 +33,7 @@ func TestNewFactory(t *testing.T) { func TestNewLogsReceiver(t *testing.T) { f := NewFactory() - receiver, err := f.CreateLogsReceiver(context.Background(), componenttest.NewNopReceiverCreateSettings(), f.CreateDefaultConfig(), consumertest.NewNop()) + receiver, err := f.CreateLogsReceiver(context.Background(), receivertest.NewNopCreateSettings(), f.CreateDefaultConfig(), consumertest.NewNop()) assert.NoError(t, err) assert.NotNil(t, receiver) } diff --git a/receiver/azureeventhubreceiver/go.mod b/receiver/azureeventhubreceiver/go.mod index 108fcb990d8da..1fe2cd00c876e 100644 --- a/receiver/azureeventhubreceiver/go.mod +++ b/receiver/azureeventhubreceiver/go.mod @@ -7,14 +7,14 @@ require ( github.com/Azure/azure-event-hubs-go/v3 v3.3.20 github.com/go-test/deep v1.0.8 github.com/json-iterator/go v1.1.12 - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.66.0 + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.67.0 github.com/relvacode/iso8601 v1.1.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector v0.67.0 + go.opentelemetry.io/collector/component v0.67.0 + go.opentelemetry.io/collector/consumer v0.67.0 + go.opentelemetry.io/collector/pdata v1.0.0-rc1 + go.opentelemetry.io/collector/semconv v0.67.0 go.uber.org/zap v1.24.0 ) @@ -70,9 +70,9 @@ require ( github.com/tklauser/numcpus v0.6.0 // indirect github.com/yusufpapurcu/wmi v1.2.2 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect - go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/confmap v0.67.0 // indirect + go.opentelemetry.io/collector/featuregate v0.67.0 // indirect + go.opentelemetry.io/collector/processor/batchprocessor v0.67.0 // indirect go.opentelemetry.io/contrib/propagators/b3 v1.11.1 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.33.0 // indirect diff --git a/receiver/azureeventhubreceiver/go.sum b/receiver/azureeventhubreceiver/go.sum index e9f4f3e7eb2c8..cb60d7fb0a587 100644 --- a/receiver/azureeventhubreceiver/go.sum +++ b/receiver/azureeventhubreceiver/go.sum @@ -490,23 +490,23 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/extension/zpagesextension v0.66.0 h1:tPqSKH5K3VhTT0XXVoWL3woWBSTJqnXZQRt0ZLSCoCc= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221202005155-1c54042beb70 h1:Y4e8NnVevonnAgmjX9Z7QIMA32yMqHAOnAlh8SzTS8c= -go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:Pi1CsKDQFoDrUP1i3+VdE6s2Xuji7bOGFBgqHK0J32E= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 h1:Q5L9Urod3c8as6ZYaoaqBjarx/HXxsxy34DFZIU2fO4= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/component v0.67.0 h1:GCBRZAqk4yNaT4L1uwlbbwophFHrxYccLZ4Uj1Ifs/M= +go.opentelemetry.io/collector/component v0.67.0/go.mod h1:Txa2lm9oe7xsGQN8u7GdUIrRpAHFIKsTO4Qi3/CSmKk= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/extension/zpagesextension v0.67.0 h1:TRW8vZwE+/h2vJqqMDmyQO9X0sxcYCSXf5MyXozSLas= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= +go.opentelemetry.io/collector/processor/batchprocessor v0.67.0 h1:Qn4Ytth3q1trwTSAYYTzIRs4SBh9rz0xBou1nZB+Dko= +go.opentelemetry.io/collector/processor/batchprocessor v0.67.0/go.mod h1:+ZXCkUG9tlwbbVLi+PT9DjQ7vz+lfFSQqvW45snLYno= +go.opentelemetry.io/collector/semconv v0.67.0 h1:zLAvcQa6Kgow52FFLrmk7/9ZVtEYyA73+xDtCcFG78Q= +go.opentelemetry.io/collector/semconv v0.67.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/contrib/propagators/b3 v1.11.1 h1:icQ6ttRV+r/2fnU46BIo/g/mPu6Rs5Ug8Rtohe3KqzI= go.opentelemetry.io/contrib/propagators/b3 v1.11.1/go.mod h1:ECIveyMXgnl4gorxFcA7RYjJY/Ql9n20ubhbfDc3QfA= go.opentelemetry.io/contrib/zpages v0.36.4 h1:Z2VK5WsDhWs9VwZ1p0TM5RyusTOgAQfdMMDDQPRnlmY= diff --git a/receiver/azureeventhubreceiver/raw_formatter.go b/receiver/azureeventhubreceiver/raw_formatter.go index 0596d042db734..ac40d47eaaf79 100644 --- a/receiver/azureeventhubreceiver/raw_formatter.go +++ b/receiver/azureeventhubreceiver/raw_formatter.go @@ -16,14 +16,14 @@ package azureeventhubreceiver // import "github.com/open-telemetry/opentelemetry import ( eventhub "github.com/Azure/azure-event-hubs-go/v3" - "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/plog" + "go.opentelemetry.io/collector/receiver" ) type rawConverter struct{} -func newRawConverter(_ component.ReceiverCreateSettings) *rawConverter { +func newRawConverter(_ receiver.CreateSettings) *rawConverter { return &rawConverter{} } diff --git a/receiver/bigipreceiver/factory.go b/receiver/bigipreceiver/factory.go index b4b5075537a54..1e927252ea064 100644 --- a/receiver/bigipreceiver/factory.go +++ b/receiver/bigipreceiver/factory.go @@ -23,6 +23,7 @@ import ( "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/consumer" + "go.opentelemetry.io/collector/receiver" "go.opentelemetry.io/collector/receiver/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/bigipreceiver/internal/metadata" @@ -36,11 +37,11 @@ const ( var errConfigNotBigip = errors.New("config was not a Big-IP receiver config") // NewFactory creates a new receiver factory for Big-IP -func NewFactory() component.ReceiverFactory { - return component.NewReceiverFactory( +func NewFactory() receiver.Factory { + return receiver.NewFactory( typeStr, createDefaultConfig, - component.WithMetricsReceiver(createMetricsReceiver, stability)) + receiver.WithMetrics(createMetricsReceiver, stability)) } // createDefaultConfig creates a config for Big-IP with as many default values as possible @@ -59,7 +60,7 @@ func createDefaultConfig() component.Config { } // creates the metric receiver for Big-IP -func createMetricsReceiver(_ context.Context, params component.ReceiverCreateSettings, rConf component.Config, consumer consumer.Metrics) (component.MetricsReceiver, error) { +func createMetricsReceiver(_ context.Context, params receiver.CreateSettings, rConf component.Config, consumer consumer.Metrics) (receiver.Metrics, error) { cfg, ok := rConf.(*Config) if !ok { return nil, errConfigNotBigip diff --git a/receiver/bigipreceiver/factory_test.go b/receiver/bigipreceiver/factory_test.go index b5845476bcfce..871648ec4e359 100644 --- a/receiver/bigipreceiver/factory_test.go +++ b/receiver/bigipreceiver/factory_test.go @@ -21,10 +21,10 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/consumer/consumertest" + "go.opentelemetry.io/collector/receiver/receivertest" "go.opentelemetry.io/collector/receiver/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/bigipreceiver/internal/metadata" @@ -69,7 +69,7 @@ func TestNewFactory(t *testing.T) { cfg := factory.CreateDefaultConfig() _, err := factory.CreateMetricsReceiver( context.Background(), - componenttest.NewNopReceiverCreateSettings(), + receivertest.NewNopCreateSettings(), cfg, consumertest.NewNop(), ) @@ -82,7 +82,7 @@ func TestNewFactory(t *testing.T) { factory := NewFactory() _, err := factory.CreateMetricsReceiver( context.Background(), - componenttest.NewNopReceiverCreateSettings(), + receivertest.NewNopCreateSettings(), nil, consumertest.NewNop(), ) diff --git a/receiver/bigipreceiver/go.mod b/receiver/bigipreceiver/go.mod index 7a31bfcdd1046..9d2fff6baef81 100644 --- a/receiver/bigipreceiver/go.mod +++ b/receiver/bigipreceiver/go.mod @@ -3,13 +3,13 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/receiver/bigipr go 1.18 require ( - github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest v0.66.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest v0.67.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector v0.67.0 + go.opentelemetry.io/collector/component v0.67.0 + go.opentelemetry.io/collector/confmap v0.67.0 + go.opentelemetry.io/collector/consumer v0.67.0 + go.opentelemetry.io/collector/pdata v1.0.0-rc1 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.24.0 ) @@ -36,7 +36,7 @@ require ( github.com/rs/cors v1.8.2 // indirect github.com/stretchr/objx v0.5.0 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/featuregate v0.67.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect diff --git a/receiver/bigipreceiver/go.sum b/receiver/bigipreceiver/go.sum index 48cfdf98e0995..785f1f892fca5 100644 --- a/receiver/bigipreceiver/go.sum +++ b/receiver/bigipreceiver/go.sum @@ -292,18 +292,18 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/component v0.67.0 h1:GCBRZAqk4yNaT4L1uwlbbwophFHrxYccLZ4Uj1Ifs/M= +go.opentelemetry.io/collector/component v0.67.0/go.mod h1:Txa2lm9oe7xsGQN8u7GdUIrRpAHFIKsTO4Qi3/CSmKk= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 h1:aUEBEdCa6iamGzg6fuYxDA8ThxvOG240mAvWDU+XLio= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4/go.mod h1:l2MdsbKTocpPS5nQZscqTR9jd8u96VYZdcpF8Sye7mA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= diff --git a/receiver/bigipreceiver/integration_test.go b/receiver/bigipreceiver/integration_test.go index e9f7b6f38efc9..840a254f6457e 100644 --- a/receiver/bigipreceiver/integration_test.go +++ b/receiver/bigipreceiver/integration_test.go @@ -28,6 +28,7 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/consumer/consumertest" + "go.opentelemetry.io/collector/receiver/receivertest" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest/golden" @@ -47,7 +48,7 @@ func TestBigIpIntegration(t *testing.T) { cfg.ScraperControllerSettings.CollectionInterval = 100 * time.Millisecond consumer := new(consumertest.MetricsSink) - settings := componenttest.NewNopReceiverCreateSettings() + settings := receivertest.NewNopCreateSettings() rcvr, err := factory.CreateMetricsReceiver(context.Background(), settings, cfg, consumer) require.NoError(t, err, "failed creating metrics receiver") diff --git a/receiver/bigipreceiver/internal/metadata/generated_metrics.go b/receiver/bigipreceiver/internal/metadata/generated_metrics.go index 952fcc1b83d57..898cad01060c8 100644 --- a/receiver/bigipreceiver/internal/metadata/generated_metrics.go +++ b/receiver/bigipreceiver/internal/metadata/generated_metrics.go @@ -9,6 +9,7 @@ import ( "go.opentelemetry.io/collector/confmap" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" + "go.opentelemetry.io/collector/receiver" ) // MetricSettings provides common settings for a particular metric. @@ -1702,7 +1703,7 @@ func WithStartTime(startTime pcommon.Timestamp) metricBuilderOption { } } -func NewMetricsBuilder(ms MetricsSettings, settings component.ReceiverCreateSettings, options ...metricBuilderOption) *MetricsBuilder { +func NewMetricsBuilder(ms MetricsSettings, settings receiver.CreateSettings, options ...metricBuilderOption) *MetricsBuilder { mb := &MetricsBuilder{ startTime: pcommon.NewTimestampFromTime(time.Now()), metricsBuffer: pmetric.NewMetrics(), diff --git a/receiver/bigipreceiver/internal/metadata/generated_metrics_test.go b/receiver/bigipreceiver/internal/metadata/generated_metrics_test.go index 0494467e04afd..0a059ace06a4a 100644 --- a/receiver/bigipreceiver/internal/metadata/generated_metrics_test.go +++ b/receiver/bigipreceiver/internal/metadata/generated_metrics_test.go @@ -7,9 +7,9 @@ import ( "testing" "github.com/stretchr/testify/assert" - "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" + "go.opentelemetry.io/collector/receiver/receivertest" "go.uber.org/zap" "go.uber.org/zap/zaptest/observer" ) @@ -17,7 +17,7 @@ import ( func TestDefaultMetrics(t *testing.T) { start := pcommon.Timestamp(1_000_000_000) ts := pcommon.Timestamp(1_000_001_000) - mb := NewMetricsBuilder(DefaultMetricsSettings(), componenttest.NewNopReceiverCreateSettings(), WithStartTime(start)) + mb := NewMetricsBuilder(DefaultMetricsSettings(), receivertest.NewNopCreateSettings(), WithStartTime(start)) enabledMetrics := make(map[string]bool) enabledMetrics["bigip.node.availability"] = true @@ -149,7 +149,7 @@ func TestAllMetrics(t *testing.T) { BigipVirtualServerRequestCount: MetricSettings{Enabled: true}, } observedZapCore, observedLogs := observer.New(zap.WarnLevel) - settings := componenttest.NewNopReceiverCreateSettings() + settings := receivertest.NewNopCreateSettings() settings.Logger = zap.New(observedZapCore) mb := NewMetricsBuilder(metricsSettings, settings, WithStartTime(start)) @@ -649,7 +649,7 @@ func TestNoMetrics(t *testing.T) { BigipVirtualServerRequestCount: MetricSettings{Enabled: false}, } observedZapCore, observedLogs := observer.New(zap.WarnLevel) - settings := componenttest.NewNopReceiverCreateSettings() + settings := receivertest.NewNopCreateSettings() settings.Logger = zap.New(observedZapCore) mb := NewMetricsBuilder(metricsSettings, settings, WithStartTime(start)) diff --git a/receiver/bigipreceiver/scraper.go b/receiver/bigipreceiver/scraper.go index b27cd5ba2485d..05c7750d008dc 100644 --- a/receiver/bigipreceiver/scraper.go +++ b/receiver/bigipreceiver/scraper.go @@ -24,6 +24,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" + "go.opentelemetry.io/collector/receiver" "go.opentelemetry.io/collector/receiver/scrapererror" "go.uber.org/zap" @@ -47,7 +48,7 @@ type bigipScraper struct { } // newScraper creates an initialized bigipScraper -func newScraper(logger *zap.Logger, cfg *Config, settings component.ReceiverCreateSettings) *bigipScraper { +func newScraper(logger *zap.Logger, cfg *Config, settings receiver.CreateSettings) *bigipScraper { return &bigipScraper{ logger: logger, cfg: cfg, diff --git a/receiver/bigipreceiver/scraper_test.go b/receiver/bigipreceiver/scraper_test.go index 0a2872c0bc0a3..8aedca210b436 100644 --- a/receiver/bigipreceiver/scraper_test.go +++ b/receiver/bigipreceiver/scraper_test.go @@ -27,6 +27,7 @@ import ( "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/config/configtls" "go.opentelemetry.io/collector/pdata/pmetric" + "go.opentelemetry.io/collector/receiver/receivertest" "go.opentelemetry.io/collector/receiver/scrapererror" "go.uber.org/zap" @@ -258,7 +259,7 @@ func TestScaperScrape(t *testing.T) { for _, tc := range testCases { t.Run(tc.desc, func(t *testing.T) { - scraper := newScraper(zap.NewNop(), createDefaultConfig().(*Config), componenttest.NewNopReceiverCreateSettings()) + scraper := newScraper(zap.NewNop(), createDefaultConfig().(*Config), receivertest.NewNopCreateSettings()) scraper.client = tc.setupMockClient(t) actualMetrics, err := scraper.scrape(context.Background()) diff --git a/receiver/carbonreceiver/factory.go b/receiver/carbonreceiver/factory.go index 505f205a0a6be..97be07a859558 100644 --- a/receiver/carbonreceiver/factory.go +++ b/receiver/carbonreceiver/factory.go @@ -21,6 +21,7 @@ import ( "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confignet" "go.opentelemetry.io/collector/consumer" + "go.opentelemetry.io/collector/receiver" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/carbonreceiver/protocol" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/carbonreceiver/transport" @@ -36,11 +37,11 @@ const ( ) // NewFactory creates a factory for Carbon receiver. -func NewFactory() component.ReceiverFactory { - return component.NewReceiverFactory( +func NewFactory() receiver.Factory { + return receiver.NewFactory( typeStr, createDefaultConfig, - component.WithMetricsReceiver(createMetricsReceiver, stability)) + receiver.WithMetrics(createMetricsReceiver, stability)) } func createDefaultConfig() component.Config { @@ -60,10 +61,10 @@ func createDefaultConfig() component.Config { func createMetricsReceiver( _ context.Context, - params component.ReceiverCreateSettings, + params receiver.CreateSettings, cfg component.Config, consumer consumer.Metrics, -) (component.MetricsReceiver, error) { +) (receiver.Metrics, error) { rCfg := cfg.(*Config) return New(params, *rCfg, consumer) diff --git a/receiver/carbonreceiver/factory_test.go b/receiver/carbonreceiver/factory_test.go index 4650e476a9a62..8707ca217824e 100644 --- a/receiver/carbonreceiver/factory_test.go +++ b/receiver/carbonreceiver/factory_test.go @@ -21,6 +21,7 @@ import ( "github.com/stretchr/testify/assert" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/consumer/consumertest" + "go.opentelemetry.io/collector/receiver/receivertest" ) func TestCreateDefaultConfig(t *testing.T) { @@ -34,7 +35,7 @@ func TestCreateReceiver(t *testing.T) { cfg := createDefaultConfig().(*Config) cfg.Endpoint = "localhost:0" // Endpoint is required, not going to be used here. - params := componenttest.NewNopReceiverCreateSettings() + params := receivertest.NewNopCreateSettings() tReceiver, err := createMetricsReceiver(context.Background(), params, cfg, consumertest.NewNop()) assert.NoError(t, err) assert.NotNil(t, tReceiver, "receiver creation failed") diff --git a/receiver/carbonreceiver/go.mod b/receiver/carbonreceiver/go.mod index e6e1e94c22446..241c132824ef7 100644 --- a/receiver/carbonreceiver/go.mod +++ b/receiver/carbonreceiver/go.mod @@ -4,14 +4,14 @@ go 1.18 require ( github.com/census-instrumentation/opencensus-proto v0.4.1 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.66.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.67.0 github.com/stretchr/testify v1.8.1 go.opencensus.io v0.24.0 - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector v0.67.0 + go.opentelemetry.io/collector/component v0.67.0 + go.opentelemetry.io/collector/confmap v0.67.0 + go.opentelemetry.io/collector/consumer v0.67.0 go.uber.org/zap v1.24.0 google.golang.org/protobuf v1.28.1 ) @@ -36,16 +36,16 @@ 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/internal/coreinternal v0.66.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.67.0 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/prometheus/client_golang v1.14.0 // indirect github.com/prometheus/client_model v0.3.0 // indirect github.com/prometheus/common v0.37.0 // indirect github.com/prometheus/procfs v0.8.0 // indirect github.com/prometheus/statsd_exporter v0.22.7 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 // indirect - go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/featuregate v0.67.0 // indirect + go.opentelemetry.io/collector/pdata v1.0.0-rc1 // indirect + go.opentelemetry.io/collector/semconv v0.67.0 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.33.0 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect diff --git a/receiver/carbonreceiver/go.sum b/receiver/carbonreceiver/go.sum index 7f1be4c9b7933..cce4c0c70129e 100644 --- a/receiver/carbonreceiver/go.sum +++ b/receiver/carbonreceiver/go.sum @@ -374,20 +374,20 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 h1:Q5L9Urod3c8as6ZYaoaqBjarx/HXxsxy34DFZIU2fO4= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/component v0.67.0 h1:GCBRZAqk4yNaT4L1uwlbbwophFHrxYccLZ4Uj1Ifs/M= +go.opentelemetry.io/collector/component v0.67.0/go.mod h1:Txa2lm9oe7xsGQN8u7GdUIrRpAHFIKsTO4Qi3/CSmKk= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= +go.opentelemetry.io/collector/semconv v0.67.0 h1:zLAvcQa6Kgow52FFLrmk7/9ZVtEYyA73+xDtCcFG78Q= +go.opentelemetry.io/collector/semconv v0.67.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/receiver/carbonreceiver/receiver.go b/receiver/carbonreceiver/receiver.go index 9dd0db018990c..1d85903389f44 100644 --- a/receiver/carbonreceiver/receiver.go +++ b/receiver/carbonreceiver/receiver.go @@ -22,6 +22,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/consumer" + "go.opentelemetry.io/collector/receiver" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/carbonreceiver/protocol" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/carbonreceiver/transport" @@ -31,10 +32,10 @@ var ( errEmptyEndpoint = errors.New("empty endpoint") ) -// carbonreceiver implements a component.MetricsReceiver for Carbon plaintext, aka "line", protocol. +// carbonreceiver implements a receiver.Metrics for Carbon plaintext, aka "line", protocol. // see https://graphite.readthedocs.io/en/latest/feeding-carbon.html#the-plaintext-protocol. type carbonReceiver struct { - settings component.ReceiverCreateSettings + settings receiver.CreateSettings config *Config server transport.Server @@ -43,14 +44,14 @@ type carbonReceiver struct { nextConsumer consumer.Metrics } -var _ component.MetricsReceiver = (*carbonReceiver)(nil) +var _ receiver.Metrics = (*carbonReceiver)(nil) // New creates the Carbon receiver with the given configuration. func New( - set component.ReceiverCreateSettings, + set receiver.CreateSettings, config Config, nextConsumer consumer.Metrics, -) (component.MetricsReceiver, error) { +) (receiver.Metrics, error) { if nextConsumer == nil { return nil, component.ErrNilNextConsumer diff --git a/receiver/carbonreceiver/receiver_test.go b/receiver/carbonreceiver/receiver_test.go index dc8e1c2c56968..04a203b647955 100644 --- a/receiver/carbonreceiver/receiver_test.go +++ b/receiver/carbonreceiver/receiver_test.go @@ -29,6 +29,7 @@ import ( "go.opentelemetry.io/collector/config/confignet" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/consumer/consumertest" + "go.opentelemetry.io/collector/receiver/receivertest" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/common/testutil" internaldata "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus" @@ -149,7 +150,7 @@ func Test_carbonreceiver_New(t *testing.T) { } for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { - got, err := New(componenttest.NewNopReceiverCreateSettings(), tt.args.config, tt.args.nextConsumer) + got, err := New(receivertest.NewNopCreateSettings(), tt.args.config, tt.args.nextConsumer) assert.Equal(t, tt.wantErr, err) if err == nil { require.NotNil(t, got) @@ -198,7 +199,7 @@ func Test_carbonreceiver_EndToEnd(t *testing.T) { cfg := tt.configFn() cfg.Endpoint = addr sink := new(consumertest.MetricsSink) - rcv, err := New(componenttest.NewNopReceiverCreateSettings(), *cfg, sink) + rcv, err := New(receivertest.NewNopCreateSettings(), *cfg, sink) require.NoError(t, err) r := rcv.(*carbonReceiver) diff --git a/receiver/carbonreceiver/reporter.go b/receiver/carbonreceiver/reporter.go index 221af0fb89df7..08920c8a64902 100644 --- a/receiver/carbonreceiver/reporter.go +++ b/receiver/carbonreceiver/reporter.go @@ -18,8 +18,8 @@ import ( "context" "go.opencensus.io/trace" - "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/obsreport" + "go.opentelemetry.io/collector/receiver" "go.uber.org/zap" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/carbonreceiver/transport" @@ -35,7 +35,7 @@ type reporter struct { var _ transport.Reporter = (*reporter)(nil) -func newReporter(set component.ReceiverCreateSettings) (transport.Reporter, error) { +func newReporter(set receiver.CreateSettings) (transport.Reporter, error) { obsrecv, err := obsreport.NewReceiver(obsreport.ReceiverSettings{ ReceiverID: set.ID, Transport: "tcp", diff --git a/receiver/carbonreceiver/reporter_test.go b/receiver/carbonreceiver/reporter_test.go index 73f95354917ca..ac1ce608a8d17 100644 --- a/receiver/carbonreceiver/reporter_test.go +++ b/receiver/carbonreceiver/reporter_test.go @@ -39,12 +39,12 @@ func TestReporterObservability(t *testing.T) { reporter.OnMetricsProcessed(ctx, 17, nil) - require.NoError(t, obsreporttest.CheckReceiverMetrics(tt, receiverID, "tcp", 17, 0)) + require.NoError(t, tt.CheckReceiverMetrics("tcp", 17, 0)) // Below just exercise the error paths. err = errors.New("fake error for tests") reporter.OnTranslationError(ctx, err) reporter.OnMetricsProcessed(ctx, 10, err) - require.NoError(t, obsreporttest.CheckReceiverMetrics(tt, receiverID, "tcp", 17, 10)) + require.NoError(t, tt.CheckReceiverMetrics("tcp", 17, 10)) } diff --git a/receiver/chronyreceiver/factory.go b/receiver/chronyreceiver/factory.go index a2487b27db8db..8515ce415f4af 100644 --- a/receiver/chronyreceiver/factory.go +++ b/receiver/chronyreceiver/factory.go @@ -20,6 +20,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/consumer" + "go.opentelemetry.io/collector/receiver" "go.opentelemetry.io/collector/receiver/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/chronyreceiver/internal/chrony" @@ -32,19 +33,19 @@ const ( stability = component.StabilityLevelAlpha ) -func NewFactory() component.ReceiverFactory { - return component.NewReceiverFactory( +func NewFactory() receiver.Factory { + return receiver.NewFactory( typeStr, newDefaultCongfig, - component.WithMetricsReceiver(newMetricsReceiver, stability), + receiver.WithMetrics(newMetricsReceiver, stability), ) } func newMetricsReceiver( ctx context.Context, - set component.ReceiverCreateSettings, + set receiver.CreateSettings, rCfg component.Config, - consumer consumer.Metrics) (component.MetricsReceiver, error) { + consumer consumer.Metrics) (receiver.Metrics, error) { cfg, ok := rCfg.(*Config) if !ok { return nil, fmt.Errorf("wrong config provided: %w", errInvalidValue) diff --git a/receiver/chronyreceiver/factory_test.go b/receiver/chronyreceiver/factory_test.go index e01a11173df3d..e6c4dd4cea771 100644 --- a/receiver/chronyreceiver/factory_test.go +++ b/receiver/chronyreceiver/factory_test.go @@ -23,6 +23,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/consumer/consumertest" + "go.opentelemetry.io/collector/receiver/receivertest" "go.opentelemetry.io/collector/receiver/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/chronyreceiver/internal/metadata" @@ -48,7 +49,7 @@ func TestCreatingMetricsReceiver(t *testing.T) { factory := NewFactory() mem, err := factory.CreateMetricsReceiver( context.Background(), - componenttest.NewNopReceiverCreateSettings(), + receivertest.NewNopCreateSettings(), &Config{ ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ CollectionInterval: 30 * time.Second, diff --git a/receiver/chronyreceiver/go.mod b/receiver/chronyreceiver/go.mod index 9b968c223f514..96c1151f32082 100644 --- a/receiver/chronyreceiver/go.mod +++ b/receiver/chronyreceiver/go.mod @@ -6,11 +6,11 @@ require ( github.com/facebook/time v0.0.0-20220713225404-f7a0d7702d50 github.com/stretchr/testify v1.8.1 github.com/tilinna/clock v1.1.0 - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector v0.67.0 + go.opentelemetry.io/collector/component v0.67.0 + go.opentelemetry.io/collector/confmap v0.67.0 + go.opentelemetry.io/collector/consumer v0.67.0 + go.opentelemetry.io/collector/pdata v1.0.0-rc1 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.24.0 ) @@ -31,7 +31,7 @@ require ( github.com/sirupsen/logrus v1.8.1 // indirect github.com/stretchr/objx v0.5.0 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/featuregate v0.67.0 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/receiver/chronyreceiver/go.sum b/receiver/chronyreceiver/go.sum index b46b7557bce04..4692ac038c60b 100644 --- a/receiver/chronyreceiver/go.sum +++ b/receiver/chronyreceiver/go.sum @@ -288,18 +288,18 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/component v0.67.0 h1:GCBRZAqk4yNaT4L1uwlbbwophFHrxYccLZ4Uj1Ifs/M= +go.opentelemetry.io/collector/component v0.67.0/go.mod h1:Txa2lm9oe7xsGQN8u7GdUIrRpAHFIKsTO4Qi3/CSmKk= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/receiver/chronyreceiver/internal/metadata/generated_metrics.go b/receiver/chronyreceiver/internal/metadata/generated_metrics.go index 9a6cd676c7b54..ff18d917b28db 100644 --- a/receiver/chronyreceiver/internal/metadata/generated_metrics.go +++ b/receiver/chronyreceiver/internal/metadata/generated_metrics.go @@ -9,6 +9,7 @@ import ( "go.opentelemetry.io/collector/confmap" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" + "go.opentelemetry.io/collector/receiver" ) // MetricSettings provides common settings for a particular metric. @@ -486,7 +487,7 @@ func WithStartTime(startTime pcommon.Timestamp) metricBuilderOption { } } -func NewMetricsBuilder(ms MetricsSettings, settings component.ReceiverCreateSettings, options ...metricBuilderOption) *MetricsBuilder { +func NewMetricsBuilder(ms MetricsSettings, settings receiver.CreateSettings, options ...metricBuilderOption) *MetricsBuilder { mb := &MetricsBuilder{ startTime: pcommon.NewTimestampFromTime(time.Now()), metricsBuffer: pmetric.NewMetrics(), diff --git a/receiver/chronyreceiver/internal/metadata/generated_metrics_test.go b/receiver/chronyreceiver/internal/metadata/generated_metrics_test.go index a25efaaecedb4..8a0f0db27fd8d 100644 --- a/receiver/chronyreceiver/internal/metadata/generated_metrics_test.go +++ b/receiver/chronyreceiver/internal/metadata/generated_metrics_test.go @@ -7,9 +7,9 @@ import ( "testing" "github.com/stretchr/testify/assert" - "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" + "go.opentelemetry.io/collector/receiver/receivertest" "go.uber.org/zap" "go.uber.org/zap/zaptest/observer" ) @@ -17,7 +17,7 @@ import ( func TestDefaultMetrics(t *testing.T) { start := pcommon.Timestamp(1_000_000_000) ts := pcommon.Timestamp(1_000_001_000) - mb := NewMetricsBuilder(DefaultMetricsSettings(), componenttest.NewNopReceiverCreateSettings(), WithStartTime(start)) + mb := NewMetricsBuilder(DefaultMetricsSettings(), receivertest.NewNopCreateSettings(), WithStartTime(start)) enabledMetrics := make(map[string]bool) mb.RecordNtpFrequencyOffsetDataPoint(ts, 1, AttributeLeapStatus(1)) @@ -65,7 +65,7 @@ func TestAllMetrics(t *testing.T) { NtpTimeRootDelay: MetricSettings{Enabled: true}, } observedZapCore, observedLogs := observer.New(zap.WarnLevel) - settings := componenttest.NewNopReceiverCreateSettings() + settings := receivertest.NewNopCreateSettings() settings.Logger = zap.New(observedZapCore) mb := NewMetricsBuilder(metricsSettings, settings, WithStartTime(start)) @@ -203,7 +203,7 @@ func TestNoMetrics(t *testing.T) { NtpTimeRootDelay: MetricSettings{Enabled: false}, } observedZapCore, observedLogs := observer.New(zap.WarnLevel) - settings := componenttest.NewNopReceiverCreateSettings() + settings := receivertest.NewNopCreateSettings() settings.Logger = zap.New(observedZapCore) mb := NewMetricsBuilder(metricsSettings, settings, WithStartTime(start)) diff --git a/receiver/chronyreceiver/scraper.go b/receiver/chronyreceiver/scraper.go index a67ef34b0a55e..30a9c646a4fa3 100644 --- a/receiver/chronyreceiver/scraper.go +++ b/receiver/chronyreceiver/scraper.go @@ -18,9 +18,9 @@ import ( "context" "github.com/tilinna/clock" - "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" + "go.opentelemetry.io/collector/receiver" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/chronyreceiver/internal/chrony" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/chronyreceiver/internal/metadata" @@ -31,7 +31,7 @@ type chronyScraper struct { mb *metadata.MetricsBuilder } -func newScraper(ctx context.Context, client chrony.Client, cfg *Config, set component.ReceiverCreateSettings) *chronyScraper { +func newScraper(ctx context.Context, client chrony.Client, cfg *Config, set receiver.CreateSettings) *chronyScraper { return &chronyScraper{ client: client, mb: metadata.NewMetricsBuilder(cfg.MetricsSettings, set, diff --git a/receiver/chronyreceiver/scraper_test.go b/receiver/chronyreceiver/scraper_test.go index f0f9b9354f35f..4b81d64c5964d 100644 --- a/receiver/chronyreceiver/scraper_test.go +++ b/receiver/chronyreceiver/scraper_test.go @@ -22,9 +22,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" "github.com/tilinna/clock" - "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" + "go.opentelemetry.io/collector/receiver/receivertest" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/chronyreceiver/internal/chrony" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/chronyreceiver/internal/metadata" @@ -126,7 +126,7 @@ func TestChronyScraper(t *testing.T) { chronym.On("GetTrackingData").Return(tc.mockTracking, tc.mockErr) ctx := clock.Context(context.Background(), clck) - scraper := newScraper(ctx, chronym, tc.conf, componenttest.NewNopReceiverCreateSettings()) + scraper := newScraper(ctx, chronym, tc.conf, receivertest.NewNopCreateSettings()) metrics, err := scraper.scrape(ctx) diff --git a/receiver/cloudfoundryreceiver/factory.go b/receiver/cloudfoundryreceiver/factory.go index 39c19ea590fd9..a2d291c53ed4e 100644 --- a/receiver/cloudfoundryreceiver/factory.go +++ b/receiver/cloudfoundryreceiver/factory.go @@ -22,6 +22,7 @@ import ( "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/config/configtls" "go.opentelemetry.io/collector/consumer" + "go.opentelemetry.io/collector/receiver" ) // This file implements factory for Cloud Foundry receiver. @@ -35,11 +36,11 @@ const ( ) // NewFactory creates a factory for collectd receiver. -func NewFactory() component.ReceiverFactory { - return component.NewReceiverFactory( +func NewFactory() receiver.Factory { + return receiver.NewFactory( typeStr, createDefaultConfig, - component.WithMetricsReceiver(createMetricsReceiver, stability)) + receiver.WithMetrics(createMetricsReceiver, stability)) } func createDefaultConfig() component.Config { @@ -68,10 +69,10 @@ func createDefaultConfig() component.Config { func createMetricsReceiver( _ context.Context, - params component.ReceiverCreateSettings, + params receiver.CreateSettings, cfg component.Config, nextConsumer consumer.Metrics, -) (component.MetricsReceiver, error) { +) (receiver.Metrics, error) { c := cfg.(*Config) return newCloudFoundryReceiver(params, *c, nextConsumer) } diff --git a/receiver/cloudfoundryreceiver/factory_test.go b/receiver/cloudfoundryreceiver/factory_test.go index fafb355909d87..551d6814e815c 100644 --- a/receiver/cloudfoundryreceiver/factory_test.go +++ b/receiver/cloudfoundryreceiver/factory_test.go @@ -22,6 +22,7 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/consumer/consumertest" + "go.opentelemetry.io/collector/receiver/receivertest" ) func TestCreateDefaultConfig(t *testing.T) { @@ -35,7 +36,7 @@ func TestCreateReceiver(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() - params := componenttest.NewNopReceiverCreateSettings() + params := receivertest.NewNopCreateSettings() tReceiver, err := factory.CreateMetricsReceiver(context.Background(), params, cfg, consumertest.NewNop()) assert.NoError(t, err) assert.NotNil(t, tReceiver, "receiver creation failed") diff --git a/receiver/cloudfoundryreceiver/go.mod b/receiver/cloudfoundryreceiver/go.mod index 7daa2e0cd890d..9f81ad86e08ef 100644 --- a/receiver/cloudfoundryreceiver/go.mod +++ b/receiver/cloudfoundryreceiver/go.mod @@ -6,11 +6,11 @@ require ( code.cloudfoundry.org/go-loggregator v7.4.0+incompatible github.com/cloudfoundry-incubator/uaago v0.0.0-20190307164349-8136b7bbe76e github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector v0.67.0 + go.opentelemetry.io/collector/component v0.67.0 + go.opentelemetry.io/collector/confmap v0.67.0 + go.opentelemetry.io/collector/consumer v0.67.0 + go.opentelemetry.io/collector/pdata v1.0.0-rc1 go.uber.org/zap v1.24.0 ) @@ -40,7 +40,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rs/cors v1.8.2 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/featuregate v0.67.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect diff --git a/receiver/cloudfoundryreceiver/go.sum b/receiver/cloudfoundryreceiver/go.sum index 0eac85134158a..2f0ab87667fec 100644 --- a/receiver/cloudfoundryreceiver/go.sum +++ b/receiver/cloudfoundryreceiver/go.sum @@ -320,18 +320,18 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/component v0.67.0 h1:GCBRZAqk4yNaT4L1uwlbbwophFHrxYccLZ4Uj1Ifs/M= +go.opentelemetry.io/collector/component v0.67.0/go.mod h1:Txa2lm9oe7xsGQN8u7GdUIrRpAHFIKsTO4Qi3/CSmKk= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 h1:aUEBEdCa6iamGzg6fuYxDA8ThxvOG240mAvWDU+XLio= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4/go.mod h1:l2MdsbKTocpPS5nQZscqTR9jd8u96VYZdcpF8Sye7mA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= diff --git a/receiver/cloudfoundryreceiver/receiver.go b/receiver/cloudfoundryreceiver/receiver.go index 083faeb455437..790dcd6e00e2c 100644 --- a/receiver/cloudfoundryreceiver/receiver.go +++ b/receiver/cloudfoundryreceiver/receiver.go @@ -26,6 +26,7 @@ import ( "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/obsreport" "go.opentelemetry.io/collector/pdata/pmetric" + "go.opentelemetry.io/collector/receiver" ) const ( @@ -34,9 +35,9 @@ const ( instrumentationLibName = "otelcol/cloudfoundry" ) -var _ component.MetricsReceiver = (*cloudFoundryReceiver)(nil) +var _ receiver.Metrics = (*cloudFoundryReceiver)(nil) -// newCloudFoundryReceiver implements the component.MetricsReceiver for Cloud Foundry protocol. +// newCloudFoundryReceiver implements the receiver.Metrics for Cloud Foundry protocol. type cloudFoundryReceiver struct { settings component.TelemetrySettings cancel context.CancelFunc @@ -49,9 +50,9 @@ type cloudFoundryReceiver struct { // newCloudFoundryReceiver creates the Cloud Foundry receiver with the given parameters. func newCloudFoundryReceiver( - settings component.ReceiverCreateSettings, + settings receiver.CreateSettings, config Config, - nextConsumer consumer.Metrics) (component.MetricsReceiver, error) { + nextConsumer consumer.Metrics) (receiver.Metrics, error) { if nextConsumer == nil { return nil, component.ErrNilNextConsumer diff --git a/receiver/cloudfoundryreceiver/receiver_test.go b/receiver/cloudfoundryreceiver/receiver_test.go index 8ce3f1dd77916..8977376a00f39 100644 --- a/receiver/cloudfoundryreceiver/receiver_test.go +++ b/receiver/cloudfoundryreceiver/receiver_test.go @@ -21,13 +21,14 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/consumer/consumertest" + "go.opentelemetry.io/collector/receiver/receivertest" ) // Test to make sure a new receiver can be created properly, started and shutdown with the default config func TestDefaultValidReceiver(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig().(*Config) - params := componenttest.NewNopReceiverCreateSettings() + params := receivertest.NewNopCreateSettings() receiver, err := newCloudFoundryReceiver( params, @@ -52,7 +53,7 @@ func TestDefaultValidReceiver(t *testing.T) { func TestInvalidConsumer(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig().(*Config) - params := componenttest.NewNopReceiverCreateSettings() + params := receivertest.NewNopCreateSettings() receiver, err := newCloudFoundryReceiver( params, diff --git a/receiver/collectdreceiver/factory.go b/receiver/collectdreceiver/factory.go index d38adec19fdc8..7dcc42a8438f8 100644 --- a/receiver/collectdreceiver/factory.go +++ b/receiver/collectdreceiver/factory.go @@ -24,6 +24,7 @@ import ( "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confignet" "go.opentelemetry.io/collector/consumer" + "go.opentelemetry.io/collector/receiver" ) // This file implements factory for CollectD receiver. @@ -37,11 +38,11 @@ const ( ) // NewFactory creates a factory for collectd receiver. -func NewFactory() component.ReceiverFactory { - return component.NewReceiverFactory( +func NewFactory() receiver.Factory { + return receiver.NewFactory( typeStr, createDefaultConfig, - component.WithMetricsReceiver(createMetricsReceiver, stability)) + receiver.WithMetrics(createMetricsReceiver, stability)) } func createDefaultConfig() component.Config { return &Config{ @@ -56,10 +57,10 @@ func createDefaultConfig() component.Config { func createMetricsReceiver( _ context.Context, - params component.ReceiverCreateSettings, + params receiver.CreateSettings, cfg component.Config, nextConsumer consumer.Metrics, -) (component.MetricsReceiver, error) { +) (receiver.Metrics, error) { c := cfg.(*Config) c.Encoding = strings.ToLower(c.Encoding) // CollectD receiver only supports JSON encoding. We expose a config option diff --git a/receiver/collectdreceiver/factory_test.go b/receiver/collectdreceiver/factory_test.go index 842a3e36ae8ad..de36f4a540196 100644 --- a/receiver/collectdreceiver/factory_test.go +++ b/receiver/collectdreceiver/factory_test.go @@ -21,6 +21,7 @@ import ( "github.com/stretchr/testify/assert" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/consumer/consumertest" + "go.opentelemetry.io/collector/receiver/receivertest" ) func TestCreateDefaultConfig(t *testing.T) { @@ -34,7 +35,7 @@ func TestCreateReceiver(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() - params := componenttest.NewNopReceiverCreateSettings() + params := receivertest.NewNopCreateSettings() tReceiver, err := factory.CreateMetricsReceiver(context.Background(), params, cfg, consumertest.NewNop()) assert.NoError(t, err) assert.NotNil(t, tReceiver, "receiver creation failed") diff --git a/receiver/collectdreceiver/go.mod b/receiver/collectdreceiver/go.mod index 6644b45cef55d..11ef93149ecd8 100644 --- a/receiver/collectdreceiver/go.mod +++ b/receiver/collectdreceiver/go.mod @@ -4,14 +4,14 @@ go 1.18 require ( github.com/census-instrumentation/opencensus-proto v0.4.1 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.66.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.67.0 github.com/stretchr/testify v1.8.1 go.opencensus.io v0.24.0 - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector v0.67.0 + go.opentelemetry.io/collector/component v0.67.0 + go.opentelemetry.io/collector/confmap v0.67.0 + go.opentelemetry.io/collector/consumer v0.67.0 go.uber.org/zap v1.24.0 google.golang.org/protobuf v1.28.1 ) @@ -29,11 +29,11 @@ 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/internal/coreinternal v0.66.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.67.0 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 // indirect - go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/featuregate v0.67.0 // indirect + go.opentelemetry.io/collector/pdata v1.0.0-rc1 // indirect + go.opentelemetry.io/collector/semconv v0.67.0 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/receiver/collectdreceiver/go.sum b/receiver/collectdreceiver/go.sum index 15409947f950f..dcf9437ab85e5 100644 --- a/receiver/collectdreceiver/go.sum +++ b/receiver/collectdreceiver/go.sum @@ -263,20 +263,20 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 h1:Q5L9Urod3c8as6ZYaoaqBjarx/HXxsxy34DFZIU2fO4= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/component v0.67.0 h1:GCBRZAqk4yNaT4L1uwlbbwophFHrxYccLZ4Uj1Ifs/M= +go.opentelemetry.io/collector/component v0.67.0/go.mod h1:Txa2lm9oe7xsGQN8u7GdUIrRpAHFIKsTO4Qi3/CSmKk= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= +go.opentelemetry.io/collector/semconv v0.67.0 h1:zLAvcQa6Kgow52FFLrmk7/9ZVtEYyA73+xDtCcFG78Q= +go.opentelemetry.io/collector/semconv v0.67.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/metric v0.33.0 h1:xQAyl7uGEYvrLAiV/09iTJlp1pZnQ9Wl793qbVvED1E= diff --git a/receiver/collectdreceiver/receiver.go b/receiver/collectdreceiver/receiver.go index d72bf6d35cc61..d00228a3fba5d 100644 --- a/receiver/collectdreceiver/receiver.go +++ b/receiver/collectdreceiver/receiver.go @@ -27,14 +27,15 @@ import ( metricspb "github.com/census-instrumentation/opencensus-proto/gen-go/metrics/v1" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/consumer" + "go.opentelemetry.io/collector/receiver" "go.uber.org/zap" internaldata "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus" ) -var _ component.MetricsReceiver = (*collectdReceiver)(nil) +var _ receiver.Metrics = (*collectdReceiver)(nil) -// collectdReceiver implements the component.MetricsReceiver for CollectD protocol. +// collectdReceiver implements the receiver.Metrics for CollectD protocol. type collectdReceiver struct { logger *zap.Logger addr string @@ -49,7 +50,7 @@ func newCollectdReceiver( addr string, timeout time.Duration, defaultAttrsPrefix string, - nextConsumer consumer.Metrics) (component.MetricsReceiver, error) { + nextConsumer consumer.Metrics) (receiver.Metrics, error) { if nextConsumer == nil { return nil, component.ErrNilNextConsumer } diff --git a/receiver/couchdbreceiver/factory.go b/receiver/couchdbreceiver/factory.go index 5451ed48f62c4..b0f507d0c71b7 100644 --- a/receiver/couchdbreceiver/factory.go +++ b/receiver/couchdbreceiver/factory.go @@ -23,6 +23,7 @@ import ( "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/config/configtls" "go.opentelemetry.io/collector/consumer" + "go.opentelemetry.io/collector/receiver" "go.opentelemetry.io/collector/receiver/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/couchdbreceiver/internal/metadata" @@ -34,11 +35,11 @@ const ( ) // NewFactory creates the couchdbreceiver factory -func NewFactory() component.ReceiverFactory { - return component.NewReceiverFactory( +func NewFactory() receiver.Factory { + return receiver.NewFactory( typeStr, createDefaultConfig, - component.WithMetricsReceiver(createMetricsReceiver, stability)) + receiver.WithMetrics(createMetricsReceiver, stability)) } func createDefaultConfig() component.Config { @@ -58,10 +59,10 @@ func createDefaultConfig() component.Config { func createMetricsReceiver( _ context.Context, - params component.ReceiverCreateSettings, + params receiver.CreateSettings, rConf component.Config, consumer consumer.Metrics, -) (component.MetricsReceiver, error) { +) (receiver.Metrics, error) { cfg := rConf.(*Config) ns := newCouchdbScraper(params, cfg) scraper, err := scraperhelper.NewScraper(typeStr, ns.scrape, scraperhelper.WithStart(ns.start)) diff --git a/receiver/couchdbreceiver/factory_test.go b/receiver/couchdbreceiver/factory_test.go index fcc157619191e..ab36e0c0e02ba 100644 --- a/receiver/couchdbreceiver/factory_test.go +++ b/receiver/couchdbreceiver/factory_test.go @@ -20,8 +20,8 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/consumer/consumertest" + "go.opentelemetry.io/collector/receiver/receivertest" ) func TestType(t *testing.T) { @@ -52,7 +52,7 @@ func TestCreateMetricsReceiver(t *testing.T) { _, err := createMetricsReceiver( context.Background(), - componenttest.NewNopReceiverCreateSettings(), + receivertest.NewNopCreateSettings(), createDefaultConfig(), consumertest.NewNop(), ) @@ -67,7 +67,7 @@ func TestCreateMetricsReceiver(t *testing.T) { t.Parallel() _, err := createMetricsReceiver( context.Background(), - componenttest.NewNopReceiverCreateSettings(), + receivertest.NewNopCreateSettings(), createDefaultConfig(), nil, ) diff --git a/receiver/couchdbreceiver/go.mod b/receiver/couchdbreceiver/go.mod index 0103cd4b10962..646552c5321dc 100644 --- a/receiver/couchdbreceiver/go.mod +++ b/receiver/couchdbreceiver/go.mod @@ -3,13 +3,13 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/receiver/couchd go 1.18 require ( - github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest v0.66.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest v0.67.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector v0.67.0 + go.opentelemetry.io/collector/component v0.67.0 + go.opentelemetry.io/collector/confmap v0.67.0 + go.opentelemetry.io/collector/consumer v0.67.0 + go.opentelemetry.io/collector/pdata v1.0.0-rc1 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.24.0 ) @@ -38,7 +38,7 @@ require ( github.com/rs/cors v1.8.2 // indirect github.com/stretchr/objx v0.5.0 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/featuregate v0.67.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect diff --git a/receiver/couchdbreceiver/go.sum b/receiver/couchdbreceiver/go.sum index 514130ebee313..eb021acaa59d1 100644 --- a/receiver/couchdbreceiver/go.sum +++ b/receiver/couchdbreceiver/go.sum @@ -295,18 +295,18 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/component v0.67.0 h1:GCBRZAqk4yNaT4L1uwlbbwophFHrxYccLZ4Uj1Ifs/M= +go.opentelemetry.io/collector/component v0.67.0/go.mod h1:Txa2lm9oe7xsGQN8u7GdUIrRpAHFIKsTO4Qi3/CSmKk= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 h1:aUEBEdCa6iamGzg6fuYxDA8ThxvOG240mAvWDU+XLio= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4/go.mod h1:l2MdsbKTocpPS5nQZscqTR9jd8u96VYZdcpF8Sye7mA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= diff --git a/receiver/couchdbreceiver/internal/metadata/generated_metrics.go b/receiver/couchdbreceiver/internal/metadata/generated_metrics.go index 2309f0f89d00f..9fbd262e945bd 100644 --- a/receiver/couchdbreceiver/internal/metadata/generated_metrics.go +++ b/receiver/couchdbreceiver/internal/metadata/generated_metrics.go @@ -9,6 +9,7 @@ import ( "go.opentelemetry.io/collector/confmap" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" + "go.opentelemetry.io/collector/receiver" ) // MetricSettings provides common settings for a particular metric. @@ -616,7 +617,7 @@ func WithStartTime(startTime pcommon.Timestamp) metricBuilderOption { } } -func NewMetricsBuilder(ms MetricsSettings, settings component.ReceiverCreateSettings, options ...metricBuilderOption) *MetricsBuilder { +func NewMetricsBuilder(ms MetricsSettings, settings receiver.CreateSettings, options ...metricBuilderOption) *MetricsBuilder { mb := &MetricsBuilder{ startTime: pcommon.NewTimestampFromTime(time.Now()), metricsBuffer: pmetric.NewMetrics(), diff --git a/receiver/couchdbreceiver/internal/metadata/generated_metrics_test.go b/receiver/couchdbreceiver/internal/metadata/generated_metrics_test.go index d4e92bb2f803c..92f4eecf52aa4 100644 --- a/receiver/couchdbreceiver/internal/metadata/generated_metrics_test.go +++ b/receiver/couchdbreceiver/internal/metadata/generated_metrics_test.go @@ -7,9 +7,9 @@ import ( "testing" "github.com/stretchr/testify/assert" - "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" + "go.opentelemetry.io/collector/receiver/receivertest" "go.uber.org/zap" "go.uber.org/zap/zaptest/observer" ) @@ -17,7 +17,7 @@ import ( func TestDefaultMetrics(t *testing.T) { start := pcommon.Timestamp(1_000_000_000) ts := pcommon.Timestamp(1_000_001_000) - mb := NewMetricsBuilder(DefaultMetricsSettings(), componenttest.NewNopReceiverCreateSettings(), WithStartTime(start)) + mb := NewMetricsBuilder(DefaultMetricsSettings(), receivertest.NewNopCreateSettings(), WithStartTime(start)) enabledMetrics := make(map[string]bool) enabledMetrics["couchdb.average_request_time"] = true @@ -73,7 +73,7 @@ func TestAllMetrics(t *testing.T) { CouchdbHttpdViews: MetricSettings{Enabled: true}, } observedZapCore, observedLogs := observer.New(zap.WarnLevel) - settings := componenttest.NewNopReceiverCreateSettings() + settings := receivertest.NewNopCreateSettings() settings.Logger = zap.New(observedZapCore) mb := NewMetricsBuilder(metricsSettings, settings, WithStartTime(start)) @@ -239,7 +239,7 @@ func TestNoMetrics(t *testing.T) { CouchdbHttpdViews: MetricSettings{Enabled: false}, } observedZapCore, observedLogs := observer.New(zap.WarnLevel) - settings := componenttest.NewNopReceiverCreateSettings() + settings := receivertest.NewNopCreateSettings() settings.Logger = zap.New(observedZapCore) mb := NewMetricsBuilder(metricsSettings, settings, WithStartTime(start)) diff --git a/receiver/couchdbreceiver/scraper.go b/receiver/couchdbreceiver/scraper.go index c7081a4407640..2394b5688a0f4 100644 --- a/receiver/couchdbreceiver/scraper.go +++ b/receiver/couchdbreceiver/scraper.go @@ -23,6 +23,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" + "go.opentelemetry.io/collector/receiver" "go.opentelemetry.io/collector/receiver/scrapererror" "go.uber.org/zap" @@ -36,7 +37,7 @@ type couchdbScraper struct { mb *metadata.MetricsBuilder } -func newCouchdbScraper(settings component.ReceiverCreateSettings, config *Config) *couchdbScraper { +func newCouchdbScraper(settings receiver.CreateSettings, config *Config) *couchdbScraper { return &couchdbScraper{ settings: settings.TelemetrySettings, config: config, diff --git a/receiver/couchdbreceiver/scraper_test.go b/receiver/couchdbreceiver/scraper_test.go index 32052a5643853..719ca38774e03 100644 --- a/receiver/couchdbreceiver/scraper_test.go +++ b/receiver/couchdbreceiver/scraper_test.go @@ -29,6 +29,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config/confighttp" + "go.opentelemetry.io/collector/receiver/receivertest" "go.opentelemetry.io/collector/receiver/scrapererror" "go.uber.org/zap" "go.uber.org/zap/zapcore" @@ -49,7 +50,7 @@ func TestScrape(t *testing.T) { t.Run("scrape from couchdb version 2.31", func(t *testing.T) { mockClient := new(MockClient) mockClient.On("GetStats", "_local").Return(getStats("response_2.31.json")) - scraper := newCouchdbScraper(componenttest.NewNopReceiverCreateSettings(), cfg) + scraper := newCouchdbScraper(receivertest.NewNopCreateSettings(), cfg) scraper.client = mockClient actualMetrics, err := scraper.scrape(context.Background()) @@ -65,7 +66,7 @@ func TestScrape(t *testing.T) { t.Run("scrape from couchdb 3.12", func(t *testing.T) { mockClient := new(MockClient) mockClient.On("GetStats", "_local").Return(getStats("response_3.12.json")) - scraper := newCouchdbScraper(componenttest.NewNopReceiverCreateSettings(), cfg) + scraper := newCouchdbScraper(receivertest.NewNopCreateSettings(), cfg) scraper.client = mockClient actualMetrics, err := scraper.scrape(context.Background()) @@ -81,7 +82,7 @@ func TestScrape(t *testing.T) { t.Run("scrape returns nothing", func(t *testing.T) { mockClient := new(MockClient) mockClient.On("GetStats", "_local").Return(map[string]interface{}{}, nil) - scraper := newCouchdbScraper(componenttest.NewNopReceiverCreateSettings(), cfg) + scraper := newCouchdbScraper(receivertest.NewNopCreateSettings(), cfg) scraper.client = mockClient metrics, err := scraper.scrape(context.Background()) @@ -94,7 +95,7 @@ func TestScrape(t *testing.T) { }) t.Run("scrape error: failed to connect to client", func(t *testing.T) { - scraper := newCouchdbScraper(componenttest.NewNopReceiverCreateSettings(), cfg) + scraper := newCouchdbScraper(receivertest.NewNopCreateSettings(), cfg) _, err := scraper.scrape(context.Background()) require.NotNil(t, err) @@ -103,7 +104,7 @@ func TestScrape(t *testing.T) { t.Run("scrape error: get stats endpoint error", func(t *testing.T) { obs, logs := observer.New(zap.ErrorLevel) - settings := componenttest.NewNopReceiverCreateSettings() + settings := receivertest.NewNopCreateSettings() settings.Logger = zap.New(obs) mockClient := new(MockClient) mockClient.On("GetStats", "_local").Return(getStats("")) @@ -133,7 +134,7 @@ func TestStart(t *testing.T) { cfg.Password = "otelp" require.NoError(t, component.ValidateConfig(cfg)) - scraper := newCouchdbScraper(componenttest.NewNopReceiverCreateSettings(), cfg) + scraper := newCouchdbScraper(receivertest.NewNopCreateSettings(), cfg) err := scraper.start(context.Background(), componenttest.NewNopHost()) require.NoError(t, err) }) @@ -145,7 +146,7 @@ func TestStart(t *testing.T) { cfg.Password = "otelp" require.NoError(t, component.ValidateConfig(cfg)) - scraper := newCouchdbScraper(componenttest.NewNopReceiverCreateSettings(), cfg) + scraper := newCouchdbScraper(receivertest.NewNopCreateSettings(), cfg) err := scraper.start(context.Background(), componenttest.NewNopHost()) require.NotNil(t, err) }) @@ -167,7 +168,7 @@ func TestMetricSettings(t *testing.T) { CouchdbHttpdViews: metadata.MetricSettings{Enabled: false}, }, } - scraper := newCouchdbScraper(componenttest.NewNopReceiverCreateSettings(), cfg) + scraper := newCouchdbScraper(receivertest.NewNopCreateSettings(), cfg) scraper.client = mockClient metrics, err := scraper.scrape(context.Background()) diff --git a/receiver/dockerstatsreceiver/factory.go b/receiver/dockerstatsreceiver/factory.go index 06c3e06cc53e9..52abdd7369ada 100644 --- a/receiver/dockerstatsreceiver/factory.go +++ b/receiver/dockerstatsreceiver/factory.go @@ -21,6 +21,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/featuregate" + rcvr "go.opentelemetry.io/collector/receiver" "go.opentelemetry.io/collector/receiver/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/dockerstatsreceiver/internal/metadata" @@ -41,11 +42,11 @@ func init() { ) } -func NewFactory() component.ReceiverFactory { - return component.NewReceiverFactory( +func NewFactory() rcvr.Factory { + return rcvr.NewFactory( typeStr, createDefaultConfig, - component.WithMetricsReceiver(createMetricsReceiver, stability)) + rcvr.WithMetrics(createMetricsReceiver, stability)) } func createDefaultConfig() component.Config { @@ -62,10 +63,10 @@ func createDefaultConfig() component.Config { func createMetricsReceiver( _ context.Context, - params component.ReceiverCreateSettings, + params rcvr.CreateSettings, config component.Config, consumer consumer.Metrics, -) (component.MetricsReceiver, error) { +) (rcvr.Metrics, error) { dockerConfig := config.(*Config) dsr := newReceiver(params, dockerConfig) diff --git a/receiver/dockerstatsreceiver/factory_test.go b/receiver/dockerstatsreceiver/factory_test.go index e9a1345742ccd..0e6ff19c05301 100644 --- a/receiver/dockerstatsreceiver/factory_test.go +++ b/receiver/dockerstatsreceiver/factory_test.go @@ -22,6 +22,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/consumer/consumertest" + "go.opentelemetry.io/collector/receiver/receivertest" ) func TestCreateDefaultConfig(t *testing.T) { @@ -37,7 +38,7 @@ func TestCreateReceiver(t *testing.T) { factory := NewFactory() config := factory.CreateDefaultConfig() - params := componenttest.NewNopReceiverCreateSettings() + params := receivertest.NewNopCreateSettings() traceReceiver, err := factory.CreateTracesReceiver(context.Background(), params, config, consumertest.NewNop()) assert.ErrorIs(t, err, component.ErrDataTypeIsNotSupported) assert.Nil(t, traceReceiver) diff --git a/receiver/dockerstatsreceiver/go.mod b/receiver/dockerstatsreceiver/go.mod index 322014d3f3762..fef1d782865e9 100644 --- a/receiver/dockerstatsreceiver/go.mod +++ b/receiver/dockerstatsreceiver/go.mod @@ -5,17 +5,17 @@ go 1.18 require ( github.com/docker/docker v20.10.21+incompatible github.com/google/go-cmp v0.5.9 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/docker v0.66.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/docker v0.67.0 github.com/stretchr/testify v1.8.1 github.com/testcontainers/testcontainers-go v0.15.0 - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector v0.67.0 + go.opentelemetry.io/collector/component v0.67.0 + go.opentelemetry.io/collector/confmap v0.67.0 + go.opentelemetry.io/collector/consumer v0.67.0 + go.opentelemetry.io/collector/featuregate v0.67.0 + go.opentelemetry.io/collector/pdata v1.0.0-rc1 + go.opentelemetry.io/collector/semconv v0.67.0 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.24.0 ) diff --git a/receiver/dockerstatsreceiver/go.sum b/receiver/dockerstatsreceiver/go.sum index a3f27d3a4ef13..9619bfaea3c59 100644 --- a/receiver/dockerstatsreceiver/go.sum +++ b/receiver/dockerstatsreceiver/go.sum @@ -824,20 +824,20 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 h1:Q5L9Urod3c8as6ZYaoaqBjarx/HXxsxy34DFZIU2fO4= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/component v0.67.0 h1:GCBRZAqk4yNaT4L1uwlbbwophFHrxYccLZ4Uj1Ifs/M= +go.opentelemetry.io/collector/component v0.67.0/go.mod h1:Txa2lm9oe7xsGQN8u7GdUIrRpAHFIKsTO4Qi3/CSmKk= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= +go.opentelemetry.io/collector/semconv v0.67.0 h1:zLAvcQa6Kgow52FFLrmk7/9ZVtEYyA73+xDtCcFG78Q= +go.opentelemetry.io/collector/semconv v0.67.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/receiver/dockerstatsreceiver/integration_test.go b/receiver/dockerstatsreceiver/integration_test.go index 15b0075764088..edf45e9d71634 100644 --- a/receiver/dockerstatsreceiver/integration_test.go +++ b/receiver/dockerstatsreceiver/integration_test.go @@ -30,8 +30,9 @@ import ( testcontainers "github.com/testcontainers/testcontainers-go" "github.com/testcontainers/testcontainers-go/wait" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/consumer/consumertest" + "go.opentelemetry.io/collector/receiver" + "go.opentelemetry.io/collector/receiver/receivertest" conventions "go.opentelemetry.io/collector/semconv/v1.6.1" "go.uber.org/zap" "go.uber.org/zap/zaptest" @@ -51,17 +52,17 @@ func (h *testHost) ReportFatalError(err error) { var _ component.Host = (*testHost)(nil) -func factory() (component.ReceiverFactory, *Config) { +func factory() (receiver.Factory, *Config) { f := NewFactory() config := f.CreateDefaultConfig().(*Config) config.CollectionInterval = 1 * time.Second return f, config } -func paramsAndContext(t *testing.T) (component.ReceiverCreateSettings, context.Context, context.CancelFunc) { +func paramsAndContext(t *testing.T) (receiver.CreateSettings, context.Context, context.CancelFunc) { ctx, cancel := context.WithCancel(context.Background()) logger := zaptest.NewLogger(t, zaptest.WrapOptions(zap.AddCaller())) - settings := componenttest.NewNopReceiverCreateSettings() + settings := receivertest.NewNopCreateSettings() settings.Logger = logger return settings, ctx, cancel } diff --git a/receiver/dockerstatsreceiver/internal/metadata/generated_metrics.go b/receiver/dockerstatsreceiver/internal/metadata/generated_metrics.go index 5a126dce520f2..a7af9d8c92ddd 100644 --- a/receiver/dockerstatsreceiver/internal/metadata/generated_metrics.go +++ b/receiver/dockerstatsreceiver/internal/metadata/generated_metrics.go @@ -9,6 +9,7 @@ import ( "go.opentelemetry.io/collector/confmap" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" + "go.opentelemetry.io/collector/receiver" conventions "go.opentelemetry.io/collector/semconv/v1.6.1" ) @@ -3639,7 +3640,7 @@ func WithStartTime(startTime pcommon.Timestamp) metricBuilderOption { } } -func NewMetricsBuilder(ms MetricsSettings, settings component.ReceiverCreateSettings, options ...metricBuilderOption) *MetricsBuilder { +func NewMetricsBuilder(ms MetricsSettings, settings receiver.CreateSettings, options ...metricBuilderOption) *MetricsBuilder { mb := &MetricsBuilder{ startTime: pcommon.NewTimestampFromTime(time.Now()), metricsBuffer: pmetric.NewMetrics(), diff --git a/receiver/dockerstatsreceiver/internal/metadata/generated_metrics_test.go b/receiver/dockerstatsreceiver/internal/metadata/generated_metrics_test.go index 6173dbf3613df..80cb7ca5139c1 100644 --- a/receiver/dockerstatsreceiver/internal/metadata/generated_metrics_test.go +++ b/receiver/dockerstatsreceiver/internal/metadata/generated_metrics_test.go @@ -7,9 +7,9 @@ import ( "testing" "github.com/stretchr/testify/assert" - "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" + "go.opentelemetry.io/collector/receiver/receivertest" "go.uber.org/zap" "go.uber.org/zap/zaptest/observer" ) @@ -17,7 +17,7 @@ import ( func TestDefaultMetrics(t *testing.T) { start := pcommon.Timestamp(1_000_000_000) ts := pcommon.Timestamp(1_000_001_000) - mb := NewMetricsBuilder(DefaultMetricsSettings(), componenttest.NewNopReceiverCreateSettings(), WithStartTime(start)) + mb := NewMetricsBuilder(DefaultMetricsSettings(), receivertest.NewNopCreateSettings(), WithStartTime(start)) enabledMetrics := make(map[string]bool) mb.RecordContainerBlockioIoMergedRecursiveDataPoint(ts, 1, "attr-val", "attr-val", "attr-val") @@ -243,7 +243,7 @@ func TestAllMetrics(t *testing.T) { ContainerNetworkIoUsageTxPackets: MetricSettings{Enabled: true}, } observedZapCore, observedLogs := observer.New(zap.WarnLevel) - settings := componenttest.NewNopReceiverCreateSettings() + settings := receivertest.NewNopCreateSettings() settings.Logger = zap.New(observedZapCore) mb := NewMetricsBuilder(metricsSettings, settings, WithStartTime(start)) @@ -1335,7 +1335,7 @@ func TestNoMetrics(t *testing.T) { ContainerNetworkIoUsageTxPackets: MetricSettings{Enabled: false}, } observedZapCore, observedLogs := observer.New(zap.WarnLevel) - settings := componenttest.NewNopReceiverCreateSettings() + settings := receivertest.NewNopCreateSettings() settings.Logger = zap.New(observedZapCore) mb := NewMetricsBuilder(metricsSettings, settings, WithStartTime(start)) diff --git a/receiver/dockerstatsreceiver/receiver.go b/receiver/dockerstatsreceiver/receiver.go index b0d4cfdc55921..d264f4ee039ef 100644 --- a/receiver/dockerstatsreceiver/receiver.go +++ b/receiver/dockerstatsreceiver/receiver.go @@ -22,6 +22,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" + rcvr "go.opentelemetry.io/collector/receiver" "go.opentelemetry.io/collector/receiver/scrapererror" "go.uber.org/multierr" @@ -36,12 +37,12 @@ const ( type receiver struct { config *Config - settings component.ReceiverCreateSettings + settings rcvr.CreateSettings client *docker.Client mb *metadata.MetricsBuilder } -func newReceiver(set component.ReceiverCreateSettings, config *Config) *receiver { +func newReceiver(set rcvr.CreateSettings, config *Config) *receiver { if config.ProvidePerCoreCPUMetrics { config.MetricsConfig.ContainerCPUUsagePercpu.Enabled = config.ProvidePerCoreCPUMetrics } diff --git a/receiver/dockerstatsreceiver/receiver_test.go b/receiver/dockerstatsreceiver/receiver_test.go index d0852842e29c8..e26592a2c715e 100644 --- a/receiver/dockerstatsreceiver/receiver_test.go +++ b/receiver/dockerstatsreceiver/receiver_test.go @@ -31,6 +31,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component/componenttest" + "go.opentelemetry.io/collector/receiver/receivertest" "go.opentelemetry.io/collector/receiver/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest" @@ -117,7 +118,7 @@ func TestNewReceiver(t *testing.T) { Endpoint: "unix:///run/some.sock", DockerAPIVersion: defaultDockerAPIVersion, } - mr := newReceiver(componenttest.NewNopReceiverCreateSettings(), cfg) + mr := newReceiver(receivertest.NewNopCreateSettings(), cfg) assert.NotNil(t, mr) } @@ -130,7 +131,7 @@ func TestErrorsInStart(t *testing.T) { Endpoint: unreachable, DockerAPIVersion: defaultDockerAPIVersion, } - recv := newReceiver(componenttest.NewNopReceiverCreateSettings(), cfg) + recv := newReceiver(receivertest.NewNopCreateSettings(), cfg) assert.NotNil(t, recv) cfg.Endpoint = "..not/a/valid/endpoint" @@ -194,7 +195,7 @@ func TestScrapeV2(t *testing.T) { cfg.ProvidePerCoreCPUMetrics = true cfg.MetricsConfig = allMetricsEnabled - receiver := newReceiver(componenttest.NewNopReceiverCreateSettings(), cfg) + receiver := newReceiver(receivertest.NewNopCreateSettings(), cfg) err := receiver.start(context.Background(), componenttest.NewNopHost()) require.NoError(t, err) diff --git a/receiver/dotnetdiagnosticsreceiver/factory.go b/receiver/dotnetdiagnosticsreceiver/factory.go index 052f80ee425f4..2e606689e979f 100644 --- a/receiver/dotnetdiagnosticsreceiver/factory.go +++ b/receiver/dotnetdiagnosticsreceiver/factory.go @@ -25,6 +25,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer" + rcvr "go.opentelemetry.io/collector/receiver" "go.opentelemetry.io/collector/receiver/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/dotnetdiagnosticsreceiver/network" @@ -35,11 +36,11 @@ const ( stability = component.StabilityLevelAlpha ) -func NewFactory() component.ReceiverFactory { - return component.NewReceiverFactory( +func NewFactory() rcvr.Factory { + return rcvr.NewFactory( typeStr, createDefaultConfig, - component.WithMetricsReceiver(createMetricsReceiver, stability), + rcvr.WithMetrics(createMetricsReceiver, stability), ) } @@ -55,10 +56,10 @@ func createDefaultConfig() component.Config { func createMetricsReceiver( ctx context.Context, - params component.ReceiverCreateSettings, + params rcvr.CreateSettings, baseConfig component.Config, consumer consumer.Metrics, -) (component.MetricsReceiver, error) { +) (rcvr.Metrics, error) { cfg := baseConfig.(*Config) bw := network.NewBlobWriter(cfg.LocalDebugDir, cfg.MaxLocalDebugFiles, params.Logger) sec := int(math.Round(cfg.CollectionInterval.Seconds())) diff --git a/receiver/dotnetdiagnosticsreceiver/factory_test.go b/receiver/dotnetdiagnosticsreceiver/factory_test.go index 74a3025e7e48b..a20e30e357147 100644 --- a/receiver/dotnetdiagnosticsreceiver/factory_test.go +++ b/receiver/dotnetdiagnosticsreceiver/factory_test.go @@ -23,6 +23,7 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/consumer/consumertest" + "go.opentelemetry.io/collector/receiver/receivertest" ) func TestCreateDefaultConfig(t *testing.T) { @@ -41,7 +42,7 @@ func TestCreateDefaultConfig(t *testing.T) { func TestNewFactory(t *testing.T) { f := NewFactory() cfg := f.CreateDefaultConfig() - params := componenttest.NewNopReceiverCreateSettings() + params := receivertest.NewNopCreateSettings() r, err := f.CreateMetricsReceiver(context.Background(), params, cfg, consumertest.NewNop()) assert.NoError(t, err) assert.NotNil(t, r) diff --git a/receiver/dotnetdiagnosticsreceiver/go.mod b/receiver/dotnetdiagnosticsreceiver/go.mod index 1e0d032254084..7e9e564f55ae9 100644 --- a/receiver/dotnetdiagnosticsreceiver/go.mod +++ b/receiver/dotnetdiagnosticsreceiver/go.mod @@ -4,11 +4,11 @@ go 1.18 require ( github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector v0.67.0 + go.opentelemetry.io/collector/component v0.67.0 + go.opentelemetry.io/collector/confmap v0.67.0 + go.opentelemetry.io/collector/consumer v0.67.0 + go.opentelemetry.io/collector/pdata v1.0.0-rc1 go.uber.org/zap v1.24.0 ) @@ -28,7 +28,7 @@ require ( github.com/pelletier/go-toml v1.9.4 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/featuregate v0.67.0 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/receiver/dotnetdiagnosticsreceiver/go.sum b/receiver/dotnetdiagnosticsreceiver/go.sum index 332cb361baafd..54a3300561832 100644 --- a/receiver/dotnetdiagnosticsreceiver/go.sum +++ b/receiver/dotnetdiagnosticsreceiver/go.sum @@ -284,18 +284,18 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/component v0.67.0 h1:GCBRZAqk4yNaT4L1uwlbbwophFHrxYccLZ4Uj1Ifs/M= +go.opentelemetry.io/collector/component v0.67.0/go.mod h1:Txa2lm9oe7xsGQN8u7GdUIrRpAHFIKsTO4Qi3/CSmKk= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/receiver/dotnetdiagnosticsreceiver/receiver.go b/receiver/dotnetdiagnosticsreceiver/receiver.go index c2f672b061eed..9f89c42f91fff 100644 --- a/receiver/dotnetdiagnosticsreceiver/receiver.go +++ b/receiver/dotnetdiagnosticsreceiver/receiver.go @@ -20,6 +20,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/consumer" + rcvr "go.opentelemetry.io/collector/receiver" "go.uber.org/zap" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/dotnetdiagnosticsreceiver/dotnet" @@ -50,7 +51,7 @@ func NewReceiver( intervalSec int, logger *zap.Logger, bw network.BlobWriter, -) (component.MetricsReceiver, error) { +) (rcvr.Metrics, error) { return &receiver{ nextConsumer: mc, connect: connect, diff --git a/receiver/elasticsearchreceiver/factory.go b/receiver/elasticsearchreceiver/factory.go index 30be17ef4a2fc..13293134e0280 100644 --- a/receiver/elasticsearchreceiver/factory.go +++ b/receiver/elasticsearchreceiver/factory.go @@ -23,6 +23,7 @@ import ( "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/consumer" + "go.opentelemetry.io/collector/receiver" "go.opentelemetry.io/collector/receiver/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/elasticsearchreceiver/internal/metadata" @@ -36,11 +37,11 @@ const ( ) // NewFactory creates a factory for elasticsearch receiver. -func NewFactory() component.ReceiverFactory { - return component.NewReceiverFactory( +func NewFactory() receiver.Factory { + return receiver.NewFactory( typeStr, createDefaultConfig, - component.WithMetricsReceiver(createMetricsReceiver, stability)) + receiver.WithMetrics(createMetricsReceiver, stability)) } // createDefaultConfig creates the default elasticsearchreceiver config. @@ -65,10 +66,10 @@ var errConfigNotES = errors.New("config was not an elasticsearch receiver config // createMetricsReceiver creates a metrics receiver for scraping elasticsearch metrics. func createMetricsReceiver( _ context.Context, - params component.ReceiverCreateSettings, + params receiver.CreateSettings, rConf component.Config, consumer consumer.Metrics, -) (component.MetricsReceiver, error) { +) (receiver.Metrics, error) { c, ok := rConf.(*Config) if !ok { return nil, errConfigNotES diff --git a/receiver/elasticsearchreceiver/factory_test.go b/receiver/elasticsearchreceiver/factory_test.go index 1aed1d6f44a16..f1783a8f6dd0a 100644 --- a/receiver/elasticsearchreceiver/factory_test.go +++ b/receiver/elasticsearchreceiver/factory_test.go @@ -20,8 +20,8 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/consumer/consumertest" + "go.opentelemetry.io/collector/receiver/receivertest" ) func TestCreateMetricsReceiver(t *testing.T) { @@ -36,7 +36,7 @@ func TestCreateMetricsReceiver(t *testing.T) { _, err := createMetricsReceiver( context.Background(), - componenttest.NewNopReceiverCreateSettings(), + receivertest.NewNopCreateSettings(), createDefaultConfig(), consumertest.NewNop(), ) @@ -51,7 +51,7 @@ func TestCreateMetricsReceiver(t *testing.T) { _, err := createMetricsReceiver( context.Background(), - componenttest.NewNopReceiverCreateSettings(), + receivertest.NewNopCreateSettings(), nil, consumertest.NewNop(), ) @@ -64,7 +64,7 @@ func TestCreateMetricsReceiver(t *testing.T) { t.Parallel() _, err := createMetricsReceiver( context.Background(), - componenttest.NewNopReceiverCreateSettings(), + receivertest.NewNopCreateSettings(), createDefaultConfig(), nil, ) diff --git a/receiver/elasticsearchreceiver/go.mod b/receiver/elasticsearchreceiver/go.mod index 9e2dd40d8fe85..c6c427ad9475f 100644 --- a/receiver/elasticsearchreceiver/go.mod +++ b/receiver/elasticsearchreceiver/go.mod @@ -5,15 +5,15 @@ go 1.18 require ( github.com/google/go-cmp v0.5.9 github.com/hashicorp/go-version v1.6.0 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest v0.66.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest v0.67.0 github.com/stretchr/testify v1.8.1 github.com/testcontainers/testcontainers-go v0.15.0 - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector v0.67.0 + go.opentelemetry.io/collector/component v0.67.0 + go.opentelemetry.io/collector/confmap v0.67.0 + go.opentelemetry.io/collector/consumer v0.67.0 + go.opentelemetry.io/collector/featuregate v0.67.0 + go.opentelemetry.io/collector/pdata v1.0.0-rc1 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.24.0 ) diff --git a/receiver/elasticsearchreceiver/go.sum b/receiver/elasticsearchreceiver/go.sum index f38e91be3e760..ab5b7973e091a 100644 --- a/receiver/elasticsearchreceiver/go.sum +++ b/receiver/elasticsearchreceiver/go.sum @@ -832,18 +832,18 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/component v0.67.0 h1:GCBRZAqk4yNaT4L1uwlbbwophFHrxYccLZ4Uj1Ifs/M= +go.opentelemetry.io/collector/component v0.67.0/go.mod h1:Txa2lm9oe7xsGQN8u7GdUIrRpAHFIKsTO4Qi3/CSmKk= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 h1:aUEBEdCa6iamGzg6fuYxDA8ThxvOG240mAvWDU+XLio= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4/go.mod h1:l2MdsbKTocpPS5nQZscqTR9jd8u96VYZdcpF8Sye7mA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= diff --git a/receiver/elasticsearchreceiver/integration_test.go b/receiver/elasticsearchreceiver/integration_test.go index 63b715a5a168f..e08216b1ae934 100644 --- a/receiver/elasticsearchreceiver/integration_test.go +++ b/receiver/elasticsearchreceiver/integration_test.go @@ -29,6 +29,7 @@ import ( "github.com/testcontainers/testcontainers-go/wait" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/consumer/consumertest" + "go.opentelemetry.io/collector/receiver/receivertest" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest/golden" @@ -71,7 +72,7 @@ func TestElasticsearchIntegration(t *testing.T) { cfg.Endpoint = fmt.Sprintf("http://%s:9200", hostname) consumer := new(consumertest.MetricsSink) - settings := componenttest.NewNopReceiverCreateSettings() + settings := receivertest.NewNopCreateSettings() rcvr, err := f.CreateMetricsReceiver(context.Background(), settings, cfg, consumer) require.NoError(t, err, "failed creating metrics receiver") @@ -103,7 +104,7 @@ func TestElasticsearchIntegration(t *testing.T) { cfg.Endpoint = fmt.Sprintf("http://%s:9300", hostname) consumer := new(consumertest.MetricsSink) - settings := componenttest.NewNopReceiverCreateSettings() + settings := receivertest.NewNopCreateSettings() rcvr, err := f.CreateMetricsReceiver(context.Background(), settings, cfg, consumer) require.NoError(t, err, "failed creating metrics receiver") diff --git a/receiver/elasticsearchreceiver/internal/metadata/generated_metrics.go b/receiver/elasticsearchreceiver/internal/metadata/generated_metrics.go index 5fd14689464df..b5c70f047cb5e 100644 --- a/receiver/elasticsearchreceiver/internal/metadata/generated_metrics.go +++ b/receiver/elasticsearchreceiver/internal/metadata/generated_metrics.go @@ -9,6 +9,7 @@ import ( "go.opentelemetry.io/collector/confmap" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" + "go.opentelemetry.io/collector/receiver" ) // MetricSettings provides common settings for a particular metric. @@ -5473,7 +5474,7 @@ func WithStartTime(startTime pcommon.Timestamp) metricBuilderOption { } } -func NewMetricsBuilder(ms MetricsSettings, settings component.ReceiverCreateSettings, options ...metricBuilderOption) *MetricsBuilder { +func NewMetricsBuilder(ms MetricsSettings, settings receiver.CreateSettings, options ...metricBuilderOption) *MetricsBuilder { mb := &MetricsBuilder{ startTime: pcommon.NewTimestampFromTime(time.Now()), metricsBuffer: pmetric.NewMetrics(), diff --git a/receiver/elasticsearchreceiver/internal/metadata/generated_metrics_test.go b/receiver/elasticsearchreceiver/internal/metadata/generated_metrics_test.go index fa074b107d8c9..18f85f6e5ae26 100644 --- a/receiver/elasticsearchreceiver/internal/metadata/generated_metrics_test.go +++ b/receiver/elasticsearchreceiver/internal/metadata/generated_metrics_test.go @@ -7,9 +7,9 @@ import ( "testing" "github.com/stretchr/testify/assert" - "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" + "go.opentelemetry.io/collector/receiver/receivertest" "go.uber.org/zap" "go.uber.org/zap/zaptest/observer" ) @@ -17,7 +17,7 @@ import ( func TestDefaultMetrics(t *testing.T) { start := pcommon.Timestamp(1_000_000_000) ts := pcommon.Timestamp(1_000_001_000) - mb := NewMetricsBuilder(DefaultMetricsSettings(), componenttest.NewNopReceiverCreateSettings(), WithStartTime(start)) + mb := NewMetricsBuilder(DefaultMetricsSettings(), receivertest.NewNopCreateSettings(), WithStartTime(start)) enabledMetrics := make(map[string]bool) enabledMetrics["elasticsearch.breaker.memory.estimated"] = true @@ -369,7 +369,7 @@ func TestAllMetrics(t *testing.T) { JvmThreadsCount: MetricSettings{Enabled: true}, } observedZapCore, observedLogs := observer.New(zap.WarnLevel) - settings := componenttest.NewNopReceiverCreateSettings() + settings := receivertest.NewNopCreateSettings() settings.Logger = zap.New(observedZapCore) mb := NewMetricsBuilder(metricsSettings, settings, WithStartTime(start)) @@ -1834,7 +1834,7 @@ func TestNoMetrics(t *testing.T) { JvmThreadsCount: MetricSettings{Enabled: false}, } observedZapCore, observedLogs := observer.New(zap.WarnLevel) - settings := componenttest.NewNopReceiverCreateSettings() + settings := receivertest.NewNopCreateSettings() settings.Logger = zap.New(observedZapCore) mb := NewMetricsBuilder(metricsSettings, settings, WithStartTime(start)) diff --git a/receiver/elasticsearchreceiver/scraper.go b/receiver/elasticsearchreceiver/scraper.go index 8d2904e099028..8fbb41111c0e0 100644 --- a/receiver/elasticsearchreceiver/scraper.go +++ b/receiver/elasticsearchreceiver/scraper.go @@ -25,6 +25,7 @@ import ( "go.opentelemetry.io/collector/featuregate" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" + "go.opentelemetry.io/collector/receiver" "go.opentelemetry.io/collector/receiver/scrapererror" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/elasticsearchreceiver/internal/metadata" @@ -79,7 +80,7 @@ type elasticsearchScraper struct { } func newElasticSearchScraper( - settings component.ReceiverCreateSettings, + settings receiver.CreateSettings, cfg *Config, ) *elasticsearchScraper { e := &elasticsearchScraper{ diff --git a/receiver/elasticsearchreceiver/scraper_test.go b/receiver/elasticsearchreceiver/scraper_test.go index ad828c2cb8c76..b1f02610c0900 100644 --- a/receiver/elasticsearchreceiver/scraper_test.go +++ b/receiver/elasticsearchreceiver/scraper_test.go @@ -27,6 +27,7 @@ import ( "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/config/configtls" "go.opentelemetry.io/collector/featuregate" + "go.opentelemetry.io/collector/receiver/receivertest" "go.opentelemetry.io/collector/receiver/scrapererror" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest" @@ -74,7 +75,7 @@ func TestScraper(t *testing.T) { config.Metrics.ElasticsearchClusterIndicesCacheEvictions.Enabled = true - sc := newElasticSearchScraper(componenttest.NewNopReceiverCreateSettings(), config) + sc := newElasticSearchScraper(receivertest.NewNopCreateSettings(), config) err := sc.start(context.Background(), componenttest.NewNopHost()) require.NoError(t, err) @@ -103,7 +104,7 @@ func TestScraperSkipClusterMetrics(t *testing.T) { conf := createDefaultConfig().(*Config) conf.SkipClusterMetrics = true - sc := newElasticSearchScraper(componenttest.NewNopReceiverCreateSettings(), conf) + sc := newElasticSearchScraper(receivertest.NewNopCreateSettings(), conf) err := sc.start(context.Background(), componenttest.NewNopHost()) require.NoError(t, err) @@ -132,7 +133,7 @@ func TestScraperNoNodesMetrics(t *testing.T) { conf := createDefaultConfig().(*Config) conf.Nodes = []string{} - sc := newElasticSearchScraper(componenttest.NewNopReceiverCreateSettings(), conf) + sc := newElasticSearchScraper(receivertest.NewNopCreateSettings(), conf) err := sc.start(context.Background(), componenttest.NewNopHost()) require.NoError(t, err) @@ -172,7 +173,7 @@ func TestScraperFailedStart(t *testing.T) { conf.Username = "dev" conf.Password = "dev" - sc := newElasticSearchScraper(componenttest.NewNopReceiverCreateSettings(), conf) + sc := newElasticSearchScraper(receivertest.NewNopCreateSettings(), conf) err := sc.start(context.Background(), componenttest.NewNopHost()) require.Error(t, err) @@ -197,7 +198,7 @@ func TestScrapingError(t *testing.T) { mockClient.On("ClusterStats", mock.Anything, []string{"_all"}).Return(clusterStats(t), nil) mockClient.On("IndexStats", mock.Anything, []string{"_all"}).Return(indexStats(t), nil) - sc := newElasticSearchScraper(componenttest.NewNopReceiverCreateSettings(), createDefaultConfig().(*Config)) + sc := newElasticSearchScraper(receivertest.NewNopCreateSettings(), createDefaultConfig().(*Config)) err := sc.start(context.Background(), componenttest.NewNopHost()) require.NoError(t, err) @@ -223,7 +224,7 @@ func TestScrapingError(t *testing.T) { mockClient.On("ClusterStats", mock.Anything, []string{"_all"}).Return(clusterStats(t), nil) mockClient.On("IndexStats", mock.Anything, []string{"_all"}).Return(indexStats(t), nil) - sc := newElasticSearchScraper(componenttest.NewNopReceiverCreateSettings(), createDefaultConfig().(*Config)) + sc := newElasticSearchScraper(receivertest.NewNopCreateSettings(), createDefaultConfig().(*Config)) err := sc.start(context.Background(), componenttest.NewNopHost()) require.NoError(t, err) @@ -250,7 +251,7 @@ func TestScrapingError(t *testing.T) { mockClient.On("ClusterStats", mock.Anything, []string{"_all"}).Return(nil, err404) mockClient.On("IndexStats", mock.Anything, []string{"_all"}).Return(nil, err500) - sc := newElasticSearchScraper(componenttest.NewNopReceiverCreateSettings(), createDefaultConfig().(*Config)) + sc := newElasticSearchScraper(receivertest.NewNopCreateSettings(), createDefaultConfig().(*Config)) err := sc.start(context.Background(), componenttest.NewNopHost()) require.NoError(t, err) @@ -277,7 +278,7 @@ func TestScrapingError(t *testing.T) { mockClient.On("ClusterStats", mock.Anything, []string{"_all"}).Return(clusterStats(t), nil) mockClient.On("IndexStats", mock.Anything, []string{"_all"}).Return(indexStats(t), nil) - sc := newElasticSearchScraper(componenttest.NewNopReceiverCreateSettings(), createDefaultConfig().(*Config)) + sc := newElasticSearchScraper(receivertest.NewNopCreateSettings(), createDefaultConfig().(*Config)) err := sc.start(context.Background(), componenttest.NewNopHost()) require.NoError(t, err) @@ -303,7 +304,7 @@ func TestScrapingError(t *testing.T) { mockClient.On("IndexStats", mock.Anything, []string{"_all"}).Return(nil, err500) mockClient.On("ClusterStats", mock.Anything, []string{"_all"}).Return(nil, err500) - sc := newElasticSearchScraper(componenttest.NewNopReceiverCreateSettings(), createDefaultConfig().(*Config)) + sc := newElasticSearchScraper(receivertest.NewNopCreateSettings(), createDefaultConfig().(*Config)) err := sc.start(context.Background(), componenttest.NewNopHost()) require.NoError(t, err) @@ -331,7 +332,7 @@ func TestScrapingError(t *testing.T) { mockClient.On("ClusterStats", mock.Anything, []string{"_all"}).Return(clusterStats(t), nil) mockClient.On("IndexStats", mock.Anything, []string{"_all"}).Return(indexStats(t), nil) - sc := newElasticSearchScraper(componenttest.NewNopReceiverCreateSettings(), createDefaultConfig().(*Config)) + sc := newElasticSearchScraper(receivertest.NewNopCreateSettings(), createDefaultConfig().(*Config)) err := sc.start(context.Background(), componenttest.NewNopHost()) require.NoError(t, err) diff --git a/receiver/expvarreceiver/factory.go b/receiver/expvarreceiver/factory.go index 3078f0214d880..b3bebd848e689 100644 --- a/receiver/expvarreceiver/factory.go +++ b/receiver/expvarreceiver/factory.go @@ -21,6 +21,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/consumer" + "go.opentelemetry.io/collector/receiver" "go.opentelemetry.io/collector/receiver/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/expvarreceiver/internal/metadata" @@ -34,19 +35,19 @@ const ( defaultTimeout = 3 * time.Second ) -func NewFactory() component.ReceiverFactory { - return component.NewReceiverFactory( +func NewFactory() receiver.Factory { + return receiver.NewFactory( typeStr, newDefaultConfig, - component.WithMetricsReceiver(newMetricsReceiver, stability)) + receiver.WithMetrics(newMetricsReceiver, stability)) } func newMetricsReceiver( _ context.Context, - set component.ReceiverCreateSettings, + set receiver.CreateSettings, rCfg component.Config, consumer consumer.Metrics, -) (component.MetricsReceiver, error) { +) (receiver.Metrics, error) { cfg := rCfg.(*Config) expVar := newExpVarScraper(cfg, set) diff --git a/receiver/expvarreceiver/factory_test.go b/receiver/expvarreceiver/factory_test.go index 159b635b80daa..3a2bf5061b25c 100644 --- a/receiver/expvarreceiver/factory_test.go +++ b/receiver/expvarreceiver/factory_test.go @@ -23,6 +23,7 @@ import ( "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/consumer/consumertest" + "go.opentelemetry.io/collector/receiver/receivertest" "go.opentelemetry.io/collector/receiver/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/expvarreceiver/internal/metadata" @@ -44,7 +45,7 @@ func TestCreateMetricsReceiver(t *testing.T) { factory := NewFactory() metricsReceiver, err := factory.CreateMetricsReceiver( context.Background(), - componenttest.NewNopReceiverCreateSettings(), + receivertest.NewNopCreateSettings(), &Config{ ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ CollectionInterval: 10 * time.Second, diff --git a/receiver/expvarreceiver/go.mod b/receiver/expvarreceiver/go.mod index 90a8b0e3b2d4a..c95588e4c1ae4 100644 --- a/receiver/expvarreceiver/go.mod +++ b/receiver/expvarreceiver/go.mod @@ -4,13 +4,13 @@ go 1.18 require ( github.com/google/go-cmp v0.5.9 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest v0.66.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest v0.67.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector v0.67.0 + go.opentelemetry.io/collector/component v0.67.0 + go.opentelemetry.io/collector/confmap v0.67.0 + go.opentelemetry.io/collector/consumer v0.67.0 + go.opentelemetry.io/collector/pdata v1.0.0-rc1 go.uber.org/zap v1.24.0 ) @@ -34,7 +34,7 @@ require ( github.com/rogpeppe/go-internal v1.8.1 // indirect github.com/rs/cors v1.8.2 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/featuregate v0.67.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect diff --git a/receiver/expvarreceiver/go.sum b/receiver/expvarreceiver/go.sum index d418e3faf836a..119891f592f71 100644 --- a/receiver/expvarreceiver/go.sum +++ b/receiver/expvarreceiver/go.sum @@ -291,18 +291,18 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/component v0.67.0 h1:GCBRZAqk4yNaT4L1uwlbbwophFHrxYccLZ4Uj1Ifs/M= +go.opentelemetry.io/collector/component v0.67.0/go.mod h1:Txa2lm9oe7xsGQN8u7GdUIrRpAHFIKsTO4Qi3/CSmKk= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 h1:aUEBEdCa6iamGzg6fuYxDA8ThxvOG240mAvWDU+XLio= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4/go.mod h1:l2MdsbKTocpPS5nQZscqTR9jd8u96VYZdcpF8Sye7mA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= diff --git a/receiver/expvarreceiver/internal/metadata/generated_metrics.go b/receiver/expvarreceiver/internal/metadata/generated_metrics.go index 5c783c6db1a2d..33bf1434b3978 100644 --- a/receiver/expvarreceiver/internal/metadata/generated_metrics.go +++ b/receiver/expvarreceiver/internal/metadata/generated_metrics.go @@ -9,6 +9,7 @@ import ( "go.opentelemetry.io/collector/confmap" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" + "go.opentelemetry.io/collector/receiver" ) // MetricSettings provides common settings for a particular metric. @@ -1516,7 +1517,7 @@ func WithStartTime(startTime pcommon.Timestamp) metricBuilderOption { } } -func NewMetricsBuilder(ms MetricsSettings, settings component.ReceiverCreateSettings, options ...metricBuilderOption) *MetricsBuilder { +func NewMetricsBuilder(ms MetricsSettings, settings receiver.CreateSettings, options ...metricBuilderOption) *MetricsBuilder { mb := &MetricsBuilder{ startTime: pcommon.NewTimestampFromTime(time.Now()), metricsBuffer: pmetric.NewMetrics(), diff --git a/receiver/expvarreceiver/internal/metadata/generated_metrics_test.go b/receiver/expvarreceiver/internal/metadata/generated_metrics_test.go index cec0d427f922d..e4424d779beae 100644 --- a/receiver/expvarreceiver/internal/metadata/generated_metrics_test.go +++ b/receiver/expvarreceiver/internal/metadata/generated_metrics_test.go @@ -7,9 +7,9 @@ import ( "testing" "github.com/stretchr/testify/assert" - "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" + "go.opentelemetry.io/collector/receiver/receivertest" "go.uber.org/zap" "go.uber.org/zap/zaptest/observer" ) @@ -17,7 +17,7 @@ import ( func TestDefaultMetrics(t *testing.T) { start := pcommon.Timestamp(1_000_000_000) ts := pcommon.Timestamp(1_000_001_000) - mb := NewMetricsBuilder(DefaultMetricsSettings(), componenttest.NewNopReceiverCreateSettings(), WithStartTime(start)) + mb := NewMetricsBuilder(DefaultMetricsSettings(), receivertest.NewNopCreateSettings(), WithStartTime(start)) enabledMetrics := make(map[string]bool) enabledMetrics["process.runtime.memstats.buck_hash_sys"] = true @@ -143,7 +143,7 @@ func TestAllMetrics(t *testing.T) { ProcessRuntimeMemstatsTotalAlloc: MetricSettings{Enabled: true}, } observedZapCore, observedLogs := observer.New(zap.WarnLevel) - settings := componenttest.NewNopReceiverCreateSettings() + settings := receivertest.NewNopCreateSettings() settings.Logger = zap.New(observedZapCore) mb := NewMetricsBuilder(metricsSettings, settings, WithStartTime(start)) @@ -561,7 +561,7 @@ func TestNoMetrics(t *testing.T) { ProcessRuntimeMemstatsTotalAlloc: MetricSettings{Enabled: false}, } observedZapCore, observedLogs := observer.New(zap.WarnLevel) - settings := componenttest.NewNopReceiverCreateSettings() + settings := receivertest.NewNopCreateSettings() settings.Logger = zap.New(observedZapCore) mb := NewMetricsBuilder(metricsSettings, settings, WithStartTime(start)) diff --git a/receiver/expvarreceiver/scraper.go b/receiver/expvarreceiver/scraper.go index 13b36551d376d..80d0d6098161a 100644 --- a/receiver/expvarreceiver/scraper.go +++ b/receiver/expvarreceiver/scraper.go @@ -26,6 +26,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" + "go.opentelemetry.io/collector/receiver" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/expvarreceiver/internal/metadata" ) @@ -37,12 +38,12 @@ type expVar struct { type expVarScraper struct { cfg *Config - set *component.ReceiverCreateSettings + set *receiver.CreateSettings client *http.Client mb *metadata.MetricsBuilder } -func newExpVarScraper(cfg *Config, set component.ReceiverCreateSettings) *expVarScraper { +func newExpVarScraper(cfg *Config, set receiver.CreateSettings) *expVarScraper { return &expVarScraper{ cfg: cfg, set: &set, diff --git a/receiver/expvarreceiver/scraper_test.go b/receiver/expvarreceiver/scraper_test.go index 090059cccae22..e6fd1a6e51410 100644 --- a/receiver/expvarreceiver/scraper_test.go +++ b/receiver/expvarreceiver/scraper_test.go @@ -25,6 +25,7 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/pdata/pmetric" + "go.opentelemetry.io/collector/receiver/receivertest" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest/golden" @@ -113,7 +114,7 @@ func TestAllMetrics(t *testing.T) { cfg.Endpoint = ms.URL + defaultPath cfg.MetricsConfig = allMetricsEnabled - scraper := newExpVarScraper(cfg, componenttest.NewNopReceiverCreateSettings()) + scraper := newExpVarScraper(cfg, receivertest.NewNopCreateSettings()) err := scraper.start(context.Background(), componenttest.NewNopHost()) require.NoError(t, err) @@ -132,7 +133,7 @@ func TestNoMetrics(t *testing.T) { cfg := newDefaultConfig().(*Config) cfg.Endpoint = ms.URL + defaultPath cfg.MetricsConfig = allMetricsDisabled - scraper := newExpVarScraper(cfg, componenttest.NewNopReceiverCreateSettings()) + scraper := newExpVarScraper(cfg, receivertest.NewNopCreateSettings()) err := scraper.start(context.Background(), componenttest.NewNopHost()) require.NoError(t, err) @@ -147,7 +148,7 @@ func TestNotFoundResponse(t *testing.T) { defer ms.Close() cfg := newDefaultConfig().(*Config) cfg.Endpoint = ms.URL + "/nonexistent/path" - scraper := newExpVarScraper(cfg, componenttest.NewNopReceiverCreateSettings()) + scraper := newExpVarScraper(cfg, receivertest.NewNopCreateSettings()) err := scraper.start(context.Background(), componenttest.NewNopHost()) require.NoError(t, err) _, err = scraper.scrape(context.Background()) @@ -159,7 +160,7 @@ func TestBadTypeInReturnedData(t *testing.T) { defer ms.Close() cfg := newDefaultConfig().(*Config) cfg.Endpoint = ms.URL + defaultPath - scraper := newExpVarScraper(cfg, componenttest.NewNopReceiverCreateSettings()) + scraper := newExpVarScraper(cfg, receivertest.NewNopCreateSettings()) err := scraper.start(context.Background(), componenttest.NewNopHost()) require.NoError(t, err) _, err = scraper.scrape(context.Background()) @@ -171,7 +172,7 @@ func TestJSONParseError(t *testing.T) { defer ms.Close() cfg := newDefaultConfig().(*Config) cfg.Endpoint = ms.URL + defaultPath - scraper := newExpVarScraper(cfg, componenttest.NewNopReceiverCreateSettings()) + scraper := newExpVarScraper(cfg, receivertest.NewNopCreateSettings()) err := scraper.start(context.Background(), componenttest.NewNopHost()) require.NoError(t, err) _, err = scraper.scrape(context.Background()) @@ -184,7 +185,7 @@ func TestEmptyResponseBodyError(t *testing.T) { cfg := newDefaultConfig().(*Config) cfg.Endpoint = ms.URL + defaultPath cfg.MetricsConfig = allMetricsDisabled - scraper := newExpVarScraper(cfg, componenttest.NewNopReceiverCreateSettings()) + scraper := newExpVarScraper(cfg, receivertest.NewNopCreateSettings()) err := scraper.start(context.Background(), componenttest.NewNopHost()) require.NoError(t, err) diff --git a/receiver/filelogreceiver/filelog.go b/receiver/filelogreceiver/filelog.go index aedcde7d7349d..26fb24e4b047b 100644 --- a/receiver/filelogreceiver/filelog.go +++ b/receiver/filelogreceiver/filelog.go @@ -17,6 +17,7 @@ package filelogreceiver // import "github.com/open-telemetry/opentelemetry-colle import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" + "go.opentelemetry.io/collector/receiver" "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/adapter" "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/operator" @@ -29,7 +30,7 @@ const ( ) // NewFactory creates a factory for filelog receiver -func NewFactory() component.ReceiverFactory { +func NewFactory() receiver.Factory { return adapter.NewFactory(ReceiverType{}, stability) } diff --git a/receiver/filelogreceiver/filelog_test.go b/receiver/filelogreceiver/filelog_test.go index ecc3ad05cf87d..3c076dcc6a372 100644 --- a/receiver/filelogreceiver/filelog_test.go +++ b/receiver/filelogreceiver/filelog_test.go @@ -34,6 +34,7 @@ import ( "go.opentelemetry.io/collector/confmap/confmaptest" "go.opentelemetry.io/collector/consumer/consumertest" "go.opentelemetry.io/collector/pdata/plog" + "go.opentelemetry.io/collector/receiver/receivertest" "go.uber.org/zap" "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/adapter" @@ -74,7 +75,7 @@ func TestCreateWithInvalidInputConfig(t *testing.T) { _, err := NewFactory().CreateLogsReceiver( context.Background(), - componenttest.NewNopReceiverCreateSettings(), + receivertest.NewNopCreateSettings(), cfg, new(consumertest.LogsSink), ) @@ -98,7 +99,7 @@ func TestReadStaticFile(t *testing.T) { wg.Add(1) go consumeNLogsFromConverter(converter.OutChannel(), 3, &wg) - rcvr, err := f.CreateLogsReceiver(context.Background(), componenttest.NewNopReceiverCreateSettings(), cfg, sink) + rcvr, err := f.CreateLogsReceiver(context.Background(), receivertest.NewNopCreateSettings(), cfg, sink) require.NoError(t, err, "failed to create receiver") require.NoError(t, rcvr.Start(context.Background(), componenttest.NewNopHost())) @@ -197,7 +198,7 @@ func (rt *rotationTest) Run(t *testing.T) { wg.Add(1) go consumeNLogsFromConverter(converter.OutChannel(), numLogs, &wg) - rcvr, err := f.CreateLogsReceiver(context.Background(), componenttest.NewNopReceiverCreateSettings(), cfg, sink) + rcvr, err := f.CreateLogsReceiver(context.Background(), receivertest.NewNopCreateSettings(), cfg, sink) require.NoError(t, err, "failed to create receiver") require.NoError(t, rcvr.Start(context.Background(), componenttest.NewNopHost())) diff --git a/receiver/filelogreceiver/go.mod b/receiver/filelogreceiver/go.mod index 24adfef2ca39d..21fb65c36305e 100644 --- a/receiver/filelogreceiver/go.mod +++ b/receiver/filelogreceiver/go.mod @@ -4,14 +4,14 @@ go 1.18 require ( github.com/observiq/nanojack v0.0.0-20201106172433-343928847ebc - github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.66.0 + github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.67.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector v0.67.0 + go.opentelemetry.io/collector/component v0.67.0 + go.opentelemetry.io/collector/confmap v0.67.0 + go.opentelemetry.io/collector/consumer v0.67.0 + go.opentelemetry.io/collector/pdata v1.0.0-rc1 go.uber.org/zap v1.24.0 ) @@ -32,7 +32,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rogpeppe/go-internal v1.8.1 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/featuregate v0.67.0 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/receiver/filelogreceiver/go.sum b/receiver/filelogreceiver/go.sum index 534c7a70b0b36..53ab738658c96 100644 --- a/receiver/filelogreceiver/go.sum +++ b/receiver/filelogreceiver/go.sum @@ -303,18 +303,18 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/component v0.67.0 h1:GCBRZAqk4yNaT4L1uwlbbwophFHrxYccLZ4Uj1Ifs/M= +go.opentelemetry.io/collector/component v0.67.0/go.mod h1:Txa2lm9oe7xsGQN8u7GdUIrRpAHFIKsTO4Qi3/CSmKk= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/receiver/filelogreceiver/storage_test.go b/receiver/filelogreceiver/storage_test.go index 15713867d8fd0..6dfdf579cba36 100644 --- a/receiver/filelogreceiver/storage_test.go +++ b/receiver/filelogreceiver/storage_test.go @@ -24,8 +24,8 @@ import ( "time" "github.com/stretchr/testify/require" - "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/consumer/consumertest" + "go.opentelemetry.io/collector/receiver/receivertest" "github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage/storagetest" ) @@ -52,7 +52,7 @@ func TestStorage(t *testing.T) { ext := storagetest.NewFileBackedStorageExtension("test", storageDir) host := storagetest.NewStorageHost().WithExtension(ext.ID, ext) sink := new(consumertest.LogsSink) - rcvr, err := f.CreateLogsReceiver(ctx, componenttest.NewNopReceiverCreateSettings(), cfg, sink) + rcvr, err := f.CreateLogsReceiver(ctx, receivertest.NewNopCreateSettings(), cfg, sink) require.NoError(t, err, "failed to create receiver") require.NoError(t, rcvr.Start(ctx, host)) @@ -83,7 +83,7 @@ func TestStorage(t *testing.T) { // Start the components again ext = storagetest.NewFileBackedStorageExtension("test", storageDir) host = storagetest.NewStorageHost().WithExtension(ext.ID, ext) - rcvr, err = f.CreateLogsReceiver(ctx, componenttest.NewNopReceiverCreateSettings(), cfg, sink) + rcvr, err = f.CreateLogsReceiver(ctx, receivertest.NewNopCreateSettings(), cfg, sink) require.NoError(t, err, "failed to create receiver") require.NoError(t, rcvr.Start(ctx, host)) sink.Reset() @@ -128,7 +128,7 @@ func TestStorage(t *testing.T) { // Start the components again ext = storagetest.NewFileBackedStorageExtension("test", storageDir) host = storagetest.NewStorageHost().WithExtension(ext.ID, ext) - rcvr, err = f.CreateLogsReceiver(ctx, componenttest.NewNopReceiverCreateSettings(), cfg, sink) + rcvr, err = f.CreateLogsReceiver(ctx, receivertest.NewNopCreateSettings(), cfg, sink) require.NoError(t, err, "failed to create receiver") require.NoError(t, rcvr.Start(ctx, host)) sink.Reset() diff --git a/receiver/flinkmetricsreceiver/factory.go b/receiver/flinkmetricsreceiver/factory.go index f4fd07796a0ed..41b14aa239ce3 100644 --- a/receiver/flinkmetricsreceiver/factory.go +++ b/receiver/flinkmetricsreceiver/factory.go @@ -23,6 +23,7 @@ import ( "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/consumer" + "go.opentelemetry.io/collector/receiver" "go.opentelemetry.io/collector/receiver/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/flinkmetricsreceiver/internal/metadata" @@ -36,11 +37,11 @@ const ( var errConfigNotflinkmetrics = errors.New("config was not a flinkmetrics receiver config") // NewFactory creates a new receiver factory -func NewFactory() component.ReceiverFactory { - return component.NewReceiverFactory( +func NewFactory() receiver.Factory { + return receiver.NewFactory( typeStr, createDefaultConfig, - component.WithMetricsReceiver(createMetricsReceiver, stability), + receiver.WithMetrics(createMetricsReceiver, stability), ) } @@ -60,10 +61,10 @@ func createDefaultConfig() component.Config { func createMetricsReceiver( _ context.Context, - params component.ReceiverCreateSettings, + params receiver.CreateSettings, rConf component.Config, consumer consumer.Metrics, -) (component.MetricsReceiver, error) { +) (receiver.Metrics, error) { cfg, ok := rConf.(*Config) if !ok { return nil, errConfigNotflinkmetrics diff --git a/receiver/flinkmetricsreceiver/factory_test.go b/receiver/flinkmetricsreceiver/factory_test.go index 4cea0ac746b26..3546d6e2f357e 100644 --- a/receiver/flinkmetricsreceiver/factory_test.go +++ b/receiver/flinkmetricsreceiver/factory_test.go @@ -21,10 +21,10 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/consumer/consumertest" + "go.opentelemetry.io/collector/receiver/receivertest" "go.opentelemetry.io/collector/receiver/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/flinkmetricsreceiver/internal/metadata" @@ -69,7 +69,7 @@ func TestNewFactory(t *testing.T) { cfg := factory.CreateDefaultConfig() _, err := factory.CreateMetricsReceiver( context.Background(), - componenttest.NewNopReceiverCreateSettings(), + receivertest.NewNopCreateSettings(), cfg, consumertest.NewNop(), ) @@ -82,7 +82,7 @@ func TestNewFactory(t *testing.T) { factory := NewFactory() _, err := factory.CreateMetricsReceiver( context.Background(), - componenttest.NewNopReceiverCreateSettings(), + receivertest.NewNopCreateSettings(), nil, consumertest.NewNop(), ) diff --git a/receiver/flinkmetricsreceiver/go.mod b/receiver/flinkmetricsreceiver/go.mod index ff6904fdb1ed3..4f95ab7d896d0 100644 --- a/receiver/flinkmetricsreceiver/go.mod +++ b/receiver/flinkmetricsreceiver/go.mod @@ -3,14 +3,14 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/receiver/flinkm go 1.18 require ( - github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest v0.66.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest v0.67.0 github.com/stretchr/testify v1.8.1 github.com/testcontainers/testcontainers-go v0.15.0 - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector v0.67.0 + go.opentelemetry.io/collector/component v0.67.0 + go.opentelemetry.io/collector/confmap v0.67.0 + go.opentelemetry.io/collector/consumer v0.67.0 + go.opentelemetry.io/collector/pdata v1.0.0-rc1 go.uber.org/zap v1.24.0 ) @@ -56,7 +56,7 @@ require ( github.com/sirupsen/logrus v1.8.1 // indirect github.com/stretchr/objx v0.5.0 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/featuregate v0.67.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect diff --git a/receiver/flinkmetricsreceiver/go.sum b/receiver/flinkmetricsreceiver/go.sum index 79f1e3e6ccdfe..469e8725d67bf 100644 --- a/receiver/flinkmetricsreceiver/go.sum +++ b/receiver/flinkmetricsreceiver/go.sum @@ -828,18 +828,18 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/component v0.67.0 h1:GCBRZAqk4yNaT4L1uwlbbwophFHrxYccLZ4Uj1Ifs/M= +go.opentelemetry.io/collector/component v0.67.0/go.mod h1:Txa2lm9oe7xsGQN8u7GdUIrRpAHFIKsTO4Qi3/CSmKk= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 h1:aUEBEdCa6iamGzg6fuYxDA8ThxvOG240mAvWDU+XLio= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4/go.mod h1:l2MdsbKTocpPS5nQZscqTR9jd8u96VYZdcpF8Sye7mA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= diff --git a/receiver/flinkmetricsreceiver/integration_test.go b/receiver/flinkmetricsreceiver/integration_test.go index 9a21b00962d1b..a8fe41d0c2924 100644 --- a/receiver/flinkmetricsreceiver/integration_test.go +++ b/receiver/flinkmetricsreceiver/integration_test.go @@ -35,6 +35,7 @@ import ( "github.com/testcontainers/testcontainers-go/wait" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/consumer/consumertest" + "go.opentelemetry.io/collector/receiver/receivertest" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest/golden" @@ -124,7 +125,7 @@ func TestFlinkIntegration(t *testing.T) { cfg.Endpoint = fmt.Sprintf("http://%s", net.JoinHostPort(hostname, "8081")) consumer := new(consumertest.MetricsSink) - settings := componenttest.NewNopReceiverCreateSettings() + settings := receivertest.NewNopCreateSettings() rcvr, err := f.CreateMetricsReceiver(context.Background(), settings, cfg, consumer) require.NoError(t, err, "failed creating metrics receiver") require.NoError(t, rcvr.Start(context.Background(), componenttest.NewNopHost())) diff --git a/receiver/flinkmetricsreceiver/internal/metadata/generated_metrics.go b/receiver/flinkmetricsreceiver/internal/metadata/generated_metrics.go index 19cef846f4e16..5a3b152bbe299 100644 --- a/receiver/flinkmetricsreceiver/internal/metadata/generated_metrics.go +++ b/receiver/flinkmetricsreceiver/internal/metadata/generated_metrics.go @@ -11,6 +11,7 @@ import ( "go.opentelemetry.io/collector/confmap" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" + "go.opentelemetry.io/collector/receiver" ) // MetricSettings provides common settings for a particular metric. @@ -1789,7 +1790,7 @@ func WithStartTime(startTime pcommon.Timestamp) metricBuilderOption { } } -func NewMetricsBuilder(ms MetricsSettings, settings component.ReceiverCreateSettings, options ...metricBuilderOption) *MetricsBuilder { +func NewMetricsBuilder(ms MetricsSettings, settings receiver.CreateSettings, options ...metricBuilderOption) *MetricsBuilder { mb := &MetricsBuilder{ startTime: pcommon.NewTimestampFromTime(time.Now()), metricsBuffer: pmetric.NewMetrics(), diff --git a/receiver/flinkmetricsreceiver/internal/metadata/generated_metrics_test.go b/receiver/flinkmetricsreceiver/internal/metadata/generated_metrics_test.go index cbdea9c4acc9d..910c3aa1dd51d 100644 --- a/receiver/flinkmetricsreceiver/internal/metadata/generated_metrics_test.go +++ b/receiver/flinkmetricsreceiver/internal/metadata/generated_metrics_test.go @@ -7,9 +7,9 @@ import ( "testing" "github.com/stretchr/testify/assert" - "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" + "go.opentelemetry.io/collector/receiver/receivertest" "go.uber.org/zap" "go.uber.org/zap/zaptest/observer" ) @@ -17,7 +17,7 @@ import ( func TestDefaultMetrics(t *testing.T) { start := pcommon.Timestamp(1_000_000_000) ts := pcommon.Timestamp(1_000_001_000) - mb := NewMetricsBuilder(DefaultMetricsSettings(), componenttest.NewNopReceiverCreateSettings(), WithStartTime(start)) + mb := NewMetricsBuilder(DefaultMetricsSettings(), receivertest.NewNopCreateSettings(), WithStartTime(start)) enabledMetrics := make(map[string]bool) enabledMetrics["flink.job.checkpoint.count"] = true @@ -157,7 +157,7 @@ func TestAllMetrics(t *testing.T) { FlinkTaskRecordCount: MetricSettings{Enabled: true}, } observedZapCore, observedLogs := observer.New(zap.WarnLevel) - settings := componenttest.NewNopReceiverCreateSettings() + settings := receivertest.NewNopCreateSettings() settings.Logger = zap.New(observedZapCore) mb := NewMetricsBuilder(metricsSettings, settings, WithStartTime(start)) @@ -665,7 +665,7 @@ func TestNoMetrics(t *testing.T) { FlinkTaskRecordCount: MetricSettings{Enabled: false}, } observedZapCore, observedLogs := observer.New(zap.WarnLevel) - settings := componenttest.NewNopReceiverCreateSettings() + settings := receivertest.NewNopCreateSettings() settings.Logger = zap.New(observedZapCore) mb := NewMetricsBuilder(metricsSettings, settings, WithStartTime(start)) diff --git a/receiver/flinkmetricsreceiver/scraper.go b/receiver/flinkmetricsreceiver/scraper.go index 850248174ec9d..764c715360339 100644 --- a/receiver/flinkmetricsreceiver/scraper.go +++ b/receiver/flinkmetricsreceiver/scraper.go @@ -23,6 +23,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" + "go.opentelemetry.io/collector/receiver" "go.opentelemetry.io/collector/receiver/scrapererror" "go.uber.org/zap" @@ -44,7 +45,7 @@ type flinkmetricsScraper struct { mb *metadata.MetricsBuilder } -func newflinkScraper(config *Config, settings component.ReceiverCreateSettings) *flinkmetricsScraper { +func newflinkScraper(config *Config, settings receiver.CreateSettings) *flinkmetricsScraper { return &flinkmetricsScraper{ settings: settings.TelemetrySettings, cfg: config, diff --git a/receiver/flinkmetricsreceiver/scraper_test.go b/receiver/flinkmetricsreceiver/scraper_test.go index 398e683f552da..84e8e1353e1b8 100644 --- a/receiver/flinkmetricsreceiver/scraper_test.go +++ b/receiver/flinkmetricsreceiver/scraper_test.go @@ -26,6 +26,7 @@ import ( "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/config/configtls" + "go.opentelemetry.io/collector/receiver/receivertest" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest/golden" @@ -255,7 +256,7 @@ func TestScraperScrape(t *testing.T) { for _, tc := range testCases { t.Run(tc.desc, func(t *testing.T) { - scraper := newflinkScraper(createDefaultConfig().(*Config), componenttest.NewNopReceiverCreateSettings()) + scraper := newflinkScraper(createDefaultConfig().(*Config), receivertest.NewNopCreateSettings()) scraper.client = tc.setupMockClient(t) actualMetrics, err := scraper.scrape(context.Background()) diff --git a/receiver/fluentforwardreceiver/factory.go b/receiver/fluentforwardreceiver/factory.go index 7a997da75ca6a..9db8ebf6862fb 100644 --- a/receiver/fluentforwardreceiver/factory.go +++ b/receiver/fluentforwardreceiver/factory.go @@ -20,6 +20,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer" + "go.opentelemetry.io/collector/receiver" ) const ( @@ -29,12 +30,12 @@ const ( stability = component.StabilityLevelBeta ) -// NewFactory return a new component.ReceiverFactory for fluentd forwarder. -func NewFactory() component.ReceiverFactory { - return component.NewReceiverFactory( +// NewFactory return a new receiver.Factory for fluentd forwarder. +func NewFactory() receiver.Factory { + return receiver.NewFactory( typeStr, createDefaultConfig, - component.WithLogsReceiver(createLogsReceiver, stability)) + receiver.WithLogs(createLogsReceiver, stability)) } func createDefaultConfig() component.Config { @@ -45,10 +46,10 @@ func createDefaultConfig() component.Config { func createLogsReceiver( _ context.Context, - params component.ReceiverCreateSettings, + params receiver.CreateSettings, cfg component.Config, consumer consumer.Logs, -) (component.LogsReceiver, error) { +) (receiver.Logs, error) { rCfg := cfg.(*Config) return newFluentReceiver(params.Logger, rCfg, consumer) diff --git a/receiver/fluentforwardreceiver/factory_test.go b/receiver/fluentforwardreceiver/factory_test.go index 91ba1f846936e..2b99497a3a3fc 100644 --- a/receiver/fluentforwardreceiver/factory_test.go +++ b/receiver/fluentforwardreceiver/factory_test.go @@ -23,6 +23,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/consumer/consumertest" + "go.opentelemetry.io/collector/receiver/receivertest" ) func TestCreateDefaultConfig(t *testing.T) { @@ -39,7 +40,7 @@ func TestCreateReceiver(t *testing.T) { require.Equal(t, component.Type("fluentforward"), factory.Type()) - tReceiver, err := factory.CreateLogsReceiver(context.Background(), componenttest.NewNopReceiverCreateSettings(), cfg, consumertest.NewNop()) + tReceiver, err := factory.CreateLogsReceiver(context.Background(), receivertest.NewNopCreateSettings(), cfg, consumertest.NewNop()) assert.Nil(t, err, "receiver creation failed") assert.NotNil(t, tReceiver, "receiver creation failed") } diff --git a/receiver/fluentforwardreceiver/go.mod b/receiver/fluentforwardreceiver/go.mod index 1140bd0446872..d1625950a0650 100644 --- a/receiver/fluentforwardreceiver/go.mod +++ b/receiver/fluentforwardreceiver/go.mod @@ -6,11 +6,11 @@ require ( github.com/stretchr/testify v1.8.1 github.com/tinylib/msgp v1.1.6 go.opencensus.io v0.24.0 - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector v0.67.0 + go.opentelemetry.io/collector/component v0.67.0 + go.opentelemetry.io/collector/confmap v0.67.0 + go.opentelemetry.io/collector/consumer v0.67.0 + go.opentelemetry.io/collector/pdata v1.0.0-rc1 go.uber.org/zap v1.24.0 ) @@ -30,7 +30,7 @@ require ( github.com/pelletier/go-toml v1.9.4 // indirect github.com/philhofer/fwd v1.1.1 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/featuregate v0.67.0 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/receiver/fluentforwardreceiver/go.sum b/receiver/fluentforwardreceiver/go.sum index 0049988dfffcf..738b1769823e3 100644 --- a/receiver/fluentforwardreceiver/go.sum +++ b/receiver/fluentforwardreceiver/go.sum @@ -274,18 +274,18 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/component v0.67.0 h1:GCBRZAqk4yNaT4L1uwlbbwophFHrxYccLZ4Uj1Ifs/M= +go.opentelemetry.io/collector/component v0.67.0/go.mod h1:Txa2lm9oe7xsGQN8u7GdUIrRpAHFIKsTO4Qi3/CSmKk= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/metric v0.33.0 h1:xQAyl7uGEYvrLAiV/09iTJlp1pZnQ9Wl793qbVvED1E= diff --git a/receiver/fluentforwardreceiver/receiver.go b/receiver/fluentforwardreceiver/receiver.go index c15b7fb1aec2c..ac925ec3ea973 100644 --- a/receiver/fluentforwardreceiver/receiver.go +++ b/receiver/fluentforwardreceiver/receiver.go @@ -21,6 +21,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/consumer" + "go.opentelemetry.io/collector/receiver" "go.uber.org/zap" ) @@ -37,7 +38,7 @@ type fluentReceiver struct { cancel context.CancelFunc } -func newFluentReceiver(logger *zap.Logger, conf *Config, next consumer.Logs) (component.LogsReceiver, error) { +func newFluentReceiver(logger *zap.Logger, conf *Config, next consumer.Logs) (receiver.Logs, error) { eventCh := make(chan Event, eventChannelLength) collector := newCollector(eventCh, next, logger) diff --git a/receiver/googlecloudpubsubreceiver/factory.go b/receiver/googlecloudpubsubreceiver/factory.go index 6dab6c749342e..947d645f2df4a 100644 --- a/receiver/googlecloudpubsubreceiver/factory.go +++ b/receiver/googlecloudpubsubreceiver/factory.go @@ -22,6 +22,7 @@ import ( "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/obsreport" + "go.opentelemetry.io/collector/receiver" ) const ( @@ -31,16 +32,16 @@ const ( reportFormatProtobuf = "protobuf" ) -func NewFactory() component.ReceiverFactory { +func NewFactory() receiver.Factory { f := &pubsubReceiverFactory{ receivers: make(map[*Config]*pubsubReceiver), } - return component.NewReceiverFactory( + return receiver.NewFactory( typeStr, f.CreateDefaultConfig, - component.WithTracesReceiver(f.CreateTracesReceiver, stability), - component.WithMetricsReceiver(f.CreateMetricsReceiver, stability), - component.WithLogsReceiver(f.CreateLogsReceiver, stability), + receiver.WithTraces(f.CreateTracesReceiver, stability), + receiver.WithMetrics(f.CreateMetricsReceiver, stability), + receiver.WithLogs(f.CreateLogsReceiver, stability), ) } @@ -54,7 +55,7 @@ func (factory *pubsubReceiverFactory) CreateDefaultConfig() component.Config { } } -func (factory *pubsubReceiverFactory) ensureReceiver(params component.ReceiverCreateSettings, config component.Config) (*pubsubReceiver, error) { +func (factory *pubsubReceiverFactory) ensureReceiver(params receiver.CreateSettings, config component.Config) (*pubsubReceiver, error) { receiver := factory.receivers[config.(*Config)] if receiver != nil { return receiver, nil @@ -80,9 +81,9 @@ func (factory *pubsubReceiverFactory) ensureReceiver(params component.ReceiverCr func (factory *pubsubReceiverFactory) CreateTracesReceiver( _ context.Context, - params component.ReceiverCreateSettings, + params receiver.CreateSettings, cfg component.Config, - consumer consumer.Traces) (component.TracesReceiver, error) { + consumer consumer.Traces) (receiver.Traces, error) { if consumer == nil { return nil, component.ErrNilNextConsumer @@ -101,9 +102,9 @@ func (factory *pubsubReceiverFactory) CreateTracesReceiver( func (factory *pubsubReceiverFactory) CreateMetricsReceiver( _ context.Context, - params component.ReceiverCreateSettings, + params receiver.CreateSettings, cfg component.Config, - consumer consumer.Metrics) (component.MetricsReceiver, error) { + consumer consumer.Metrics) (receiver.Metrics, error) { if consumer == nil { return nil, component.ErrNilNextConsumer @@ -122,9 +123,9 @@ func (factory *pubsubReceiverFactory) CreateMetricsReceiver( func (factory *pubsubReceiverFactory) CreateLogsReceiver( _ context.Context, - params component.ReceiverCreateSettings, + params receiver.CreateSettings, cfg component.Config, - consumer consumer.Logs) (component.LogsReceiver, error) { + consumer consumer.Logs) (receiver.Logs, error) { if consumer == nil { return nil, component.ErrNilNextConsumer diff --git a/receiver/googlecloudpubsubreceiver/factory_test.go b/receiver/googlecloudpubsubreceiver/factory_test.go index 64ab6a92ce989..964ac44674ae9 100644 --- a/receiver/googlecloudpubsubreceiver/factory_test.go +++ b/receiver/googlecloudpubsubreceiver/factory_test.go @@ -22,6 +22,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/consumer/consumertest" + "go.opentelemetry.io/collector/receiver/receivertest" ) func TestCreateDefaultConfig(t *testing.T) { @@ -41,7 +42,7 @@ func TestCreateTracesReceiver(t *testing.T) { cfg := factory.CreateDefaultConfig() cfg.(*Config).Subscription = "projects/my-project/subscriptions/my-subscription" - params := componenttest.NewNopReceiverCreateSettings() + params := receivertest.NewNopCreateSettings() tReceiver, err := factory.CreateTracesReceiver(context.Background(), params, cfg, consumertest.NewNop()) assert.NoError(t, err) assert.NotNil(t, tReceiver, "traces receiver creation failed") @@ -54,7 +55,7 @@ func TestCreateMetricsReceiver(t *testing.T) { cfg := factory.CreateDefaultConfig() cfg.(*Config).Subscription = "projects/my-project/subscriptions/my-subscription" - params := componenttest.NewNopReceiverCreateSettings() + params := receivertest.NewNopCreateSettings() tReceiver, err := factory.CreateMetricsReceiver(context.Background(), params, cfg, consumertest.NewNop()) assert.NoError(t, err) assert.NotNil(t, tReceiver, "metrics receiver creation failed") @@ -67,7 +68,7 @@ func TestCreateLogsReceiver(t *testing.T) { cfg := factory.CreateDefaultConfig() cfg.(*Config).Subscription = "projects/my-project/subscriptions/my-subscription" - params := componenttest.NewNopReceiverCreateSettings() + params := receivertest.NewNopCreateSettings() tReceiver, err := factory.CreateLogsReceiver(context.Background(), params, cfg, consumertest.NewNop()) assert.NoError(t, err) assert.NotNil(t, tReceiver, "logs receiver creation failed") @@ -80,12 +81,12 @@ func TestEnsureReceiver(t *testing.T) { cfg := factory.CreateDefaultConfig() cfg.(*Config).Subscription = "projects/my-project/subscriptions/my-subscription" - tReceiver, err := factory.CreateTracesReceiver(context.Background(), componenttest.NewNopReceiverCreateSettings(), cfg, consumertest.NewNop()) + tReceiver, err := factory.CreateTracesReceiver(context.Background(), receivertest.NewNopCreateSettings(), cfg, consumertest.NewNop()) assert.NoError(t, err) - mReceiver, err := factory.CreateMetricsReceiver(context.Background(), componenttest.NewNopReceiverCreateSettings(), cfg, consumertest.NewNop()) + mReceiver, err := factory.CreateMetricsReceiver(context.Background(), receivertest.NewNopCreateSettings(), cfg, consumertest.NewNop()) assert.NoError(t, err) assert.Equal(t, tReceiver, mReceiver) - lReceiver, err := factory.CreateLogsReceiver(context.Background(), componenttest.NewNopReceiverCreateSettings(), cfg, consumertest.NewNop()) + lReceiver, err := factory.CreateLogsReceiver(context.Background(), receivertest.NewNopCreateSettings(), cfg, consumertest.NewNop()) assert.NoError(t, err) assert.Equal(t, mReceiver, lReceiver) } diff --git a/receiver/googlecloudpubsubreceiver/go.mod b/receiver/googlecloudpubsubreceiver/go.mod index 6a8593dffc0de..73462dac6c071 100644 --- a/receiver/googlecloudpubsubreceiver/go.mod +++ b/receiver/googlecloudpubsubreceiver/go.mod @@ -5,11 +5,11 @@ go 1.18 require ( cloud.google.com/go/pubsub v1.28.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector v0.67.0 + go.opentelemetry.io/collector/component v0.67.0 + go.opentelemetry.io/collector/confmap v0.67.0 + go.opentelemetry.io/collector/consumer v0.67.0 + go.opentelemetry.io/collector/pdata v1.0.0-rc1 go.uber.org/atomic v1.10.0 go.uber.org/zap v1.24.0 google.golang.org/api v0.104.0 @@ -42,7 +42,7 @@ require ( github.com/pelletier/go-toml v1.9.4 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/featuregate v0.67.0 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/receiver/googlecloudpubsubreceiver/go.sum b/receiver/googlecloudpubsubreceiver/go.sum index 5109a02819ac3..8121e35f9a8d1 100644 --- a/receiver/googlecloudpubsubreceiver/go.sum +++ b/receiver/googlecloudpubsubreceiver/go.sum @@ -297,18 +297,18 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/component v0.67.0 h1:GCBRZAqk4yNaT4L1uwlbbwophFHrxYccLZ4Uj1Ifs/M= +go.opentelemetry.io/collector/component v0.67.0/go.mod h1:Txa2lm9oe7xsGQN8u7GdUIrRpAHFIKsTO4Qi3/CSmKk= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/receiver/googlecloudpubsubreceiver/receiver_test.go b/receiver/googlecloudpubsubreceiver/receiver_test.go index 5ecc15d9bc2e3..cee16c741a13f 100644 --- a/receiver/googlecloudpubsubreceiver/receiver_test.go +++ b/receiver/googlecloudpubsubreceiver/receiver_test.go @@ -24,10 +24,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/consumer/consumertest" "go.opentelemetry.io/collector/exporter/exporterhelper" "go.opentelemetry.io/collector/obsreport" + "go.opentelemetry.io/collector/receiver/receivertest" "go.uber.org/zap" "go.uber.org/zap/zaptest/observer" @@ -82,7 +82,7 @@ func TestReceiver(t *testing.T) { assert.NoError(t, err) core, _ := observer.New(zap.WarnLevel) - params := componenttest.NewNopReceiverCreateSettings() + params := receivertest.NewNopCreateSettings() traceSink := new(consumertest.TracesSink) metricSink := new(consumertest.MetricsSink) logSink := new(consumertest.LogsSink) diff --git a/receiver/googlecloudspannerreceiver/factory.go b/receiver/googlecloudspannerreceiver/factory.go index 234a8735bc6b8..f7bfa10c2245a 100644 --- a/receiver/googlecloudspannerreceiver/factory.go +++ b/receiver/googlecloudspannerreceiver/factory.go @@ -21,6 +21,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer" + "go.opentelemetry.io/collector/receiver" "go.opentelemetry.io/collector/receiver/scraperhelper" ) @@ -34,11 +35,11 @@ const ( defaultHideTopnLockstatsRowrangestartkey = false ) -func NewFactory() component.ReceiverFactory { - return component.NewReceiverFactory( +func NewFactory() receiver.Factory { + return receiver.NewFactory( typeStr, createDefaultConfig, - component.WithMetricsReceiver(createMetricsReceiver, stability)) + receiver.WithMetrics(createMetricsReceiver, stability)) } func createDefaultConfig() component.Config { @@ -55,10 +56,10 @@ func createDefaultConfig() component.Config { func createMetricsReceiver( _ context.Context, - settings component.ReceiverCreateSettings, + settings receiver.CreateSettings, baseCfg component.Config, consumer consumer.Metrics, -) (component.MetricsReceiver, error) { +) (receiver.Metrics, error) { rCfg := baseCfg.(*Config) r := newGoogleCloudSpannerReceiver(settings.Logger, rCfg) diff --git a/receiver/googlecloudspannerreceiver/factory_test.go b/receiver/googlecloudspannerreceiver/factory_test.go index 5234508b8079f..4ff5838a7399f 100644 --- a/receiver/googlecloudspannerreceiver/factory_test.go +++ b/receiver/googlecloudspannerreceiver/factory_test.go @@ -21,8 +21,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/consumer/consumertest" + "go.opentelemetry.io/collector/receiver/receivertest" ) func TestCreateDefaultConfig(t *testing.T) { @@ -43,7 +43,7 @@ func TestCreateMetricsReceiver(t *testing.T) { receiver, err := factory.CreateMetricsReceiver( context.Background(), - componenttest.NewNopReceiverCreateSettings(), + receivertest.NewNopCreateSettings(), receiverConfig, consumertest.NewNop(), ) @@ -51,6 +51,6 @@ func TestCreateMetricsReceiver(t *testing.T) { assert.NoError(t, err) assert.NotNil(t, receiver, "failed to create metrics receiver") - _, err = factory.CreateMetricsReceiver(context.Background(), componenttest.NewNopReceiverCreateSettings(), receiverConfig, nil) + _, err = factory.CreateMetricsReceiver(context.Background(), receivertest.NewNopCreateSettings(), receiverConfig, nil) require.Error(t, err) } diff --git a/receiver/googlecloudspannerreceiver/go.mod b/receiver/googlecloudspannerreceiver/go.mod index c9b9b800a7480..2c4b266b55eef 100644 --- a/receiver/googlecloudspannerreceiver/go.mod +++ b/receiver/googlecloudspannerreceiver/go.mod @@ -7,11 +7,11 @@ require ( github.com/ReneKroon/ttlcache/v2 v2.11.0 github.com/mitchellh/hashstructure v1.1.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector v0.67.0 + go.opentelemetry.io/collector/component v0.67.0 + go.opentelemetry.io/collector/confmap v0.67.0 + go.opentelemetry.io/collector/consumer v0.67.0 + go.opentelemetry.io/collector/pdata v1.0.0-rc1 go.uber.org/zap v1.24.0 google.golang.org/api v0.104.0 google.golang.org/grpc v1.51.0 @@ -51,7 +51,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/stretchr/objx v0.5.0 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/featuregate v0.67.0 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/receiver/googlecloudspannerreceiver/go.sum b/receiver/googlecloudspannerreceiver/go.sum index 8808505ce8bde..3241e74364c63 100644 --- a/receiver/googlecloudspannerreceiver/go.sum +++ b/receiver/googlecloudspannerreceiver/go.sum @@ -323,18 +323,18 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/component v0.67.0 h1:GCBRZAqk4yNaT4L1uwlbbwophFHrxYccLZ4Uj1Ifs/M= +go.opentelemetry.io/collector/component v0.67.0/go.mod h1:Txa2lm9oe7xsGQN8u7GdUIrRpAHFIKsTO4Qi3/CSmKk= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/receiver/googlecloudspannerreceiver/receiver.go b/receiver/googlecloudspannerreceiver/receiver.go index a58488ab6f305..cf84cf0546674 100644 --- a/receiver/googlecloudspannerreceiver/receiver.go +++ b/receiver/googlecloudspannerreceiver/receiver.go @@ -21,6 +21,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/pdata/pmetric" + "go.opentelemetry.io/collector/receiver" "go.uber.org/zap" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/googlecloudspannerreceiver/internal/datasource" @@ -33,7 +34,7 @@ import ( //go:embed "internal/metadataconfig/metadata.yaml" var metadataYaml []byte -var _ component.MetricsReceiver = (*googleCloudSpannerReceiver)(nil) +var _ receiver.Metrics = (*googleCloudSpannerReceiver)(nil) type googleCloudSpannerReceiver struct { logger *zap.Logger diff --git a/receiver/hostmetricsreceiver/config_test.go b/receiver/hostmetricsreceiver/config_test.go index 3cf2c9b84b015..d04b1ff282455 100644 --- a/receiver/hostmetricsreceiver/config_test.go +++ b/receiver/hostmetricsreceiver/config_test.go @@ -24,8 +24,8 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" + "go.opentelemetry.io/collector/otelcol/otelcoltest" "go.opentelemetry.io/collector/receiver/scraperhelper" - "go.opentelemetry.io/collector/service/servicetest" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/filter/filterset" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver/internal" @@ -46,7 +46,7 @@ func TestLoadConfig(t *testing.T) { factory := NewFactory() factories.Receivers[typeStr] = factory - cfg, err := servicetest.LoadConfigAndValidate(filepath.Join("testdata", "config.yaml"), factories) + cfg, err := otelcoltest.LoadConfigAndValidate(filepath.Join("testdata", "config.yaml"), factories) require.NoError(t, err) require.NotNil(t, cfg) @@ -107,7 +107,7 @@ func TestLoadInvalidConfig_NoScrapers(t *testing.T) { factory := NewFactory() factories.Receivers[typeStr] = factory - _, err = servicetest.LoadConfigAndValidate(filepath.Join("testdata", "config-noscrapers.yaml"), factories) + _, err = otelcoltest.LoadConfigAndValidate(filepath.Join("testdata", "config-noscrapers.yaml"), factories) require.Contains(t, err.Error(), "receiver \"hostmetrics\" has invalid configuration: must specify at least one scraper when using hostmetrics receiver") } @@ -118,7 +118,7 @@ func TestLoadInvalidConfig_InvalidScraperKey(t *testing.T) { factory := NewFactory() factories.Receivers[typeStr] = factory - _, err = servicetest.LoadConfigAndValidate(filepath.Join("testdata", "config-invalidscraperkey.yaml"), factories) + _, err = otelcoltest.LoadConfigAndValidate(filepath.Join("testdata", "config-invalidscraperkey.yaml"), factories) require.Contains(t, err.Error(), "error reading receivers configuration for \"hostmetrics\": invalid scraper key: invalidscraperkey") } diff --git a/receiver/hostmetricsreceiver/factory.go b/receiver/hostmetricsreceiver/factory.go index b2176ba1cd660..81113661c9327 100644 --- a/receiver/hostmetricsreceiver/factory.go +++ b/receiver/hostmetricsreceiver/factory.go @@ -21,6 +21,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/consumer" + "go.opentelemetry.io/collector/receiver" "go.opentelemetry.io/collector/receiver/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver/internal" @@ -59,11 +60,11 @@ var ( ) // NewFactory creates a new factory for host metrics receiver. -func NewFactory() component.ReceiverFactory { - return component.NewReceiverFactory( +func NewFactory() receiver.Factory { + return receiver.NewFactory( typeStr, createDefaultConfig, - component.WithMetricsReceiver(createMetricsReceiver, stability)) + receiver.WithMetrics(createMetricsReceiver, stability)) } func getScraperFactory(key string) (internal.ScraperFactory, bool) { @@ -82,10 +83,10 @@ func createDefaultConfig() component.Config { // createMetricsReceiver creates a metrics receiver based on provided config. func createMetricsReceiver( ctx context.Context, - set component.ReceiverCreateSettings, + set receiver.CreateSettings, cfg component.Config, consumer consumer.Metrics, -) (component.MetricsReceiver, error) { +) (receiver.Metrics, error) { oCfg := cfg.(*Config) addScraperOptions, err := createAddScraperOptions(ctx, set, oCfg, scraperFactories) @@ -107,7 +108,7 @@ func createMetricsReceiver( func createAddScraperOptions( ctx context.Context, - set component.ReceiverCreateSettings, + set receiver.CreateSettings, config *Config, factories map[string]internal.ScraperFactory, ) ([]scraperhelper.ScraperControllerOption, error) { @@ -130,7 +131,7 @@ func createAddScraperOptions( return scraperControllerOptions, nil } -func createHostMetricsScraper(ctx context.Context, set component.ReceiverCreateSettings, key string, cfg internal.Config, factories map[string]internal.ScraperFactory) (scraper scraperhelper.Scraper, ok bool, err error) { +func createHostMetricsScraper(ctx context.Context, set receiver.CreateSettings, key string, cfg internal.Config, factories map[string]internal.ScraperFactory) (scraper scraperhelper.Scraper, ok bool, err error) { factory := factories[key] if factory == nil { ok = false diff --git a/receiver/hostmetricsreceiver/factory_test.go b/receiver/hostmetricsreceiver/factory_test.go index 3bfa352970b29..8fbbce5073b02 100644 --- a/receiver/hostmetricsreceiver/factory_test.go +++ b/receiver/hostmetricsreceiver/factory_test.go @@ -23,11 +23,12 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/consumer/consumertest" + "go.opentelemetry.io/collector/receiver/receivertest" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver/internal" ) -var creationSet = componenttest.NewNopReceiverCreateSettings() +var creationSet = receivertest.NewNopCreateSettings() func TestCreateDefaultConfig(t *testing.T) { factory := NewFactory() diff --git a/receiver/hostmetricsreceiver/go.mod b/receiver/hostmetricsreceiver/go.mod index 5837366997af9..363aa2943e204 100644 --- a/receiver/hostmetricsreceiver/go.mod +++ b/receiver/hostmetricsreceiver/go.mod @@ -4,15 +4,15 @@ go 1.18 require ( github.com/leoluk/perflib_exporter v0.2.0 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/filter v0.66.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/filter v0.67.0 github.com/shirou/gopsutil/v3 v3.22.10 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector v0.67.0 + go.opentelemetry.io/collector/component v0.67.0 + go.opentelemetry.io/collector/confmap v0.67.0 + go.opentelemetry.io/collector/consumer v0.67.0 + go.opentelemetry.io/collector/pdata v1.0.0-rc1 + go.opentelemetry.io/collector/semconv v0.67.0 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.24.0 golang.org/x/sys v0.3.0 @@ -56,8 +56,8 @@ require ( github.com/tklauser/numcpus v0.6.0 // indirect github.com/yusufpapurcu/wmi v1.2.2 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect - go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/featuregate v0.67.0 // indirect + go.opentelemetry.io/collector/processor/batchprocessor v0.67.0 // indirect go.opentelemetry.io/contrib/propagators/b3 v1.11.1 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.33.0 // indirect diff --git a/receiver/hostmetricsreceiver/go.sum b/receiver/hostmetricsreceiver/go.sum index b93f2b260ca08..a54ea001b347c 100644 --- a/receiver/hostmetricsreceiver/go.sum +++ b/receiver/hostmetricsreceiver/go.sum @@ -398,23 +398,23 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/extension/zpagesextension v0.66.0 h1:tPqSKH5K3VhTT0XXVoWL3woWBSTJqnXZQRt0ZLSCoCc= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221202005155-1c54042beb70 h1:Y4e8NnVevonnAgmjX9Z7QIMA32yMqHAOnAlh8SzTS8c= -go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:Pi1CsKDQFoDrUP1i3+VdE6s2Xuji7bOGFBgqHK0J32E= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 h1:Q5L9Urod3c8as6ZYaoaqBjarx/HXxsxy34DFZIU2fO4= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/component v0.67.0 h1:GCBRZAqk4yNaT4L1uwlbbwophFHrxYccLZ4Uj1Ifs/M= +go.opentelemetry.io/collector/component v0.67.0/go.mod h1:Txa2lm9oe7xsGQN8u7GdUIrRpAHFIKsTO4Qi3/CSmKk= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/extension/zpagesextension v0.67.0 h1:TRW8vZwE+/h2vJqqMDmyQO9X0sxcYCSXf5MyXozSLas= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= +go.opentelemetry.io/collector/processor/batchprocessor v0.67.0 h1:Qn4Ytth3q1trwTSAYYTzIRs4SBh9rz0xBou1nZB+Dko= +go.opentelemetry.io/collector/processor/batchprocessor v0.67.0/go.mod h1:+ZXCkUG9tlwbbVLi+PT9DjQ7vz+lfFSQqvW45snLYno= +go.opentelemetry.io/collector/semconv v0.67.0 h1:zLAvcQa6Kgow52FFLrmk7/9ZVtEYyA73+xDtCcFG78Q= +go.opentelemetry.io/collector/semconv v0.67.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/contrib/propagators/b3 v1.11.1 h1:icQ6ttRV+r/2fnU46BIo/g/mPu6Rs5Ug8Rtohe3KqzI= go.opentelemetry.io/contrib/propagators/b3 v1.11.1/go.mod h1:ECIveyMXgnl4gorxFcA7RYjJY/Ql9n20ubhbfDc3QfA= go.opentelemetry.io/contrib/zpages v0.36.4 h1:Z2VK5WsDhWs9VwZ1p0TM5RyusTOgAQfdMMDDQPRnlmY= diff --git a/receiver/hostmetricsreceiver/hostmetrics_linux_test.go b/receiver/hostmetricsreceiver/hostmetrics_linux_test.go index bb883e0ee0d8c..05a62554f9453 100644 --- a/receiver/hostmetricsreceiver/hostmetrics_linux_test.go +++ b/receiver/hostmetricsreceiver/hostmetrics_linux_test.go @@ -24,7 +24,7 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" - "go.opentelemetry.io/collector/service/servicetest" + "go.opentelemetry.io/collector/otelcol/otelcoltest" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver/internal" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver/internal/scraper/cpuscraper" @@ -49,7 +49,7 @@ func TestLoadConfigRootPath(t *testing.T) { factories, _ := componenttest.NopFactories() factory := NewFactory() factories.Receivers[typeStr] = factory - cfg, err := servicetest.LoadConfigAndValidate(filepath.Join("testdata", "config-root-path.yaml"), factories) + cfg, err := otelcoltest.LoadConfigAndValidate(filepath.Join("testdata", "config-root-path.yaml"), factories) require.NoError(t, err) globalRootPath = "" @@ -67,7 +67,7 @@ func TestLoadInvalidConfig_RootPathNotExist(t *testing.T) { factories, _ := componenttest.NopFactories() factory := NewFactory() factories.Receivers[typeStr] = factory - _, err := servicetest.LoadConfigAndValidate(filepath.Join("testdata", "config-bad-root-path.yaml"), factories) + _, err := otelcoltest.LoadConfigAndValidate(filepath.Join("testdata", "config-bad-root-path.yaml"), factories) assert.ErrorContains(t, err, "invalid root_path:") globalRootPath = "" } diff --git a/receiver/hostmetricsreceiver/hostmetrics_receiver_test.go b/receiver/hostmetricsreceiver/hostmetrics_receiver_test.go index 75e13d452b60e..d7014b6709932 100644 --- a/receiver/hostmetricsreceiver/hostmetrics_receiver_test.go +++ b/receiver/hostmetricsreceiver/hostmetrics_receiver_test.go @@ -30,6 +30,8 @@ import ( "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/consumer/consumertest" "go.opentelemetry.io/collector/pdata/pmetric" + "go.opentelemetry.io/collector/receiver" + "go.opentelemetry.io/collector/receiver/receivertest" "go.opentelemetry.io/collector/receiver/scraperhelper" conventions "go.opentelemetry.io/collector/semconv/v1.9.0" @@ -230,7 +232,7 @@ type mockFactory struct{ mock.Mock } type mockScraper struct{ mock.Mock } func (m *mockFactory) CreateDefaultConfig() internal.Config { return &mockConfig{} } -func (m *mockFactory) CreateMetricsScraper(context.Context, component.ReceiverCreateSettings, internal.Config) (scraperhelper.Scraper, error) { +func (m *mockFactory) CreateMetricsScraper(context.Context, receiver.CreateSettings, internal.Config) (scraperhelper.Scraper, error) { args := m.MethodCalled("CreateMetricsScraper") return args.Get(0).(scraperhelper.Scraper), args.Error(1) } @@ -288,11 +290,11 @@ func benchmarkScrapeMetrics(b *testing.B, cfg *Config) { sink := ¬ifyingSink{ch: make(chan int, 10)} tickerCh := make(chan time.Time) - options, err := createAddScraperOptions(context.Background(), componenttest.NewNopReceiverCreateSettings(), cfg, scraperFactories) + options, err := createAddScraperOptions(context.Background(), receivertest.NewNopCreateSettings(), cfg, scraperFactories) require.NoError(b, err) options = append(options, scraperhelper.WithTickerChannel(tickerCh)) - receiver, err := scraperhelper.NewScraperControllerReceiver(&cfg.ScraperControllerSettings, componenttest.NewNopReceiverCreateSettings(), sink, options...) + receiver, err := scraperhelper.NewScraperControllerReceiver(&cfg.ScraperControllerSettings, receivertest.NewNopCreateSettings(), sink, options...) require.NoError(b, err) require.NoError(b, receiver.Start(context.Background(), componenttest.NewNopHost())) diff --git a/receiver/hostmetricsreceiver/internal/scraper.go b/receiver/hostmetricsreceiver/internal/scraper.go index c589cff38ae39..e6fe4b0e43002 100644 --- a/receiver/hostmetricsreceiver/internal/scraper.go +++ b/receiver/hostmetricsreceiver/internal/scraper.go @@ -17,7 +17,7 @@ package internal // import "github.com/open-telemetry/opentelemetry-collector-co import ( "context" - "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/receiver" "go.opentelemetry.io/collector/receiver/scraperhelper" ) @@ -28,7 +28,7 @@ type ScraperFactory interface { // CreateMetricsScraper creates a scraper based on this config. // If the config is not valid, error will be returned instead. - CreateMetricsScraper(ctx context.Context, settings component.ReceiverCreateSettings, cfg Config) (scraperhelper.Scraper, error) + CreateMetricsScraper(ctx context.Context, settings receiver.CreateSettings, cfg Config) (scraperhelper.Scraper, error) } // Config is the configuration of a scraper. diff --git a/receiver/hostmetricsreceiver/internal/scraper/cpuscraper/cpu_scraper.go b/receiver/hostmetricsreceiver/internal/scraper/cpuscraper/cpu_scraper.go index 7c49f6e693dcc..24c5e957be913 100644 --- a/receiver/hostmetricsreceiver/internal/scraper/cpuscraper/cpu_scraper.go +++ b/receiver/hostmetricsreceiver/internal/scraper/cpuscraper/cpu_scraper.go @@ -23,6 +23,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" + "go.opentelemetry.io/collector/receiver" "go.opentelemetry.io/collector/receiver/scrapererror" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver/internal/scraper/cpuscraper/internal/metadata" @@ -33,7 +34,7 @@ const metricsLen = 2 // scraper for CPU Metrics type scraper struct { - settings component.ReceiverCreateSettings + settings receiver.CreateSettings config *Config mb *metadata.MetricsBuilder ucal *ucal.CPUUtilizationCalculator @@ -45,7 +46,7 @@ type scraper struct { } // newCPUScraper creates a set of CPU related metrics -func newCPUScraper(_ context.Context, settings component.ReceiverCreateSettings, cfg *Config) *scraper { +func newCPUScraper(_ context.Context, settings receiver.CreateSettings, cfg *Config) *scraper { return &scraper{settings: settings, config: cfg, bootTime: host.BootTime, times: cpu.Times, ucal: &ucal.CPUUtilizationCalculator{}, now: time.Now} } diff --git a/receiver/hostmetricsreceiver/internal/scraper/cpuscraper/cpu_scraper_test.go b/receiver/hostmetricsreceiver/internal/scraper/cpuscraper/cpu_scraper_test.go index 4cd4e5e068ef1..06d7877388f57 100644 --- a/receiver/hostmetricsreceiver/internal/scraper/cpuscraper/cpu_scraper_test.go +++ b/receiver/hostmetricsreceiver/internal/scraper/cpuscraper/cpu_scraper_test.go @@ -27,6 +27,7 @@ import ( "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" + "go.opentelemetry.io/collector/receiver/receivertest" "go.opentelemetry.io/collector/receiver/scrapererror" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver/internal" @@ -85,7 +86,7 @@ func TestScrape(t *testing.T) { for _, test := range testCases { t.Run(test.name, func(t *testing.T) { - scraper := newCPUScraper(context.Background(), componenttest.NewNopReceiverCreateSettings(), &Config{Metrics: test.metricsConfig}) + scraper := newCPUScraper(context.Background(), receivertest.NewNopCreateSettings(), &Config{Metrics: test.metricsConfig}) if test.bootTimeFunc != nil { scraper.bootTime = test.bootTimeFunc } @@ -189,7 +190,7 @@ func TestScrape_CpuUtilization(t *testing.T) { } } - scraper := newCPUScraper(context.Background(), componenttest.NewNopReceiverCreateSettings(), &Config{Metrics: settings}) + scraper := newCPUScraper(context.Background(), receivertest.NewNopCreateSettings(), &Config{Metrics: settings}) err := scraper.start(context.Background(), componenttest.NewNopHost()) require.NoError(t, err, "Failed to initialize cpu scraper: %v", err) @@ -226,7 +227,7 @@ func TestScrape_CpuUtilization(t *testing.T) { // Error in calculation should be returned as PartialScrapeError func TestScrape_CpuUtilizationError(t *testing.T) { - scraper := newCPUScraper(context.Background(), componenttest.NewNopReceiverCreateSettings(), &Config{Metrics: metadata.DefaultMetricsSettings()}) + scraper := newCPUScraper(context.Background(), receivertest.NewNopCreateSettings(), &Config{Metrics: metadata.DefaultMetricsSettings()}) // mock times function to force an error in next scrape scraper.times = func(bool) ([]cpu.TimesStat, error) { return []cpu.TimesStat{{CPU: "1", System: 1, User: 2}}, nil @@ -296,7 +297,7 @@ func TestScrape_CpuUtilizationStandard(t *testing.T) { }, } - cpuScraper := newCPUScraper(context.Background(), componenttest.NewNopReceiverCreateSettings(), &Config{Metrics: metricSettings}) + cpuScraper := newCPUScraper(context.Background(), receivertest.NewNopCreateSettings(), &Config{Metrics: metricSettings}) for _, scrapeData := range scrapesData { // mock TimeStats and Now cpuScraper.times = func(_ bool) ([]cpu.TimesStat, error) { diff --git a/receiver/hostmetricsreceiver/internal/scraper/cpuscraper/factory.go b/receiver/hostmetricsreceiver/internal/scraper/cpuscraper/factory.go index d6f8884fa1ef2..9bfb997fd6b18 100644 --- a/receiver/hostmetricsreceiver/internal/scraper/cpuscraper/factory.go +++ b/receiver/hostmetricsreceiver/internal/scraper/cpuscraper/factory.go @@ -17,7 +17,7 @@ package cpuscraper // import "github.com/open-telemetry/opentelemetry-collector- import ( "context" - "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/receiver" "go.opentelemetry.io/collector/receiver/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver/internal" @@ -44,7 +44,7 @@ func (f *Factory) CreateDefaultConfig() internal.Config { // CreateMetricsScraper creates a scraper based on provided config. func (f *Factory) CreateMetricsScraper( ctx context.Context, - settings component.ReceiverCreateSettings, + settings receiver.CreateSettings, config internal.Config, ) (scraperhelper.Scraper, error) { cfg := config.(*Config) diff --git a/receiver/hostmetricsreceiver/internal/scraper/cpuscraper/factory_test.go b/receiver/hostmetricsreceiver/internal/scraper/cpuscraper/factory_test.go index 8602eba205349..b6674bc77d82c 100644 --- a/receiver/hostmetricsreceiver/internal/scraper/cpuscraper/factory_test.go +++ b/receiver/hostmetricsreceiver/internal/scraper/cpuscraper/factory_test.go @@ -19,7 +19,7 @@ import ( "testing" "github.com/stretchr/testify/assert" - "go.opentelemetry.io/collector/component/componenttest" + "go.opentelemetry.io/collector/receiver/receivertest" ) func TestCreateDefaultConfig(t *testing.T) { @@ -32,7 +32,7 @@ func TestCreateMetricsScraper(t *testing.T) { factory := &Factory{} cfg := &Config{} - scraper, err := factory.CreateMetricsScraper(context.Background(), componenttest.NewNopReceiverCreateSettings(), cfg) + scraper, err := factory.CreateMetricsScraper(context.Background(), receivertest.NewNopCreateSettings(), cfg) assert.NoError(t, err) assert.NotNil(t, scraper) diff --git a/receiver/hostmetricsreceiver/internal/scraper/cpuscraper/internal/metadata/generated_metrics.go b/receiver/hostmetricsreceiver/internal/scraper/cpuscraper/internal/metadata/generated_metrics.go index 6216634b0ac90..46a3982f0abb4 100644 --- a/receiver/hostmetricsreceiver/internal/scraper/cpuscraper/internal/metadata/generated_metrics.go +++ b/receiver/hostmetricsreceiver/internal/scraper/cpuscraper/internal/metadata/generated_metrics.go @@ -9,6 +9,7 @@ import ( "go.opentelemetry.io/collector/confmap" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" + "go.opentelemetry.io/collector/receiver" conventions "go.opentelemetry.io/collector/semconv/v1.9.0" ) @@ -231,7 +232,7 @@ func WithStartTime(startTime pcommon.Timestamp) metricBuilderOption { } } -func NewMetricsBuilder(ms MetricsSettings, settings component.ReceiverCreateSettings, options ...metricBuilderOption) *MetricsBuilder { +func NewMetricsBuilder(ms MetricsSettings, settings receiver.CreateSettings, options ...metricBuilderOption) *MetricsBuilder { mb := &MetricsBuilder{ startTime: pcommon.NewTimestampFromTime(time.Now()), metricsBuffer: pmetric.NewMetrics(), diff --git a/receiver/hostmetricsreceiver/internal/scraper/cpuscraper/internal/metadata/generated_metrics_test.go b/receiver/hostmetricsreceiver/internal/scraper/cpuscraper/internal/metadata/generated_metrics_test.go index 0fa4587062508..4f477a4ca6b5b 100644 --- a/receiver/hostmetricsreceiver/internal/scraper/cpuscraper/internal/metadata/generated_metrics_test.go +++ b/receiver/hostmetricsreceiver/internal/scraper/cpuscraper/internal/metadata/generated_metrics_test.go @@ -7,9 +7,9 @@ import ( "testing" "github.com/stretchr/testify/assert" - "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" + "go.opentelemetry.io/collector/receiver/receivertest" "go.uber.org/zap" "go.uber.org/zap/zaptest/observer" ) @@ -17,7 +17,7 @@ import ( func TestDefaultMetrics(t *testing.T) { start := pcommon.Timestamp(1_000_000_000) ts := pcommon.Timestamp(1_000_001_000) - mb := NewMetricsBuilder(DefaultMetricsSettings(), componenttest.NewNopReceiverCreateSettings(), WithStartTime(start)) + mb := NewMetricsBuilder(DefaultMetricsSettings(), receivertest.NewNopCreateSettings(), WithStartTime(start)) enabledMetrics := make(map[string]bool) enabledMetrics["system.cpu.time"] = true @@ -48,7 +48,7 @@ func TestAllMetrics(t *testing.T) { SystemCPUUtilization: MetricSettings{Enabled: true}, } observedZapCore, observedLogs := observer.New(zap.WarnLevel) - settings := componenttest.NewNopReceiverCreateSettings() + settings := receivertest.NewNopCreateSettings() settings.Logger = zap.New(observedZapCore) mb := NewMetricsBuilder(metricsSettings, settings, WithStartTime(start)) @@ -120,7 +120,7 @@ func TestNoMetrics(t *testing.T) { SystemCPUUtilization: MetricSettings{Enabled: false}, } observedZapCore, observedLogs := observer.New(zap.WarnLevel) - settings := componenttest.NewNopReceiverCreateSettings() + settings := receivertest.NewNopCreateSettings() settings.Logger = zap.New(observedZapCore) mb := NewMetricsBuilder(metricsSettings, settings, WithStartTime(start)) diff --git a/receiver/hostmetricsreceiver/internal/scraper/diskscraper/disk_scraper_others.go b/receiver/hostmetricsreceiver/internal/scraper/diskscraper/disk_scraper_others.go index 928e56620f124..38e7c71cf59c7 100644 --- a/receiver/hostmetricsreceiver/internal/scraper/diskscraper/disk_scraper_others.go +++ b/receiver/hostmetricsreceiver/internal/scraper/diskscraper/disk_scraper_others.go @@ -27,6 +27,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" + "go.opentelemetry.io/collector/receiver" "go.opentelemetry.io/collector/receiver/scrapererror" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/filter/filterset" @@ -40,7 +41,7 @@ const ( // scraper for Disk Metrics type scraper struct { - settings component.ReceiverCreateSettings + settings receiver.CreateSettings config *Config startTime pcommon.Timestamp mb *metadata.MetricsBuilder @@ -53,7 +54,7 @@ type scraper struct { } // newDiskScraper creates a Disk Scraper -func newDiskScraper(_ context.Context, settings component.ReceiverCreateSettings, cfg *Config) (*scraper, error) { +func newDiskScraper(_ context.Context, settings receiver.CreateSettings, cfg *Config) (*scraper, error) { scraper := &scraper{settings: settings, config: cfg, bootTime: host.BootTime, ioCounters: disk.IOCounters} var err error diff --git a/receiver/hostmetricsreceiver/internal/scraper/diskscraper/disk_scraper_others_test.go b/receiver/hostmetricsreceiver/internal/scraper/diskscraper/disk_scraper_others_test.go index 9530dc7ac246c..58e84ad105826 100644 --- a/receiver/hostmetricsreceiver/internal/scraper/diskscraper/disk_scraper_others_test.go +++ b/receiver/hostmetricsreceiver/internal/scraper/diskscraper/disk_scraper_others_test.go @@ -26,6 +26,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component/componenttest" + "go.opentelemetry.io/collector/receiver/receivertest" "go.opentelemetry.io/collector/receiver/scrapererror" ) @@ -46,7 +47,7 @@ func TestScrape_Others(t *testing.T) { for _, test := range testCases { t.Run(test.name, func(t *testing.T) { - scraper, err := newDiskScraper(context.Background(), componenttest.NewNopReceiverCreateSettings(), &Config{}) + scraper, err := newDiskScraper(context.Background(), receivertest.NewNopCreateSettings(), &Config{}) require.NoError(t, err, "Failed to create disk scraper: %v", err) if test.ioCountersFunc != nil { diff --git a/receiver/hostmetricsreceiver/internal/scraper/diskscraper/disk_scraper_test.go b/receiver/hostmetricsreceiver/internal/scraper/diskscraper/disk_scraper_test.go index 84d91e4491723..89bbe28749723 100644 --- a/receiver/hostmetricsreceiver/internal/scraper/diskscraper/disk_scraper_test.go +++ b/receiver/hostmetricsreceiver/internal/scraper/diskscraper/disk_scraper_test.go @@ -24,6 +24,7 @@ import ( "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" + "go.opentelemetry.io/collector/receiver/receivertest" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/filter/filterset" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver/internal" @@ -99,7 +100,7 @@ func TestScrape(t *testing.T) { for _, test := range testCases { t.Run(test.name, func(t *testing.T) { - scraper, err := newDiskScraper(context.Background(), componenttest.NewNopReceiverCreateSettings(), &test.config) + scraper, err := newDiskScraper(context.Background(), receivertest.NewNopCreateSettings(), &test.config) if test.mutateScraper != nil { test.mutateScraper(scraper) } diff --git a/receiver/hostmetricsreceiver/internal/scraper/diskscraper/disk_scraper_windows.go b/receiver/hostmetricsreceiver/internal/scraper/diskscraper/disk_scraper_windows.go index e6661cecc325d..214dcc731e638 100644 --- a/receiver/hostmetricsreceiver/internal/scraper/diskscraper/disk_scraper_windows.go +++ b/receiver/hostmetricsreceiver/internal/scraper/diskscraper/disk_scraper_windows.go @@ -23,6 +23,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" + "go.opentelemetry.io/collector/receiver" "go.opentelemetry.io/collector/receiver/scrapererror" "go.uber.org/zap" @@ -52,7 +53,7 @@ const ( // scraper for Disk Metrics type scraper struct { - settings component.ReceiverCreateSettings + settings receiver.CreateSettings config *Config startTime pcommon.Timestamp mb *metadata.MetricsBuilder @@ -67,7 +68,7 @@ type scraper struct { } // newDiskScraper creates a Disk Scraper -func newDiskScraper(_ context.Context, settings component.ReceiverCreateSettings, cfg *Config) (*scraper, error) { +func newDiskScraper(_ context.Context, settings receiver.CreateSettings, cfg *Config) (*scraper, error) { scraper := &scraper{settings: settings, config: cfg, perfCounterScraper: &perfcounters.PerfLibScraper{}, bootTime: host.BootTime} var err error diff --git a/receiver/hostmetricsreceiver/internal/scraper/diskscraper/disk_scraper_windows_test.go b/receiver/hostmetricsreceiver/internal/scraper/diskscraper/disk_scraper_windows_test.go index fd98a6230b985..32cf40e6e3dc9 100644 --- a/receiver/hostmetricsreceiver/internal/scraper/diskscraper/disk_scraper_windows_test.go +++ b/receiver/hostmetricsreceiver/internal/scraper/diskscraper/disk_scraper_windows_test.go @@ -25,6 +25,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component/componenttest" + "go.opentelemetry.io/collector/receiver/receivertest" "go.opentelemetry.io/collector/receiver/scrapererror" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver/internal/perfcounters" @@ -59,7 +60,7 @@ func TestScrape_Error(t *testing.T) { for _, test := range testCases { t.Run(test.name, func(t *testing.T) { - scraper, err := newDiskScraper(context.Background(), componenttest.NewNopReceiverCreateSettings(), &Config{}) + scraper, err := newDiskScraper(context.Background(), receivertest.NewNopCreateSettings(), &Config{}) require.NoError(t, err, "Failed to create disk scraper: %v", err) scraper.perfCounterScraper = perfcounters.NewMockPerfCounterScraperError(test.scrapeErr, test.getObjectErr, test.getValuesErr, nil) @@ -103,7 +104,7 @@ func TestStart_Error(t *testing.T) { for _, tc := range testCases { t.Run(tc.name, func(t *testing.T) { - scraper, err := newDiskScraper(context.Background(), componenttest.NewNopReceiverCreateSettings(), &Config{}) + scraper, err := newDiskScraper(context.Background(), receivertest.NewNopCreateSettings(), &Config{}) require.NoError(t, err, "Failed to create disk scraper: %v", err) scraper.perfCounterScraper = perfcounters.NewMockPerfCounterScraperError(nil, nil, nil, tc.initError) diff --git a/receiver/hostmetricsreceiver/internal/scraper/diskscraper/factory.go b/receiver/hostmetricsreceiver/internal/scraper/diskscraper/factory.go index 35cb4fcb914b3..91950ab4a1c9b 100644 --- a/receiver/hostmetricsreceiver/internal/scraper/diskscraper/factory.go +++ b/receiver/hostmetricsreceiver/internal/scraper/diskscraper/factory.go @@ -17,7 +17,7 @@ package diskscraper // import "github.com/open-telemetry/opentelemetry-collector import ( "context" - "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/receiver" "go.opentelemetry.io/collector/receiver/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver/internal" @@ -45,7 +45,7 @@ func (f *Factory) CreateDefaultConfig() internal.Config { // CreateMetricsScraper creates a scraper based on provided config. func (f *Factory) CreateMetricsScraper( ctx context.Context, - settings component.ReceiverCreateSettings, + settings receiver.CreateSettings, config internal.Config, ) (scraperhelper.Scraper, error) { cfg := config.(*Config) diff --git a/receiver/hostmetricsreceiver/internal/scraper/diskscraper/factory_test.go b/receiver/hostmetricsreceiver/internal/scraper/diskscraper/factory_test.go index dd5065d5bc92c..739ad4a068e43 100644 --- a/receiver/hostmetricsreceiver/internal/scraper/diskscraper/factory_test.go +++ b/receiver/hostmetricsreceiver/internal/scraper/diskscraper/factory_test.go @@ -19,7 +19,7 @@ import ( "testing" "github.com/stretchr/testify/assert" - "go.opentelemetry.io/collector/component/componenttest" + "go.opentelemetry.io/collector/receiver/receivertest" ) func TestCreateDefaultConfig(t *testing.T) { @@ -32,7 +32,7 @@ func TestCreateMetricsScraper(t *testing.T) { factory := &Factory{} cfg := &Config{} - scraper, err := factory.CreateMetricsScraper(context.Background(), componenttest.NewNopReceiverCreateSettings(), cfg) + scraper, err := factory.CreateMetricsScraper(context.Background(), receivertest.NewNopCreateSettings(), cfg) assert.NoError(t, err) assert.NotNil(t, scraper) @@ -42,7 +42,7 @@ func TestCreateMetricsScraper_Error(t *testing.T) { factory := &Factory{} cfg := &Config{Include: MatchConfig{Devices: []string{""}}} - _, err := factory.CreateMetricsScraper(context.Background(), componenttest.NewNopReceiverCreateSettings(), cfg) + _, err := factory.CreateMetricsScraper(context.Background(), receivertest.NewNopCreateSettings(), cfg) assert.Error(t, err) } diff --git a/receiver/hostmetricsreceiver/internal/scraper/diskscraper/internal/metadata/generated_metrics.go b/receiver/hostmetricsreceiver/internal/scraper/diskscraper/internal/metadata/generated_metrics.go index f12d90f4fedac..365a9a776c2ab 100644 --- a/receiver/hostmetricsreceiver/internal/scraper/diskscraper/internal/metadata/generated_metrics.go +++ b/receiver/hostmetricsreceiver/internal/scraper/diskscraper/internal/metadata/generated_metrics.go @@ -9,6 +9,7 @@ import ( "go.opentelemetry.io/collector/confmap" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" + "go.opentelemetry.io/collector/receiver" conventions "go.opentelemetry.io/collector/semconv/v1.9.0" ) @@ -501,7 +502,7 @@ func WithStartTime(startTime pcommon.Timestamp) metricBuilderOption { } } -func NewMetricsBuilder(ms MetricsSettings, settings component.ReceiverCreateSettings, options ...metricBuilderOption) *MetricsBuilder { +func NewMetricsBuilder(ms MetricsSettings, settings receiver.CreateSettings, options ...metricBuilderOption) *MetricsBuilder { mb := &MetricsBuilder{ startTime: pcommon.NewTimestampFromTime(time.Now()), metricsBuffer: pmetric.NewMetrics(), diff --git a/receiver/hostmetricsreceiver/internal/scraper/diskscraper/internal/metadata/generated_metrics_test.go b/receiver/hostmetricsreceiver/internal/scraper/diskscraper/internal/metadata/generated_metrics_test.go index 5325da42e65de..41d5d6c4cf91a 100644 --- a/receiver/hostmetricsreceiver/internal/scraper/diskscraper/internal/metadata/generated_metrics_test.go +++ b/receiver/hostmetricsreceiver/internal/scraper/diskscraper/internal/metadata/generated_metrics_test.go @@ -7,9 +7,9 @@ import ( "testing" "github.com/stretchr/testify/assert" - "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" + "go.opentelemetry.io/collector/receiver/receivertest" "go.uber.org/zap" "go.uber.org/zap/zaptest/observer" ) @@ -17,7 +17,7 @@ import ( func TestDefaultMetrics(t *testing.T) { start := pcommon.Timestamp(1_000_000_000) ts := pcommon.Timestamp(1_000_001_000) - mb := NewMetricsBuilder(DefaultMetricsSettings(), componenttest.NewNopReceiverCreateSettings(), WithStartTime(start)) + mb := NewMetricsBuilder(DefaultMetricsSettings(), receivertest.NewNopCreateSettings(), WithStartTime(start)) enabledMetrics := make(map[string]bool) enabledMetrics["system.disk.io"] = true @@ -69,7 +69,7 @@ func TestAllMetrics(t *testing.T) { SystemDiskWeightedIoTime: MetricSettings{Enabled: true}, } observedZapCore, observedLogs := observer.New(zap.WarnLevel) - settings := componenttest.NewNopReceiverCreateSettings() + settings := receivertest.NewNopCreateSettings() settings.Logger = zap.New(observedZapCore) mb := NewMetricsBuilder(metricsSettings, settings, WithStartTime(start)) @@ -239,7 +239,7 @@ func TestNoMetrics(t *testing.T) { SystemDiskWeightedIoTime: MetricSettings{Enabled: false}, } observedZapCore, observedLogs := observer.New(zap.WarnLevel) - settings := componenttest.NewNopReceiverCreateSettings() + settings := receivertest.NewNopCreateSettings() settings.Logger = zap.New(observedZapCore) mb := NewMetricsBuilder(metricsSettings, settings, WithStartTime(start)) diff --git a/receiver/hostmetricsreceiver/internal/scraper/filesystemscraper/factory.go b/receiver/hostmetricsreceiver/internal/scraper/filesystemscraper/factory.go index c44ed20be29df..68d1de7503d6a 100644 --- a/receiver/hostmetricsreceiver/internal/scraper/filesystemscraper/factory.go +++ b/receiver/hostmetricsreceiver/internal/scraper/filesystemscraper/factory.go @@ -17,7 +17,7 @@ package filesystemscraper // import "github.com/open-telemetry/opentelemetry-col import ( "context" - "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/receiver" "go.opentelemetry.io/collector/receiver/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver/internal" @@ -50,7 +50,7 @@ func (f *Factory) CreateDefaultConfig() internal.Config { // CreateMetricsScraper creates a scraper based on provided config. func (f *Factory) CreateMetricsScraper( ctx context.Context, - settings component.ReceiverCreateSettings, + settings receiver.CreateSettings, config internal.Config, ) (scraperhelper.Scraper, error) { cfg := config.(*Config) diff --git a/receiver/hostmetricsreceiver/internal/scraper/filesystemscraper/factory_test.go b/receiver/hostmetricsreceiver/internal/scraper/filesystemscraper/factory_test.go index 9ce5ca76e519a..07b00d0a4726e 100644 --- a/receiver/hostmetricsreceiver/internal/scraper/filesystemscraper/factory_test.go +++ b/receiver/hostmetricsreceiver/internal/scraper/filesystemscraper/factory_test.go @@ -19,7 +19,7 @@ import ( "testing" "github.com/stretchr/testify/assert" - "go.opentelemetry.io/collector/component/componenttest" + "go.opentelemetry.io/collector/receiver/receivertest" ) func TestCreateDefaultConfig(t *testing.T) { @@ -32,7 +32,7 @@ func TestCreateMetricsScraper(t *testing.T) { factory := &Factory{} cfg := &Config{} - scraper, err := factory.CreateMetricsScraper(context.Background(), componenttest.NewNopReceiverCreateSettings(), cfg) + scraper, err := factory.CreateMetricsScraper(context.Background(), receivertest.NewNopCreateSettings(), cfg) assert.NoError(t, err) assert.NotNil(t, scraper) @@ -42,7 +42,7 @@ func TestCreateMetricsScraper_Error(t *testing.T) { factory := &Factory{} cfg := &Config{IncludeDevices: DeviceMatchConfig{Devices: []string{""}}} - _, err := factory.CreateMetricsScraper(context.Background(), componenttest.NewNopReceiverCreateSettings(), cfg) + _, err := factory.CreateMetricsScraper(context.Background(), receivertest.NewNopCreateSettings(), cfg) assert.Error(t, err) } diff --git a/receiver/hostmetricsreceiver/internal/scraper/filesystemscraper/filesystem_scraper.go b/receiver/hostmetricsreceiver/internal/scraper/filesystemscraper/filesystem_scraper.go index 5b96ce0a674af..aa2d88f2e2268 100644 --- a/receiver/hostmetricsreceiver/internal/scraper/filesystemscraper/filesystem_scraper.go +++ b/receiver/hostmetricsreceiver/internal/scraper/filesystemscraper/filesystem_scraper.go @@ -25,6 +25,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" + "go.opentelemetry.io/collector/receiver" "go.opentelemetry.io/collector/receiver/scrapererror" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver/internal/scraper/filesystemscraper/internal/metadata" @@ -37,7 +38,7 @@ const ( // scraper for FileSystem Metrics type scraper struct { - settings component.ReceiverCreateSettings + settings receiver.CreateSettings config *Config mb *metadata.MetricsBuilder fsFilter fsFilter @@ -54,7 +55,7 @@ type deviceUsage struct { } // newFileSystemScraper creates a FileSystem Scraper -func newFileSystemScraper(_ context.Context, settings component.ReceiverCreateSettings, cfg *Config) (*scraper, error) { +func newFileSystemScraper(_ context.Context, settings receiver.CreateSettings, cfg *Config) (*scraper, error) { fsFilter, err := cfg.createFilter() if err != nil { return nil, err diff --git a/receiver/hostmetricsreceiver/internal/scraper/filesystemscraper/filesystem_scraper_test.go b/receiver/hostmetricsreceiver/internal/scraper/filesystemscraper/filesystem_scraper_test.go index 2823a2fe48a7e..58a5ce6d5229f 100644 --- a/receiver/hostmetricsreceiver/internal/scraper/filesystemscraper/filesystem_scraper_test.go +++ b/receiver/hostmetricsreceiver/internal/scraper/filesystemscraper/filesystem_scraper_test.go @@ -28,6 +28,7 @@ import ( "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" + "go.opentelemetry.io/collector/receiver/receivertest" "go.opentelemetry.io/collector/receiver/scrapererror" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/filter/filterset" @@ -326,7 +327,7 @@ func TestScrape(t *testing.T) { t.Run(test.name, func(t *testing.T) { t.Parallel() test.config.SetRootPath(test.rootPath) - scraper, err := newFileSystemScraper(context.Background(), componenttest.NewNopReceiverCreateSettings(), &test.config) + scraper, err := newFileSystemScraper(context.Background(), receivertest.NewNopCreateSettings(), &test.config) if test.newErrRegex != "" { require.Error(t, err) require.Regexp(t, test.newErrRegex, err) diff --git a/receiver/hostmetricsreceiver/internal/scraper/filesystemscraper/internal/metadata/generated_metrics.go b/receiver/hostmetricsreceiver/internal/scraper/filesystemscraper/internal/metadata/generated_metrics.go index 75f443cd29813..8801603b00ecd 100644 --- a/receiver/hostmetricsreceiver/internal/scraper/filesystemscraper/internal/metadata/generated_metrics.go +++ b/receiver/hostmetricsreceiver/internal/scraper/filesystemscraper/internal/metadata/generated_metrics.go @@ -9,6 +9,7 @@ import ( "go.opentelemetry.io/collector/confmap" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" + "go.opentelemetry.io/collector/receiver" conventions "go.opentelemetry.io/collector/semconv/v1.9.0" ) @@ -278,7 +279,7 @@ func WithStartTime(startTime pcommon.Timestamp) metricBuilderOption { } } -func NewMetricsBuilder(ms MetricsSettings, settings component.ReceiverCreateSettings, options ...metricBuilderOption) *MetricsBuilder { +func NewMetricsBuilder(ms MetricsSettings, settings receiver.CreateSettings, options ...metricBuilderOption) *MetricsBuilder { mb := &MetricsBuilder{ startTime: pcommon.NewTimestampFromTime(time.Now()), metricsBuffer: pmetric.NewMetrics(), diff --git a/receiver/hostmetricsreceiver/internal/scraper/filesystemscraper/internal/metadata/generated_metrics_test.go b/receiver/hostmetricsreceiver/internal/scraper/filesystemscraper/internal/metadata/generated_metrics_test.go index b487e97707e91..242760496315e 100644 --- a/receiver/hostmetricsreceiver/internal/scraper/filesystemscraper/internal/metadata/generated_metrics_test.go +++ b/receiver/hostmetricsreceiver/internal/scraper/filesystemscraper/internal/metadata/generated_metrics_test.go @@ -7,9 +7,9 @@ import ( "testing" "github.com/stretchr/testify/assert" - "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" + "go.opentelemetry.io/collector/receiver/receivertest" "go.uber.org/zap" "go.uber.org/zap/zaptest/observer" ) @@ -17,7 +17,7 @@ import ( func TestDefaultMetrics(t *testing.T) { start := pcommon.Timestamp(1_000_000_000) ts := pcommon.Timestamp(1_000_001_000) - mb := NewMetricsBuilder(DefaultMetricsSettings(), componenttest.NewNopReceiverCreateSettings(), WithStartTime(start)) + mb := NewMetricsBuilder(DefaultMetricsSettings(), receivertest.NewNopCreateSettings(), WithStartTime(start)) enabledMetrics := make(map[string]bool) enabledMetrics["system.filesystem.inodes.usage"] = true @@ -52,7 +52,7 @@ func TestAllMetrics(t *testing.T) { SystemFilesystemUtilization: MetricSettings{Enabled: true}, } observedZapCore, observedLogs := observer.New(zap.WarnLevel) - settings := componenttest.NewNopReceiverCreateSettings() + settings := receivertest.NewNopCreateSettings() settings.Logger = zap.New(observedZapCore) mb := NewMetricsBuilder(metricsSettings, settings, WithStartTime(start)) @@ -169,7 +169,7 @@ func TestNoMetrics(t *testing.T) { SystemFilesystemUtilization: MetricSettings{Enabled: false}, } observedZapCore, observedLogs := observer.New(zap.WarnLevel) - settings := componenttest.NewNopReceiverCreateSettings() + settings := receivertest.NewNopCreateSettings() settings.Logger = zap.New(observedZapCore) mb := NewMetricsBuilder(metricsSettings, settings, WithStartTime(start)) diff --git a/receiver/hostmetricsreceiver/internal/scraper/loadscraper/factory.go b/receiver/hostmetricsreceiver/internal/scraper/loadscraper/factory.go index d6a590e512517..2138315e82960 100644 --- a/receiver/hostmetricsreceiver/internal/scraper/loadscraper/factory.go +++ b/receiver/hostmetricsreceiver/internal/scraper/loadscraper/factory.go @@ -17,7 +17,7 @@ package loadscraper // import "github.com/open-telemetry/opentelemetry-collector import ( "context" - "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/receiver" "go.opentelemetry.io/collector/receiver/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver/internal" @@ -45,7 +45,7 @@ func (f *Factory) CreateDefaultConfig() internal.Config { // CreateMetricsScraper creates a scraper based on provided config. func (f *Factory) CreateMetricsScraper( ctx context.Context, - settings component.ReceiverCreateSettings, + settings receiver.CreateSettings, config internal.Config, ) (scraperhelper.Scraper, error) { cfg := config.(*Config) diff --git a/receiver/hostmetricsreceiver/internal/scraper/loadscraper/factory_test.go b/receiver/hostmetricsreceiver/internal/scraper/loadscraper/factory_test.go index eadf0eb7eb781..164e9e0bb30c7 100644 --- a/receiver/hostmetricsreceiver/internal/scraper/loadscraper/factory_test.go +++ b/receiver/hostmetricsreceiver/internal/scraper/loadscraper/factory_test.go @@ -19,7 +19,7 @@ import ( "testing" "github.com/stretchr/testify/assert" - "go.opentelemetry.io/collector/component/componenttest" + "go.opentelemetry.io/collector/receiver/receivertest" ) func TestCreateDefaultConfig(t *testing.T) { @@ -32,7 +32,7 @@ func TestCreateMetricsScraper(t *testing.T) { factory := &Factory{} cfg := &Config{} - scraper, err := factory.CreateMetricsScraper(context.Background(), componenttest.NewNopReceiverCreateSettings(), cfg) + scraper, err := factory.CreateMetricsScraper(context.Background(), receivertest.NewNopCreateSettings(), cfg) assert.NoError(t, err) assert.NotNil(t, scraper) diff --git a/receiver/hostmetricsreceiver/internal/scraper/loadscraper/internal/metadata/generated_metrics.go b/receiver/hostmetricsreceiver/internal/scraper/loadscraper/internal/metadata/generated_metrics.go index 6bb300fe84f50..7483ce6706395 100644 --- a/receiver/hostmetricsreceiver/internal/scraper/loadscraper/internal/metadata/generated_metrics.go +++ b/receiver/hostmetricsreceiver/internal/scraper/loadscraper/internal/metadata/generated_metrics.go @@ -9,6 +9,7 @@ import ( "go.opentelemetry.io/collector/confmap" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" + "go.opentelemetry.io/collector/receiver" conventions "go.opentelemetry.io/collector/semconv/v1.9.0" ) @@ -227,7 +228,7 @@ func WithStartTime(startTime pcommon.Timestamp) metricBuilderOption { } } -func NewMetricsBuilder(ms MetricsSettings, settings component.ReceiverCreateSettings, options ...metricBuilderOption) *MetricsBuilder { +func NewMetricsBuilder(ms MetricsSettings, settings receiver.CreateSettings, options ...metricBuilderOption) *MetricsBuilder { mb := &MetricsBuilder{ startTime: pcommon.NewTimestampFromTime(time.Now()), metricsBuffer: pmetric.NewMetrics(), diff --git a/receiver/hostmetricsreceiver/internal/scraper/loadscraper/internal/metadata/generated_metrics_test.go b/receiver/hostmetricsreceiver/internal/scraper/loadscraper/internal/metadata/generated_metrics_test.go index 460d8573b0756..b7bd4e18330f1 100644 --- a/receiver/hostmetricsreceiver/internal/scraper/loadscraper/internal/metadata/generated_metrics_test.go +++ b/receiver/hostmetricsreceiver/internal/scraper/loadscraper/internal/metadata/generated_metrics_test.go @@ -7,9 +7,9 @@ import ( "testing" "github.com/stretchr/testify/assert" - "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" + "go.opentelemetry.io/collector/receiver/receivertest" "go.uber.org/zap" "go.uber.org/zap/zaptest/observer" ) @@ -17,7 +17,7 @@ import ( func TestDefaultMetrics(t *testing.T) { start := pcommon.Timestamp(1_000_000_000) ts := pcommon.Timestamp(1_000_001_000) - mb := NewMetricsBuilder(DefaultMetricsSettings(), componenttest.NewNopReceiverCreateSettings(), WithStartTime(start)) + mb := NewMetricsBuilder(DefaultMetricsSettings(), receivertest.NewNopCreateSettings(), WithStartTime(start)) enabledMetrics := make(map[string]bool) enabledMetrics["system.cpu.load_average.15m"] = true @@ -53,7 +53,7 @@ func TestAllMetrics(t *testing.T) { SystemCPULoadAverage5m: MetricSettings{Enabled: true}, } observedZapCore, observedLogs := observer.New(zap.WarnLevel) - settings := componenttest.NewNopReceiverCreateSettings() + settings := receivertest.NewNopCreateSettings() settings.Logger = zap.New(observedZapCore) mb := NewMetricsBuilder(metricsSettings, settings, WithStartTime(start)) @@ -124,7 +124,7 @@ func TestNoMetrics(t *testing.T) { SystemCPULoadAverage5m: MetricSettings{Enabled: false}, } observedZapCore, observedLogs := observer.New(zap.WarnLevel) - settings := componenttest.NewNopReceiverCreateSettings() + settings := receivertest.NewNopCreateSettings() settings.Logger = zap.New(observedZapCore) mb := NewMetricsBuilder(metricsSettings, settings, WithStartTime(start)) diff --git a/receiver/hostmetricsreceiver/internal/scraper/loadscraper/load_scraper.go b/receiver/hostmetricsreceiver/internal/scraper/loadscraper/load_scraper.go index d97748fe96a69..a9bbb4e97e407 100644 --- a/receiver/hostmetricsreceiver/internal/scraper/loadscraper/load_scraper.go +++ b/receiver/hostmetricsreceiver/internal/scraper/loadscraper/load_scraper.go @@ -25,6 +25,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" + "go.opentelemetry.io/collector/receiver" "go.opentelemetry.io/collector/receiver/scrapererror" "go.uber.org/zap" @@ -36,7 +37,7 @@ const metricsLen = 3 // scraper for Load Metrics type scraper struct { - settings component.ReceiverCreateSettings + settings receiver.CreateSettings config *Config mb *metadata.MetricsBuilder skipScrape bool @@ -47,7 +48,7 @@ type scraper struct { } // newLoadScraper creates a set of Load related metrics -func newLoadScraper(_ context.Context, settings component.ReceiverCreateSettings, cfg *Config) *scraper { +func newLoadScraper(_ context.Context, settings receiver.CreateSettings, cfg *Config) *scraper { return &scraper{settings: settings, config: cfg, bootTime: host.BootTime, load: getSampledLoadAverages} } diff --git a/receiver/hostmetricsreceiver/internal/scraper/loadscraper/load_scraper_test.go b/receiver/hostmetricsreceiver/internal/scraper/loadscraper/load_scraper_test.go index 2d22b8ec5a2a6..8aea922c61a08 100644 --- a/receiver/hostmetricsreceiver/internal/scraper/loadscraper/load_scraper_test.go +++ b/receiver/hostmetricsreceiver/internal/scraper/loadscraper/load_scraper_test.go @@ -25,6 +25,7 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/pdata/pmetric" + "go.opentelemetry.io/collector/receiver/receivertest" "go.opentelemetry.io/collector/receiver/scrapererror" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver/internal" @@ -83,7 +84,7 @@ func TestScrape(t *testing.T) { for _, test := range testCases { t.Run(test.name, func(t *testing.T) { - scraper := newLoadScraper(context.Background(), componenttest.NewNopReceiverCreateSettings(), test.config) + scraper := newLoadScraper(context.Background(), receivertest.NewNopCreateSettings(), test.config) if test.loadFunc != nil { scraper.load = test.loadFunc } diff --git a/receiver/hostmetricsreceiver/internal/scraper/memoryscraper/factory.go b/receiver/hostmetricsreceiver/internal/scraper/memoryscraper/factory.go index ef75eb2986f1b..de00976c1e7f8 100644 --- a/receiver/hostmetricsreceiver/internal/scraper/memoryscraper/factory.go +++ b/receiver/hostmetricsreceiver/internal/scraper/memoryscraper/factory.go @@ -17,7 +17,7 @@ package memoryscraper // import "github.com/open-telemetry/opentelemetry-collect import ( "context" - "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/receiver" "go.opentelemetry.io/collector/receiver/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver/internal" @@ -45,7 +45,7 @@ func (f *Factory) CreateDefaultConfig() internal.Config { // CreateMetricsScraper creates a scraper based on provided config. func (f *Factory) CreateMetricsScraper( ctx context.Context, - settings component.ReceiverCreateSettings, + settings receiver.CreateSettings, config internal.Config, ) (scraperhelper.Scraper, error) { cfg := config.(*Config) diff --git a/receiver/hostmetricsreceiver/internal/scraper/memoryscraper/factory_test.go b/receiver/hostmetricsreceiver/internal/scraper/memoryscraper/factory_test.go index 77321b6a330af..2621dce26f4f4 100644 --- a/receiver/hostmetricsreceiver/internal/scraper/memoryscraper/factory_test.go +++ b/receiver/hostmetricsreceiver/internal/scraper/memoryscraper/factory_test.go @@ -19,7 +19,7 @@ import ( "testing" "github.com/stretchr/testify/assert" - "go.opentelemetry.io/collector/component/componenttest" + "go.opentelemetry.io/collector/receiver/receivertest" ) func TestCreateDefaultConfig(t *testing.T) { @@ -32,7 +32,7 @@ func TestCreateMetricsScraper(t *testing.T) { factory := &Factory{} cfg := &Config{} - scraper, err := factory.CreateMetricsScraper(context.Background(), componenttest.NewNopReceiverCreateSettings(), cfg) + scraper, err := factory.CreateMetricsScraper(context.Background(), receivertest.NewNopCreateSettings(), cfg) assert.NoError(t, err) assert.NotNil(t, scraper) diff --git a/receiver/hostmetricsreceiver/internal/scraper/memoryscraper/internal/metadata/generated_metrics.go b/receiver/hostmetricsreceiver/internal/scraper/memoryscraper/internal/metadata/generated_metrics.go index ed156c84fb3bc..31d3ec9268b97 100644 --- a/receiver/hostmetricsreceiver/internal/scraper/memoryscraper/internal/metadata/generated_metrics.go +++ b/receiver/hostmetricsreceiver/internal/scraper/memoryscraper/internal/metadata/generated_metrics.go @@ -9,6 +9,7 @@ import ( "go.opentelemetry.io/collector/confmap" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" + "go.opentelemetry.io/collector/receiver" conventions "go.opentelemetry.io/collector/semconv/v1.9.0" ) @@ -225,7 +226,7 @@ func WithStartTime(startTime pcommon.Timestamp) metricBuilderOption { } } -func NewMetricsBuilder(ms MetricsSettings, settings component.ReceiverCreateSettings, options ...metricBuilderOption) *MetricsBuilder { +func NewMetricsBuilder(ms MetricsSettings, settings receiver.CreateSettings, options ...metricBuilderOption) *MetricsBuilder { mb := &MetricsBuilder{ startTime: pcommon.NewTimestampFromTime(time.Now()), metricsBuffer: pmetric.NewMetrics(), diff --git a/receiver/hostmetricsreceiver/internal/scraper/memoryscraper/internal/metadata/generated_metrics_test.go b/receiver/hostmetricsreceiver/internal/scraper/memoryscraper/internal/metadata/generated_metrics_test.go index b89e5cd78fe4c..b443efa35b0e4 100644 --- a/receiver/hostmetricsreceiver/internal/scraper/memoryscraper/internal/metadata/generated_metrics_test.go +++ b/receiver/hostmetricsreceiver/internal/scraper/memoryscraper/internal/metadata/generated_metrics_test.go @@ -7,9 +7,9 @@ import ( "testing" "github.com/stretchr/testify/assert" - "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" + "go.opentelemetry.io/collector/receiver/receivertest" "go.uber.org/zap" "go.uber.org/zap/zaptest/observer" ) @@ -17,7 +17,7 @@ import ( func TestDefaultMetrics(t *testing.T) { start := pcommon.Timestamp(1_000_000_000) ts := pcommon.Timestamp(1_000_001_000) - mb := NewMetricsBuilder(DefaultMetricsSettings(), componenttest.NewNopReceiverCreateSettings(), WithStartTime(start)) + mb := NewMetricsBuilder(DefaultMetricsSettings(), receivertest.NewNopCreateSettings(), WithStartTime(start)) enabledMetrics := make(map[string]bool) enabledMetrics["system.memory.usage"] = true @@ -48,7 +48,7 @@ func TestAllMetrics(t *testing.T) { SystemMemoryUtilization: MetricSettings{Enabled: true}, } observedZapCore, observedLogs := observer.New(zap.WarnLevel) - settings := componenttest.NewNopReceiverCreateSettings() + settings := receivertest.NewNopCreateSettings() settings.Logger = zap.New(observedZapCore) mb := NewMetricsBuilder(metricsSettings, settings, WithStartTime(start)) @@ -114,7 +114,7 @@ func TestNoMetrics(t *testing.T) { SystemMemoryUtilization: MetricSettings{Enabled: false}, } observedZapCore, observedLogs := observer.New(zap.WarnLevel) - settings := componenttest.NewNopReceiverCreateSettings() + settings := receivertest.NewNopCreateSettings() settings.Logger = zap.New(observedZapCore) mb := NewMetricsBuilder(metricsSettings, settings, WithStartTime(start)) diff --git a/receiver/hostmetricsreceiver/internal/scraper/memoryscraper/memory_scraper.go b/receiver/hostmetricsreceiver/internal/scraper/memoryscraper/memory_scraper.go index 641a4896f3edd..bc24aa0b050b8 100644 --- a/receiver/hostmetricsreceiver/internal/scraper/memoryscraper/memory_scraper.go +++ b/receiver/hostmetricsreceiver/internal/scraper/memoryscraper/memory_scraper.go @@ -25,6 +25,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" + "go.opentelemetry.io/collector/receiver" "go.opentelemetry.io/collector/receiver/scrapererror" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver/internal/scraper/memoryscraper/internal/metadata" @@ -36,7 +37,7 @@ var ErrInvalidTotalMem = errors.New("invalid total memory") // scraper for Memory Metrics type scraper struct { - settings component.ReceiverCreateSettings + settings receiver.CreateSettings config *Config mb *metadata.MetricsBuilder @@ -46,7 +47,7 @@ type scraper struct { } // newMemoryScraper creates a Memory Scraper -func newMemoryScraper(_ context.Context, settings component.ReceiverCreateSettings, cfg *Config) *scraper { +func newMemoryScraper(_ context.Context, settings receiver.CreateSettings, cfg *Config) *scraper { return &scraper{settings: settings, config: cfg, bootTime: host.BootTime, virtualMemory: mem.VirtualMemory} } diff --git a/receiver/hostmetricsreceiver/internal/scraper/memoryscraper/memory_scraper_test.go b/receiver/hostmetricsreceiver/internal/scraper/memoryscraper/memory_scraper_test.go index 1cd332b3ba0d5..56cb25b6b6cc1 100644 --- a/receiver/hostmetricsreceiver/internal/scraper/memoryscraper/memory_scraper_test.go +++ b/receiver/hostmetricsreceiver/internal/scraper/memoryscraper/memory_scraper_test.go @@ -26,6 +26,7 @@ import ( "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" + "go.opentelemetry.io/collector/receiver/receivertest" "go.opentelemetry.io/collector/receiver/scrapererror" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver/internal" @@ -87,7 +88,7 @@ func TestScrape(t *testing.T) { for _, test := range testCases { t.Run(test.name, func(t *testing.T) { - scraper := newMemoryScraper(context.Background(), componenttest.NewNopReceiverCreateSettings(), test.config) + scraper := newMemoryScraper(context.Background(), receivertest.NewNopCreateSettings(), test.config) if test.virtualMemoryFunc != nil { scraper.virtualMemory = test.virtualMemoryFunc } @@ -159,7 +160,7 @@ func TestScrape_MemoryUtilization(t *testing.T) { }, }, } - scraper := newMemoryScraper(context.Background(), componenttest.NewNopReceiverCreateSettings(), &scraperConfig) + scraper := newMemoryScraper(context.Background(), receivertest.NewNopCreateSettings(), &scraperConfig) if test.virtualMemoryFunc != nil { scraper.virtualMemory = test.virtualMemoryFunc } diff --git a/receiver/hostmetricsreceiver/internal/scraper/networkscraper/factory.go b/receiver/hostmetricsreceiver/internal/scraper/networkscraper/factory.go index d320120438bc2..a68a32b77a3d1 100644 --- a/receiver/hostmetricsreceiver/internal/scraper/networkscraper/factory.go +++ b/receiver/hostmetricsreceiver/internal/scraper/networkscraper/factory.go @@ -17,7 +17,7 @@ package networkscraper // import "github.com/open-telemetry/opentelemetry-collec import ( "context" - "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/receiver" "go.opentelemetry.io/collector/receiver/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver/internal" @@ -45,7 +45,7 @@ func (f *Factory) CreateDefaultConfig() internal.Config { // CreateMetricsScraper creates a scraper based on provided config. func (f *Factory) CreateMetricsScraper( ctx context.Context, - settings component.ReceiverCreateSettings, + settings receiver.CreateSettings, config internal.Config, ) (scraperhelper.Scraper, error) { cfg := config.(*Config) diff --git a/receiver/hostmetricsreceiver/internal/scraper/networkscraper/factory_test.go b/receiver/hostmetricsreceiver/internal/scraper/networkscraper/factory_test.go index 77e2d84efcf66..5e85c27ac931d 100644 --- a/receiver/hostmetricsreceiver/internal/scraper/networkscraper/factory_test.go +++ b/receiver/hostmetricsreceiver/internal/scraper/networkscraper/factory_test.go @@ -19,7 +19,7 @@ import ( "testing" "github.com/stretchr/testify/assert" - "go.opentelemetry.io/collector/component/componenttest" + "go.opentelemetry.io/collector/receiver/receivertest" ) func TestCreateDefaultConfig(t *testing.T) { @@ -32,7 +32,7 @@ func TestCreateMetricsScraper(t *testing.T) { factory := &Factory{} cfg := &Config{} - scraper, err := factory.CreateMetricsScraper(context.Background(), componenttest.NewNopReceiverCreateSettings(), cfg) + scraper, err := factory.CreateMetricsScraper(context.Background(), receivertest.NewNopCreateSettings(), cfg) assert.NoError(t, err) assert.NotNil(t, scraper) @@ -42,7 +42,7 @@ func TestCreateMetricsScraper_Error(t *testing.T) { factory := &Factory{} cfg := &Config{Include: MatchConfig{Interfaces: []string{""}}} - _, err := factory.CreateMetricsScraper(context.Background(), componenttest.NewNopReceiverCreateSettings(), cfg) + _, err := factory.CreateMetricsScraper(context.Background(), receivertest.NewNopCreateSettings(), cfg) assert.Error(t, err) } diff --git a/receiver/hostmetricsreceiver/internal/scraper/networkscraper/internal/metadata/generated_metrics.go b/receiver/hostmetricsreceiver/internal/scraper/networkscraper/internal/metadata/generated_metrics.go index 3233dfe036c9c..c00550f152349 100644 --- a/receiver/hostmetricsreceiver/internal/scraper/networkscraper/internal/metadata/generated_metrics.go +++ b/receiver/hostmetricsreceiver/internal/scraper/networkscraper/internal/metadata/generated_metrics.go @@ -9,6 +9,7 @@ import ( "go.opentelemetry.io/collector/confmap" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" + "go.opentelemetry.io/collector/receiver" conventions "go.opentelemetry.io/collector/semconv/v1.9.0" ) @@ -520,7 +521,7 @@ func WithStartTime(startTime pcommon.Timestamp) metricBuilderOption { } } -func NewMetricsBuilder(ms MetricsSettings, settings component.ReceiverCreateSettings, options ...metricBuilderOption) *MetricsBuilder { +func NewMetricsBuilder(ms MetricsSettings, settings receiver.CreateSettings, options ...metricBuilderOption) *MetricsBuilder { mb := &MetricsBuilder{ startTime: pcommon.NewTimestampFromTime(time.Now()), metricsBuffer: pmetric.NewMetrics(), diff --git a/receiver/hostmetricsreceiver/internal/scraper/networkscraper/internal/metadata/generated_metrics_test.go b/receiver/hostmetricsreceiver/internal/scraper/networkscraper/internal/metadata/generated_metrics_test.go index 8edeba0c6efb6..9fc152faedbba 100644 --- a/receiver/hostmetricsreceiver/internal/scraper/networkscraper/internal/metadata/generated_metrics_test.go +++ b/receiver/hostmetricsreceiver/internal/scraper/networkscraper/internal/metadata/generated_metrics_test.go @@ -7,9 +7,9 @@ import ( "testing" "github.com/stretchr/testify/assert" - "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" + "go.opentelemetry.io/collector/receiver/receivertest" "go.uber.org/zap" "go.uber.org/zap/zaptest/observer" ) @@ -17,7 +17,7 @@ import ( func TestDefaultMetrics(t *testing.T) { start := pcommon.Timestamp(1_000_000_000) ts := pcommon.Timestamp(1_000_001_000) - mb := NewMetricsBuilder(DefaultMetricsSettings(), componenttest.NewNopReceiverCreateSettings(), WithStartTime(start)) + mb := NewMetricsBuilder(DefaultMetricsSettings(), receivertest.NewNopCreateSettings(), WithStartTime(start)) enabledMetrics := make(map[string]bool) enabledMetrics["system.network.connections"] = true @@ -67,7 +67,7 @@ func TestAllMetrics(t *testing.T) { SystemNetworkPackets: MetricSettings{Enabled: true}, } observedZapCore, observedLogs := observer.New(zap.WarnLevel) - settings := componenttest.NewNopReceiverCreateSettings() + settings := receivertest.NewNopCreateSettings() settings.Logger = zap.New(observedZapCore) mb := NewMetricsBuilder(metricsSettings, settings, WithStartTime(start)) @@ -234,7 +234,7 @@ func TestNoMetrics(t *testing.T) { SystemNetworkPackets: MetricSettings{Enabled: false}, } observedZapCore, observedLogs := observer.New(zap.WarnLevel) - settings := componenttest.NewNopReceiverCreateSettings() + settings := receivertest.NewNopCreateSettings() settings.Logger = zap.New(observedZapCore) mb := NewMetricsBuilder(metricsSettings, settings, WithStartTime(start)) diff --git a/receiver/hostmetricsreceiver/internal/scraper/networkscraper/network_scraper.go b/receiver/hostmetricsreceiver/internal/scraper/networkscraper/network_scraper.go index 322eef8e12e2a..e829b6f8c2b3a 100644 --- a/receiver/hostmetricsreceiver/internal/scraper/networkscraper/network_scraper.go +++ b/receiver/hostmetricsreceiver/internal/scraper/networkscraper/network_scraper.go @@ -24,6 +24,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" + "go.opentelemetry.io/collector/receiver" "go.opentelemetry.io/collector/receiver/scrapererror" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/filter/filterset" @@ -37,7 +38,7 @@ const ( // scraper for Network Metrics type scraper struct { - settings component.ReceiverCreateSettings + settings receiver.CreateSettings config *Config mb *metadata.MetricsBuilder startTime pcommon.Timestamp @@ -52,7 +53,7 @@ type scraper struct { } // newNetworkScraper creates a set of Network related metrics -func newNetworkScraper(_ context.Context, settings component.ReceiverCreateSettings, cfg *Config) (*scraper, error) { +func newNetworkScraper(_ context.Context, settings receiver.CreateSettings, cfg *Config) (*scraper, error) { scraper := &scraper{ settings: settings, config: cfg, diff --git a/receiver/hostmetricsreceiver/internal/scraper/networkscraper/network_scraper_test.go b/receiver/hostmetricsreceiver/internal/scraper/networkscraper/network_scraper_test.go index 1c69b7b8c90ed..02c0269d05966 100644 --- a/receiver/hostmetricsreceiver/internal/scraper/networkscraper/network_scraper_test.go +++ b/receiver/hostmetricsreceiver/internal/scraper/networkscraper/network_scraper_test.go @@ -25,6 +25,7 @@ import ( "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" + "go.opentelemetry.io/collector/receiver/receivertest" "go.opentelemetry.io/collector/receiver/scrapererror" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/filter/filterset" @@ -126,7 +127,7 @@ func TestScrape(t *testing.T) { for _, test := range testCases { t.Run(test.name, func(t *testing.T) { - scraper, err := newNetworkScraper(context.Background(), componenttest.NewNopReceiverCreateSettings(), &test.config) + scraper, err := newNetworkScraper(context.Background(), receivertest.NewNopCreateSettings(), &test.config) if test.mutateScraper != nil { test.mutateScraper(scraper) } diff --git a/receiver/hostmetricsreceiver/internal/scraper/pagingscraper/factory.go b/receiver/hostmetricsreceiver/internal/scraper/pagingscraper/factory.go index 94307d9859724..652c6c291b459 100644 --- a/receiver/hostmetricsreceiver/internal/scraper/pagingscraper/factory.go +++ b/receiver/hostmetricsreceiver/internal/scraper/pagingscraper/factory.go @@ -17,7 +17,7 @@ package pagingscraper // import "github.com/open-telemetry/opentelemetry-collect import ( "context" - "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/receiver" "go.opentelemetry.io/collector/receiver/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver/internal" @@ -45,7 +45,7 @@ func (f *Factory) CreateDefaultConfig() internal.Config { // CreateMetricsScraper creates a scraper based on provided config. func (f *Factory) CreateMetricsScraper( ctx context.Context, - settings component.ReceiverCreateSettings, + settings receiver.CreateSettings, config internal.Config, ) (scraperhelper.Scraper, error) { cfg := config.(*Config) diff --git a/receiver/hostmetricsreceiver/internal/scraper/pagingscraper/factory_test.go b/receiver/hostmetricsreceiver/internal/scraper/pagingscraper/factory_test.go index 5e578ccafe010..d1ec028913020 100644 --- a/receiver/hostmetricsreceiver/internal/scraper/pagingscraper/factory_test.go +++ b/receiver/hostmetricsreceiver/internal/scraper/pagingscraper/factory_test.go @@ -19,7 +19,7 @@ import ( "testing" "github.com/stretchr/testify/assert" - "go.opentelemetry.io/collector/component/componenttest" + "go.opentelemetry.io/collector/receiver/receivertest" ) func TestCreateDefaultConfig(t *testing.T) { @@ -32,7 +32,7 @@ func TestCreateMetricsScraper(t *testing.T) { factory := &Factory{} cfg := &Config{} - scraper, err := factory.CreateMetricsScraper(context.Background(), componenttest.NewNopReceiverCreateSettings(), cfg) + scraper, err := factory.CreateMetricsScraper(context.Background(), receivertest.NewNopCreateSettings(), cfg) assert.NoError(t, err) assert.NotNil(t, scraper) } diff --git a/receiver/hostmetricsreceiver/internal/scraper/pagingscraper/internal/metadata/generated_metrics.go b/receiver/hostmetricsreceiver/internal/scraper/pagingscraper/internal/metadata/generated_metrics.go index d800b554f3e79..0ae4f5a2ad1ce 100644 --- a/receiver/hostmetricsreceiver/internal/scraper/pagingscraper/internal/metadata/generated_metrics.go +++ b/receiver/hostmetricsreceiver/internal/scraper/pagingscraper/internal/metadata/generated_metrics.go @@ -9,6 +9,7 @@ import ( "go.opentelemetry.io/collector/confmap" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" + "go.opentelemetry.io/collector/receiver" conventions "go.opentelemetry.io/collector/semconv/v1.9.0" ) @@ -380,7 +381,7 @@ func WithStartTime(startTime pcommon.Timestamp) metricBuilderOption { } } -func NewMetricsBuilder(ms MetricsSettings, settings component.ReceiverCreateSettings, options ...metricBuilderOption) *MetricsBuilder { +func NewMetricsBuilder(ms MetricsSettings, settings receiver.CreateSettings, options ...metricBuilderOption) *MetricsBuilder { mb := &MetricsBuilder{ startTime: pcommon.NewTimestampFromTime(time.Now()), metricsBuffer: pmetric.NewMetrics(), diff --git a/receiver/hostmetricsreceiver/internal/scraper/pagingscraper/internal/metadata/generated_metrics_test.go b/receiver/hostmetricsreceiver/internal/scraper/pagingscraper/internal/metadata/generated_metrics_test.go index aa148037bf31b..712e0ed62b49b 100644 --- a/receiver/hostmetricsreceiver/internal/scraper/pagingscraper/internal/metadata/generated_metrics_test.go +++ b/receiver/hostmetricsreceiver/internal/scraper/pagingscraper/internal/metadata/generated_metrics_test.go @@ -7,9 +7,9 @@ import ( "testing" "github.com/stretchr/testify/assert" - "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" + "go.opentelemetry.io/collector/receiver/receivertest" "go.uber.org/zap" "go.uber.org/zap/zaptest/observer" ) @@ -17,7 +17,7 @@ import ( func TestDefaultMetrics(t *testing.T) { start := pcommon.Timestamp(1_000_000_000) ts := pcommon.Timestamp(1_000_001_000) - mb := NewMetricsBuilder(DefaultMetricsSettings(), componenttest.NewNopReceiverCreateSettings(), WithStartTime(start)) + mb := NewMetricsBuilder(DefaultMetricsSettings(), receivertest.NewNopCreateSettings(), WithStartTime(start)) enabledMetrics := make(map[string]bool) enabledMetrics["system.paging.faults"] = true @@ -56,7 +56,7 @@ func TestAllMetrics(t *testing.T) { SystemPagingUtilization: MetricSettings{Enabled: true}, } observedZapCore, observedLogs := observer.New(zap.WarnLevel) - settings := componenttest.NewNopReceiverCreateSettings() + settings := receivertest.NewNopCreateSettings() settings.Logger = zap.New(observedZapCore) mb := NewMetricsBuilder(metricsSettings, settings, WithStartTime(start)) @@ -167,7 +167,7 @@ func TestNoMetrics(t *testing.T) { SystemPagingUtilization: MetricSettings{Enabled: false}, } observedZapCore, observedLogs := observer.New(zap.WarnLevel) - settings := componenttest.NewNopReceiverCreateSettings() + settings := receivertest.NewNopCreateSettings() settings.Logger = zap.New(observedZapCore) mb := NewMetricsBuilder(metricsSettings, settings, WithStartTime(start)) diff --git a/receiver/hostmetricsreceiver/internal/scraper/pagingscraper/paging_scraper_others.go b/receiver/hostmetricsreceiver/internal/scraper/pagingscraper/paging_scraper_others.go index 0848d76eaaacd..61c39b90b93c3 100644 --- a/receiver/hostmetricsreceiver/internal/scraper/pagingscraper/paging_scraper_others.go +++ b/receiver/hostmetricsreceiver/internal/scraper/pagingscraper/paging_scraper_others.go @@ -27,6 +27,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" + "go.opentelemetry.io/collector/receiver" "go.opentelemetry.io/collector/receiver/scrapererror" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver/internal/scraper/pagingscraper/internal/metadata" @@ -39,7 +40,7 @@ const ( // scraper for Paging Metrics type scraper struct { - settings component.ReceiverCreateSettings + settings receiver.CreateSettings config *Config mb *metadata.MetricsBuilder @@ -50,7 +51,7 @@ type scraper struct { } // newPagingScraper creates a Paging Scraper -func newPagingScraper(_ context.Context, settings component.ReceiverCreateSettings, cfg *Config) *scraper { +func newPagingScraper(_ context.Context, settings receiver.CreateSettings, cfg *Config) *scraper { return &scraper{ settings: settings, config: cfg, diff --git a/receiver/hostmetricsreceiver/internal/scraper/pagingscraper/paging_scraper_others_test.go b/receiver/hostmetricsreceiver/internal/scraper/pagingscraper/paging_scraper_others_test.go index e749965291635..1dbe8dc84675f 100644 --- a/receiver/hostmetricsreceiver/internal/scraper/pagingscraper/paging_scraper_others_test.go +++ b/receiver/hostmetricsreceiver/internal/scraper/pagingscraper/paging_scraper_others_test.go @@ -26,6 +26,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component/componenttest" + "go.opentelemetry.io/collector/receiver/receivertest" "go.opentelemetry.io/collector/receiver/scrapererror" ) @@ -62,7 +63,7 @@ func TestScrape_Errors(t *testing.T) { for _, test := range testCases { t.Run(test.name, func(t *testing.T) { - scraper := newPagingScraper(context.Background(), componenttest.NewNopReceiverCreateSettings(), &Config{}) + scraper := newPagingScraper(context.Background(), receivertest.NewNopCreateSettings(), &Config{}) if test.virtualMemoryFunc != nil { scraper.getPageFileStats = test.virtualMemoryFunc } diff --git a/receiver/hostmetricsreceiver/internal/scraper/pagingscraper/paging_scraper_test.go b/receiver/hostmetricsreceiver/internal/scraper/pagingscraper/paging_scraper_test.go index de91104aa2c2d..41dfd30aa11f6 100644 --- a/receiver/hostmetricsreceiver/internal/scraper/pagingscraper/paging_scraper_test.go +++ b/receiver/hostmetricsreceiver/internal/scraper/pagingscraper/paging_scraper_test.go @@ -25,6 +25,7 @@ import ( "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" + "go.opentelemetry.io/collector/receiver/receivertest" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver/internal" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver/internal/scraper/pagingscraper/internal/metadata" @@ -71,7 +72,7 @@ func TestScrape(t *testing.T) { for _, test := range testCases { t.Run(test.name, func(t *testing.T) { - scraper := newPagingScraper(context.Background(), componenttest.NewNopReceiverCreateSettings(), &test.config) + scraper := newPagingScraper(context.Background(), receivertest.NewNopCreateSettings(), &test.config) if test.mutateScraper != nil { test.mutateScraper(scraper) } diff --git a/receiver/hostmetricsreceiver/internal/scraper/pagingscraper/paging_scraper_windows.go b/receiver/hostmetricsreceiver/internal/scraper/pagingscraper/paging_scraper_windows.go index 3fc8f70059d74..8e47c52000bda 100644 --- a/receiver/hostmetricsreceiver/internal/scraper/pagingscraper/paging_scraper_windows.go +++ b/receiver/hostmetricsreceiver/internal/scraper/pagingscraper/paging_scraper_windows.go @@ -26,6 +26,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" + "go.opentelemetry.io/collector/receiver" "go.opentelemetry.io/collector/receiver/scrapererror" "go.uber.org/zap" @@ -45,7 +46,7 @@ const ( // scraper for Paging Metrics type scraper struct { - settings component.ReceiverCreateSettings + settings receiver.CreateSettings config *Config mb *metadata.MetricsBuilder @@ -58,7 +59,7 @@ type scraper struct { } // newPagingScraper creates a Paging Scraper -func newPagingScraper(_ context.Context, settings component.ReceiverCreateSettings, cfg *Config) *scraper { +func newPagingScraper(_ context.Context, settings receiver.CreateSettings, cfg *Config) *scraper { return &scraper{ settings: settings, config: cfg, diff --git a/receiver/hostmetricsreceiver/internal/scraper/pagingscraper/paging_scraper_windows_test.go b/receiver/hostmetricsreceiver/internal/scraper/pagingscraper/paging_scraper_windows_test.go index f7373f425ca2b..aea261fd35e58 100644 --- a/receiver/hostmetricsreceiver/internal/scraper/pagingscraper/paging_scraper_windows_test.go +++ b/receiver/hostmetricsreceiver/internal/scraper/pagingscraper/paging_scraper_windows_test.go @@ -25,6 +25,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component/componenttest" + "go.opentelemetry.io/collector/receiver/receivertest" "go.opentelemetry.io/collector/receiver/scrapererror" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver/internal/perfcounters" @@ -100,7 +101,7 @@ func TestScrape_Errors(t *testing.T) { metricsConfig := metadata.DefaultMetricsSettings() metricsConfig.SystemPagingUtilization.Enabled = true - scraper := newPagingScraper(context.Background(), componenttest.NewNopReceiverCreateSettings(), &Config{Metrics: metricsConfig}) + scraper := newPagingScraper(context.Background(), receivertest.NewNopCreateSettings(), &Config{Metrics: metricsConfig}) if test.getPageFileStats != nil { scraper.pageFileStats = test.getPageFileStats } @@ -172,7 +173,7 @@ func TestStart_Error(t *testing.T) { metricsConfig := metadata.DefaultMetricsSettings() metricsConfig.SystemPagingUtilization.Enabled = true - scraper := newPagingScraper(context.Background(), componenttest.NewNopReceiverCreateSettings(), &Config{Metrics: metricsConfig}) + scraper := newPagingScraper(context.Background(), receivertest.NewNopCreateSettings(), &Config{Metrics: metricsConfig}) scraper.perfCounterScraper = perfcounters.NewMockPerfCounterScraperError(nil, nil, nil, tc.initError) diff --git a/receiver/hostmetricsreceiver/internal/scraper/processesscraper/factory.go b/receiver/hostmetricsreceiver/internal/scraper/processesscraper/factory.go index d7568728e6825..6b8aa02fc17ea 100644 --- a/receiver/hostmetricsreceiver/internal/scraper/processesscraper/factory.go +++ b/receiver/hostmetricsreceiver/internal/scraper/processesscraper/factory.go @@ -17,7 +17,7 @@ package processesscraper // import "github.com/open-telemetry/opentelemetry-coll import ( "context" - "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/receiver" "go.opentelemetry.io/collector/receiver/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver/internal" @@ -45,7 +45,7 @@ func (f *Factory) CreateDefaultConfig() internal.Config { // CreateMetricsScraper creates a scraper based on provided config. func (f *Factory) CreateMetricsScraper( ctx context.Context, - settings component.ReceiverCreateSettings, + settings receiver.CreateSettings, config internal.Config, ) (scraperhelper.Scraper, error) { cfg := config.(*Config) diff --git a/receiver/hostmetricsreceiver/internal/scraper/processesscraper/factory_test.go b/receiver/hostmetricsreceiver/internal/scraper/processesscraper/factory_test.go index d4d1e9943aaee..d8f4511c479ab 100644 --- a/receiver/hostmetricsreceiver/internal/scraper/processesscraper/factory_test.go +++ b/receiver/hostmetricsreceiver/internal/scraper/processesscraper/factory_test.go @@ -19,7 +19,7 @@ import ( "testing" "github.com/stretchr/testify/assert" - "go.opentelemetry.io/collector/component/componenttest" + "go.opentelemetry.io/collector/receiver/receivertest" ) func TestCreateDefaultConfig(t *testing.T) { @@ -32,7 +32,7 @@ func TestCreateMetricsScraper(t *testing.T) { factory := &Factory{} cfg := &Config{} - scraper, err := factory.CreateMetricsScraper(context.Background(), componenttest.NewNopReceiverCreateSettings(), cfg) + scraper, err := factory.CreateMetricsScraper(context.Background(), receivertest.NewNopCreateSettings(), cfg) assert.NoError(t, err) assert.NotNil(t, scraper) diff --git a/receiver/hostmetricsreceiver/internal/scraper/processesscraper/internal/metadata/generated_metrics.go b/receiver/hostmetricsreceiver/internal/scraper/processesscraper/internal/metadata/generated_metrics.go index 9239a6d33d5ca..a2e8dfc761abd 100644 --- a/receiver/hostmetricsreceiver/internal/scraper/processesscraper/internal/metadata/generated_metrics.go +++ b/receiver/hostmetricsreceiver/internal/scraper/processesscraper/internal/metadata/generated_metrics.go @@ -9,6 +9,7 @@ import ( "go.opentelemetry.io/collector/confmap" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" + "go.opentelemetry.io/collector/receiver" conventions "go.opentelemetry.io/collector/semconv/v1.9.0" ) @@ -249,7 +250,7 @@ func WithStartTime(startTime pcommon.Timestamp) metricBuilderOption { } } -func NewMetricsBuilder(ms MetricsSettings, settings component.ReceiverCreateSettings, options ...metricBuilderOption) *MetricsBuilder { +func NewMetricsBuilder(ms MetricsSettings, settings receiver.CreateSettings, options ...metricBuilderOption) *MetricsBuilder { mb := &MetricsBuilder{ startTime: pcommon.NewTimestampFromTime(time.Now()), metricsBuffer: pmetric.NewMetrics(), diff --git a/receiver/hostmetricsreceiver/internal/scraper/processesscraper/internal/metadata/generated_metrics_test.go b/receiver/hostmetricsreceiver/internal/scraper/processesscraper/internal/metadata/generated_metrics_test.go index 9a2c9e41f230e..89575b5d84ece 100644 --- a/receiver/hostmetricsreceiver/internal/scraper/processesscraper/internal/metadata/generated_metrics_test.go +++ b/receiver/hostmetricsreceiver/internal/scraper/processesscraper/internal/metadata/generated_metrics_test.go @@ -7,9 +7,9 @@ import ( "testing" "github.com/stretchr/testify/assert" - "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" + "go.opentelemetry.io/collector/receiver/receivertest" "go.uber.org/zap" "go.uber.org/zap/zaptest/observer" ) @@ -17,7 +17,7 @@ import ( func TestDefaultMetrics(t *testing.T) { start := pcommon.Timestamp(1_000_000_000) ts := pcommon.Timestamp(1_000_001_000) - mb := NewMetricsBuilder(DefaultMetricsSettings(), componenttest.NewNopReceiverCreateSettings(), WithStartTime(start)) + mb := NewMetricsBuilder(DefaultMetricsSettings(), receivertest.NewNopCreateSettings(), WithStartTime(start)) enabledMetrics := make(map[string]bool) enabledMetrics["system.processes.count"] = true @@ -49,7 +49,7 @@ func TestAllMetrics(t *testing.T) { SystemProcessesCreated: MetricSettings{Enabled: true}, } observedZapCore, observedLogs := observer.New(zap.WarnLevel) - settings := componenttest.NewNopReceiverCreateSettings() + settings := receivertest.NewNopCreateSettings() settings.Logger = zap.New(observedZapCore) mb := NewMetricsBuilder(metricsSettings, settings, WithStartTime(start)) @@ -114,7 +114,7 @@ func TestNoMetrics(t *testing.T) { SystemProcessesCreated: MetricSettings{Enabled: false}, } observedZapCore, observedLogs := observer.New(zap.WarnLevel) - settings := componenttest.NewNopReceiverCreateSettings() + settings := receivertest.NewNopCreateSettings() settings.Logger = zap.New(observedZapCore) mb := NewMetricsBuilder(metricsSettings, settings, WithStartTime(start)) diff --git a/receiver/hostmetricsreceiver/internal/scraper/processesscraper/processes_scraper.go b/receiver/hostmetricsreceiver/internal/scraper/processesscraper/processes_scraper.go index 196418f668cbd..c4cb24586ccfc 100644 --- a/receiver/hostmetricsreceiver/internal/scraper/processesscraper/processes_scraper.go +++ b/receiver/hostmetricsreceiver/internal/scraper/processesscraper/processes_scraper.go @@ -24,6 +24,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" + "go.opentelemetry.io/collector/receiver" "go.opentelemetry.io/collector/receiver/scrapererror" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver/internal/scraper/processesscraper/internal/metadata" @@ -42,7 +43,7 @@ var metricsLength = func() int { // scraper for Processes Metrics type scraper struct { - settings component.ReceiverCreateSettings + settings receiver.CreateSettings config *Config mb *metadata.MetricsBuilder @@ -62,7 +63,7 @@ type processesMetadata struct { } // newProcessesScraper creates a set of Processes related metrics -func newProcessesScraper(_ context.Context, settings component.ReceiverCreateSettings, cfg *Config) *scraper { +func newProcessesScraper(_ context.Context, settings receiver.CreateSettings, cfg *Config) *scraper { return &scraper{ settings: settings, config: cfg, diff --git a/receiver/hostmetricsreceiver/internal/scraper/processesscraper/processes_scraper_test.go b/receiver/hostmetricsreceiver/internal/scraper/processesscraper/processes_scraper_test.go index 56118bc462a6f..47aeacdf8705e 100644 --- a/receiver/hostmetricsreceiver/internal/scraper/processesscraper/processes_scraper_test.go +++ b/receiver/hostmetricsreceiver/internal/scraper/processesscraper/processes_scraper_test.go @@ -28,6 +28,7 @@ import ( "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" + "go.opentelemetry.io/collector/receiver/receivertest" "go.opentelemetry.io/collector/receiver/scrapererror" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver/internal" @@ -74,7 +75,7 @@ func TestScrape(t *testing.T) { for _, test := range testCases { t.Run(test.name, func(t *testing.T) { - scraper := newProcessesScraper(context.Background(), componenttest.NewNopReceiverCreateSettings(), &Config{ + scraper := newProcessesScraper(context.Background(), receivertest.NewNopCreateSettings(), &Config{ Metrics: metadata.DefaultMetricsSettings(), }) err := scraper.start(context.Background(), componenttest.NewNopHost()) diff --git a/receiver/hostmetricsreceiver/internal/scraper/processscraper/factory.go b/receiver/hostmetricsreceiver/internal/scraper/processscraper/factory.go index ad2174ed39e85..b06710c43bcd4 100644 --- a/receiver/hostmetricsreceiver/internal/scraper/processscraper/factory.go +++ b/receiver/hostmetricsreceiver/internal/scraper/processscraper/factory.go @@ -19,7 +19,7 @@ import ( "errors" "runtime" - "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/receiver" "go.opentelemetry.io/collector/receiver/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver/internal" @@ -47,7 +47,7 @@ func (f *Factory) CreateDefaultConfig() internal.Config { // CreateMetricsScraper creates a resource scraper based on provided config. func (f *Factory) CreateMetricsScraper( _ context.Context, - settings component.ReceiverCreateSettings, + settings receiver.CreateSettings, cfg internal.Config, ) (scraperhelper.Scraper, error) { if runtime.GOOS != "linux" && runtime.GOOS != "windows" { diff --git a/receiver/hostmetricsreceiver/internal/scraper/processscraper/factory_test.go b/receiver/hostmetricsreceiver/internal/scraper/processscraper/factory_test.go index 0474dc5bf35cf..aad03ae6e94fd 100644 --- a/receiver/hostmetricsreceiver/internal/scraper/processscraper/factory_test.go +++ b/receiver/hostmetricsreceiver/internal/scraper/processscraper/factory_test.go @@ -20,7 +20,7 @@ import ( "testing" "github.com/stretchr/testify/assert" - "go.opentelemetry.io/collector/component/componenttest" + "go.opentelemetry.io/collector/receiver/receivertest" ) func TestCreateDefaultConfig(t *testing.T) { @@ -33,7 +33,7 @@ func TestCreateResourceMetricsScraper(t *testing.T) { factory := &Factory{} cfg := &Config{} - scraper, err := factory.CreateMetricsScraper(context.Background(), componenttest.NewNopReceiverCreateSettings(), cfg) + scraper, err := factory.CreateMetricsScraper(context.Background(), receivertest.NewNopCreateSettings(), cfg) if runtime.GOOS == "linux" || runtime.GOOS == "windows" { assert.NoError(t, err) diff --git a/receiver/hostmetricsreceiver/internal/scraper/processscraper/internal/metadata/generated_metrics.go b/receiver/hostmetricsreceiver/internal/scraper/processscraper/internal/metadata/generated_metrics.go index c61995263414a..274041d1f857a 100644 --- a/receiver/hostmetricsreceiver/internal/scraper/processscraper/internal/metadata/generated_metrics.go +++ b/receiver/hostmetricsreceiver/internal/scraper/processscraper/internal/metadata/generated_metrics.go @@ -9,6 +9,7 @@ import ( "go.opentelemetry.io/collector/confmap" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" + "go.opentelemetry.io/collector/receiver" conventions "go.opentelemetry.io/collector/semconv/v1.9.0" ) @@ -853,7 +854,7 @@ func WithStartTime(startTime pcommon.Timestamp) metricBuilderOption { } } -func NewMetricsBuilder(ms MetricsSettings, settings component.ReceiverCreateSettings, options ...metricBuilderOption) *MetricsBuilder { +func NewMetricsBuilder(ms MetricsSettings, settings receiver.CreateSettings, options ...metricBuilderOption) *MetricsBuilder { if ms.ProcessMemoryPhysicalUsage.Enabled { settings.Logger.Warn("[WARNING] `process.memory.physical_usage` should not be enabled: The metric is deprecated and will be removed in v0.70.0. Please use `process.memory.usage` instead. See https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/receiver/hostmetricsreceiver#transition-to-process-memory-metric-names-aligned-with-opentelemetry-specification for more details.") } diff --git a/receiver/hostmetricsreceiver/internal/scraper/processscraper/internal/metadata/generated_metrics_test.go b/receiver/hostmetricsreceiver/internal/scraper/processscraper/internal/metadata/generated_metrics_test.go index b67eaae702495..97bcb78f5b3f0 100644 --- a/receiver/hostmetricsreceiver/internal/scraper/processscraper/internal/metadata/generated_metrics_test.go +++ b/receiver/hostmetricsreceiver/internal/scraper/processscraper/internal/metadata/generated_metrics_test.go @@ -7,9 +7,9 @@ import ( "testing" "github.com/stretchr/testify/assert" - "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" + "go.opentelemetry.io/collector/receiver/receivertest" "go.uber.org/zap" "go.uber.org/zap/zaptest/observer" ) @@ -17,7 +17,7 @@ import ( func TestDefaultMetrics(t *testing.T) { start := pcommon.Timestamp(1_000_000_000) ts := pcommon.Timestamp(1_000_001_000) - mb := NewMetricsBuilder(DefaultMetricsSettings(), componenttest.NewNopReceiverCreateSettings(), WithStartTime(start)) + mb := NewMetricsBuilder(DefaultMetricsSettings(), receivertest.NewNopCreateSettings(), WithStartTime(start)) enabledMetrics := make(map[string]bool) mb.RecordProcessContextSwitchesDataPoint(ts, 1, AttributeContextSwitchType(1)) @@ -81,7 +81,7 @@ func TestAllMetrics(t *testing.T) { ProcessThreads: MetricSettings{Enabled: true}, } observedZapCore, observedLogs := observer.New(zap.WarnLevel) - settings := componenttest.NewNopReceiverCreateSettings() + settings := receivertest.NewNopCreateSettings() settings.Logger = zap.New(observedZapCore) mb := NewMetricsBuilder(metricsSettings, settings, WithStartTime(start)) @@ -334,7 +334,7 @@ func TestNoMetrics(t *testing.T) { ProcessThreads: MetricSettings{Enabled: false}, } observedZapCore, observedLogs := observer.New(zap.WarnLevel) - settings := componenttest.NewNopReceiverCreateSettings() + settings := receivertest.NewNopCreateSettings() settings.Logger = zap.New(observedZapCore) mb := NewMetricsBuilder(metricsSettings, settings, WithStartTime(start)) diff --git a/receiver/hostmetricsreceiver/internal/scraper/processscraper/process_scraper.go b/receiver/hostmetricsreceiver/internal/scraper/processscraper/process_scraper.go index e81993e8f4253..5818f886b43d7 100644 --- a/receiver/hostmetricsreceiver/internal/scraper/processscraper/process_scraper.go +++ b/receiver/hostmetricsreceiver/internal/scraper/processscraper/process_scraper.go @@ -24,6 +24,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" + "go.opentelemetry.io/collector/receiver" "go.opentelemetry.io/collector/receiver/scrapererror" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/filter/filterset" @@ -46,7 +47,7 @@ const ( // scraper for Process Metrics type scraper struct { - settings component.ReceiverCreateSettings + settings receiver.CreateSettings config *Config mb *metadata.MetricsBuilder includeFS filterset.FilterSet @@ -59,7 +60,7 @@ type scraper struct { } // newProcessScraper creates a Process Scraper -func newProcessScraper(settings component.ReceiverCreateSettings, cfg *Config) (*scraper, error) { +func newProcessScraper(settings receiver.CreateSettings, cfg *Config) (*scraper, error) { scraper := &scraper{ settings: settings, config: cfg, diff --git a/receiver/hostmetricsreceiver/internal/scraper/processscraper/process_scraper_test.go b/receiver/hostmetricsreceiver/internal/scraper/processscraper/process_scraper_test.go index 721f9e1d73aee..e83e80e1967a0 100644 --- a/receiver/hostmetricsreceiver/internal/scraper/processscraper/process_scraper_test.go +++ b/receiver/hostmetricsreceiver/internal/scraper/processscraper/process_scraper_test.go @@ -30,6 +30,7 @@ import ( "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" + "go.opentelemetry.io/collector/receiver/receivertest" "go.opentelemetry.io/collector/receiver/scrapererror" conventions "go.opentelemetry.io/collector/semconv/v1.6.1" @@ -87,7 +88,7 @@ func TestScrape(t *testing.T) { if test.mutateMetricsSettings != nil { test.mutateMetricsSettings(t, &metricsSettings) } - scraper, err := newProcessScraper(componenttest.NewNopReceiverCreateSettings(), &Config{Metrics: metricsSettings}) + scraper, err := newProcessScraper(receivertest.NewNopCreateSettings(), &Config{Metrics: metricsSettings}) if test.mutateScraper != nil { test.mutateScraper(scraper) } @@ -309,11 +310,11 @@ func getMetricSlice(t *testing.T, rm pmetric.ResourceMetrics) pmetric.MetricSlic func TestScrapeMetrics_NewError(t *testing.T) { skipTestOnUnsupportedOS(t) - _, err := newProcessScraper(componenttest.NewNopReceiverCreateSettings(), &Config{Include: MatchConfig{Names: []string{"test"}}, Metrics: metadata.DefaultMetricsSettings()}) + _, err := newProcessScraper(receivertest.NewNopCreateSettings(), &Config{Include: MatchConfig{Names: []string{"test"}}, Metrics: metadata.DefaultMetricsSettings()}) require.Error(t, err) require.Regexp(t, "^error creating process include filters:", err.Error()) - _, err = newProcessScraper(componenttest.NewNopReceiverCreateSettings(), &Config{Exclude: MatchConfig{Names: []string{"test"}}, Metrics: metadata.DefaultMetricsSettings()}) + _, err = newProcessScraper(receivertest.NewNopCreateSettings(), &Config{Exclude: MatchConfig{Names: []string{"test"}}, Metrics: metadata.DefaultMetricsSettings()}) require.Error(t, err) require.Regexp(t, "^error creating process exclude filters:", err.Error()) } @@ -321,7 +322,7 @@ func TestScrapeMetrics_NewError(t *testing.T) { func TestScrapeMetrics_GetProcessesError(t *testing.T) { skipTestOnUnsupportedOS(t) - scraper, err := newProcessScraper(componenttest.NewNopReceiverCreateSettings(), &Config{Metrics: metadata.DefaultMetricsSettings()}) + scraper, err := newProcessScraper(receivertest.NewNopCreateSettings(), &Config{Metrics: metadata.DefaultMetricsSettings()}) require.NoError(t, err, "Failed to create process scraper: %v", err) scraper.getProcessHandles = func() (processHandles, error) { return nil, errors.New("err1") } @@ -550,7 +551,7 @@ func TestScrapeMetrics_Filtered(t *testing.T) { } } - scraper, err := newProcessScraper(componenttest.NewNopReceiverCreateSettings(), config) + scraper, err := newProcessScraper(receivertest.NewNopCreateSettings(), config) require.NoError(t, err, "Failed to create process scraper: %v", err) err = scraper.start(context.Background(), componenttest.NewNopHost()) require.NoError(t, err, "Failed to initialize process scraper: %v", err) @@ -720,7 +721,7 @@ func TestScrapeMetrics_ProcessErrors(t *testing.T) { metricsSettings := metadata.DefaultMetricsSettings() enableOptionalMetrics(&metricsSettings) - scraper, err := newProcessScraper(componenttest.NewNopReceiverCreateSettings(), &Config{Metrics: metricsSettings}) + scraper, err := newProcessScraper(receivertest.NewNopCreateSettings(), &Config{Metrics: metricsSettings}) require.NoError(t, err, "Failed to create process scraper: %v", err) err = scraper.start(context.Background(), componenttest.NewNopHost()) require.NoError(t, err, "Failed to initialize process scraper: %v", err) @@ -856,7 +857,7 @@ func TestScrapeMetrics_MuteProcessNameError(t *testing.T) { if !test.omitConfigField { config.MuteProcessNameError = test.muteProcessNameError } - scraper, err := newProcessScraper(componenttest.NewNopReceiverCreateSettings(), config) + scraper, err := newProcessScraper(receivertest.NewNopCreateSettings(), config) require.NoError(t, err, "Failed to create process scraper: %v", err) err = scraper.start(context.Background(), componenttest.NewNopHost()) require.NoError(t, err, "Failed to initialize process scraper: %v", err) @@ -914,7 +915,7 @@ func TestScrapeMetrics_DontCheckDisabledMetrics(t *testing.T) { t.Run("Metrics don't log errors when disabled", func(t *testing.T) { config := &Config{Metrics: metricSettings} - scraper, err := newProcessScraper(componenttest.NewNopReceiverCreateSettings(), config) + scraper, err := newProcessScraper(receivertest.NewNopCreateSettings(), config) require.NoError(t, err, "Failed to create process scraper: %v", err) err = scraper.start(context.Background(), componenttest.NewNopHost()) require.NoError(t, err, "Failed to initialize process scraper: %v", err) diff --git a/receiver/httpcheckreceiver/factory.go b/receiver/httpcheckreceiver/factory.go index c49de5f41593e..b8eb4a8a2a128 100644 --- a/receiver/httpcheckreceiver/factory.go +++ b/receiver/httpcheckreceiver/factory.go @@ -23,6 +23,7 @@ import ( "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/consumer" + "go.opentelemetry.io/collector/receiver" "go.opentelemetry.io/collector/receiver/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/httpcheckreceiver/internal/metadata" @@ -36,11 +37,11 @@ const ( var errConfigNotHTTPCheck = errors.New("config was not a HTTP check receiver config") // NewFactory creates a new receiver factory -func NewFactory() component.ReceiverFactory { - return component.NewReceiverFactory( +func NewFactory() receiver.Factory { + return receiver.NewFactory( typeStr, createDefaultConfig, - component.WithMetricsReceiver(createMetricsReceiver, stability)) + receiver.WithMetrics(createMetricsReceiver, stability)) } func createDefaultConfig() component.Config { @@ -58,7 +59,7 @@ func createDefaultConfig() component.Config { } } -func createMetricsReceiver(ctx context.Context, params component.ReceiverCreateSettings, rConf component.Config, consumer consumer.Metrics) (component.MetricsReceiver, error) { +func createMetricsReceiver(ctx context.Context, params receiver.CreateSettings, rConf component.Config, consumer consumer.Metrics) (receiver.Metrics, error) { cfg, ok := rConf.(*Config) if !ok { return nil, errConfigNotHTTPCheck diff --git a/receiver/httpcheckreceiver/factory_test.go b/receiver/httpcheckreceiver/factory_test.go index 319d9ead00565..80fcc49cfeb4b 100644 --- a/receiver/httpcheckreceiver/factory_test.go +++ b/receiver/httpcheckreceiver/factory_test.go @@ -21,10 +21,10 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/consumer/consumertest" + "go.opentelemetry.io/collector/receiver/receivertest" "go.opentelemetry.io/collector/receiver/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/httpcheckreceiver/internal/metadata" @@ -70,7 +70,7 @@ func TestNewFactory(t *testing.T) { cfg := factory.CreateDefaultConfig() _, err := factory.CreateMetricsReceiver( context.Background(), - componenttest.NewNopReceiverCreateSettings(), + receivertest.NewNopCreateSettings(), cfg, consumertest.NewNop(), ) @@ -83,7 +83,7 @@ func TestNewFactory(t *testing.T) { factory := NewFactory() _, err := factory.CreateMetricsReceiver( context.Background(), - componenttest.NewNopReceiverCreateSettings(), + receivertest.NewNopCreateSettings(), nil, consumertest.NewNop(), ) diff --git a/receiver/httpcheckreceiver/go.mod b/receiver/httpcheckreceiver/go.mod index fa54c3e258f28..ff1a53b8626df 100644 --- a/receiver/httpcheckreceiver/go.mod +++ b/receiver/httpcheckreceiver/go.mod @@ -3,13 +3,13 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/receiver/httpch go 1.18 require ( - github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest v0.66.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest v0.67.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector v0.67.0 + go.opentelemetry.io/collector/component v0.67.0 + go.opentelemetry.io/collector/confmap v0.67.0 + go.opentelemetry.io/collector/consumer v0.67.0 + go.opentelemetry.io/collector/pdata v1.0.0-rc1 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.24.0 ) @@ -35,7 +35,7 @@ require ( github.com/rogpeppe/go-internal v1.8.1 // indirect github.com/rs/cors v1.8.2 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/featuregate v0.67.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect diff --git a/receiver/httpcheckreceiver/go.sum b/receiver/httpcheckreceiver/go.sum index 42bf32823a709..8197a1523ace7 100644 --- a/receiver/httpcheckreceiver/go.sum +++ b/receiver/httpcheckreceiver/go.sum @@ -292,18 +292,18 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/component v0.67.0 h1:GCBRZAqk4yNaT4L1uwlbbwophFHrxYccLZ4Uj1Ifs/M= +go.opentelemetry.io/collector/component v0.67.0/go.mod h1:Txa2lm9oe7xsGQN8u7GdUIrRpAHFIKsTO4Qi3/CSmKk= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 h1:aUEBEdCa6iamGzg6fuYxDA8ThxvOG240mAvWDU+XLio= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4/go.mod h1:l2MdsbKTocpPS5nQZscqTR9jd8u96VYZdcpF8Sye7mA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= diff --git a/receiver/httpcheckreceiver/internal/metadata/generated_metrics.go b/receiver/httpcheckreceiver/internal/metadata/generated_metrics.go index 4550592d18a25..4658264f47f10 100644 --- a/receiver/httpcheckreceiver/internal/metadata/generated_metrics.go +++ b/receiver/httpcheckreceiver/internal/metadata/generated_metrics.go @@ -9,6 +9,7 @@ import ( "go.opentelemetry.io/collector/confmap" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" + "go.opentelemetry.io/collector/receiver" ) // MetricSettings provides common settings for a particular metric. @@ -240,7 +241,7 @@ func WithStartTime(startTime pcommon.Timestamp) metricBuilderOption { } } -func NewMetricsBuilder(ms MetricsSettings, settings component.ReceiverCreateSettings, options ...metricBuilderOption) *MetricsBuilder { +func NewMetricsBuilder(ms MetricsSettings, settings receiver.CreateSettings, options ...metricBuilderOption) *MetricsBuilder { mb := &MetricsBuilder{ startTime: pcommon.NewTimestampFromTime(time.Now()), metricsBuffer: pmetric.NewMetrics(), diff --git a/receiver/httpcheckreceiver/internal/metadata/generated_metrics_test.go b/receiver/httpcheckreceiver/internal/metadata/generated_metrics_test.go index 4bf087a4db7d7..3eb159867ed10 100644 --- a/receiver/httpcheckreceiver/internal/metadata/generated_metrics_test.go +++ b/receiver/httpcheckreceiver/internal/metadata/generated_metrics_test.go @@ -7,9 +7,9 @@ import ( "testing" "github.com/stretchr/testify/assert" - "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" + "go.opentelemetry.io/collector/receiver/receivertest" "go.uber.org/zap" "go.uber.org/zap/zaptest/observer" ) @@ -17,7 +17,7 @@ import ( func TestDefaultMetrics(t *testing.T) { start := pcommon.Timestamp(1_000_000_000) ts := pcommon.Timestamp(1_000_001_000) - mb := NewMetricsBuilder(DefaultMetricsSettings(), componenttest.NewNopReceiverCreateSettings(), WithStartTime(start)) + mb := NewMetricsBuilder(DefaultMetricsSettings(), receivertest.NewNopCreateSettings(), WithStartTime(start)) enabledMetrics := make(map[string]bool) enabledMetrics["httpcheck.duration"] = true @@ -53,7 +53,7 @@ func TestAllMetrics(t *testing.T) { HttpcheckStatus: MetricSettings{Enabled: true}, } observedZapCore, observedLogs := observer.New(zap.WarnLevel) - settings := componenttest.NewNopReceiverCreateSettings() + settings := receivertest.NewNopCreateSettings() settings.Logger = zap.New(observedZapCore) mb := NewMetricsBuilder(metricsSettings, settings, WithStartTime(start)) @@ -149,7 +149,7 @@ func TestNoMetrics(t *testing.T) { HttpcheckStatus: MetricSettings{Enabled: false}, } observedZapCore, observedLogs := observer.New(zap.WarnLevel) - settings := componenttest.NewNopReceiverCreateSettings() + settings := receivertest.NewNopCreateSettings() settings.Logger = zap.New(observedZapCore) mb := NewMetricsBuilder(metricsSettings, settings, WithStartTime(start)) diff --git a/receiver/httpcheckreceiver/scraper.go b/receiver/httpcheckreceiver/scraper.go index 16961a8220197..274793578fd30 100644 --- a/receiver/httpcheckreceiver/scraper.go +++ b/receiver/httpcheckreceiver/scraper.go @@ -23,6 +23,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" + "go.opentelemetry.io/collector/receiver" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/httpcheckreceiver/internal/metadata" ) @@ -81,7 +82,7 @@ func (h *httpcheckScraper) scrape(ctx context.Context) (pmetric.Metrics, error) return h.mb.Emit(), nil } -func newScraper(conf *Config, settings component.ReceiverCreateSettings) *httpcheckScraper { +func newScraper(conf *Config, settings receiver.CreateSettings) *httpcheckScraper { return &httpcheckScraper{ cfg: conf, settings: settings.TelemetrySettings, diff --git a/receiver/httpcheckreceiver/scraper_test.go b/receiver/httpcheckreceiver/scraper_test.go index 7757973c65b28..6e678ad0b24b4 100644 --- a/receiver/httpcheckreceiver/scraper_test.go +++ b/receiver/httpcheckreceiver/scraper_test.go @@ -26,6 +26,7 @@ import ( "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/config/configtls" "go.opentelemetry.io/collector/pdata/pmetric" + "go.opentelemetry.io/collector/receiver/receivertest" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest/golden" @@ -157,7 +158,7 @@ func TestScaperScrape(t *testing.T) { defer ms.Close() cfg.Endpoint = ms.URL } - scraper := newScraper(cfg, componenttest.NewNopReceiverCreateSettings()) + scraper := newScraper(cfg, receivertest.NewNopCreateSettings()) require.NoError(t, scraper.start(context.Background(), componenttest.NewNopHost())) actualMetrics, err := scraper.scrape(context.Background()) @@ -175,7 +176,7 @@ func TestScaperScrape(t *testing.T) { } func TestNilClient(t *testing.T) { - scraper := newScraper(createDefaultConfig().(*Config), componenttest.NewNopReceiverCreateSettings()) + scraper := newScraper(createDefaultConfig().(*Config), receivertest.NewNopCreateSettings()) actualMetrics, err := scraper.scrape(context.Background()) require.EqualError(t, err, errClientNotInit.Error()) require.NoError(t, comparetest.CompareMetrics(pmetric.NewMetrics(), actualMetrics)) diff --git a/receiver/iisreceiver/factory.go b/receiver/iisreceiver/factory.go index 93c9913c04dae..f091c71497101 100644 --- a/receiver/iisreceiver/factory.go +++ b/receiver/iisreceiver/factory.go @@ -19,6 +19,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" + "go.opentelemetry.io/collector/receiver" "go.opentelemetry.io/collector/receiver/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/iisreceiver/internal/metadata" @@ -30,11 +31,11 @@ const ( ) // NewFactory creates a factory for iis receiver. -func NewFactory() component.ReceiverFactory { - return component.NewReceiverFactory( +func NewFactory() receiver.Factory { + return receiver.NewFactory( typeStr, createDefaultConfig, - component.WithMetricsReceiver(createMetricsReceiver, stability)) + receiver.WithMetrics(createMetricsReceiver, stability)) } func createDefaultConfig() component.Config { diff --git a/receiver/iisreceiver/factory_others.go b/receiver/iisreceiver/factory_others.go index 9a54a6813a570..becc5e502c73b 100644 --- a/receiver/iisreceiver/factory_others.go +++ b/receiver/iisreceiver/factory_others.go @@ -23,14 +23,15 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/consumer" + "go.opentelemetry.io/collector/receiver" ) // createMetricsReceiver creates a metrics receiver based on provided config. func createMetricsReceiver( ctx context.Context, - params component.ReceiverCreateSettings, + params receiver.CreateSettings, cfg component.Config, consumer consumer.Metrics, -) (component.MetricsReceiver, error) { +) (receiver.Metrics, error) { return nil, errors.New("the windows perf counters receiver is only supported on Windows") } diff --git a/receiver/iisreceiver/factory_others_test.go b/receiver/iisreceiver/factory_others_test.go index b4680103a00c4..7ebb8f606baf8 100644 --- a/receiver/iisreceiver/factory_others_test.go +++ b/receiver/iisreceiver/factory_others_test.go @@ -22,14 +22,14 @@ import ( "testing" "github.com/stretchr/testify/assert" - "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/consumer/consumertest" + "go.opentelemetry.io/collector/receiver/receivertest" ) func TestCreateMetricsReceiver(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() - mReceiver, err := factory.CreateMetricsReceiver(context.Background(), componenttest.NewNopReceiverCreateSettings(), cfg, consumertest.NewNop()) + mReceiver, err := factory.CreateMetricsReceiver(context.Background(), receivertest.NewNopCreateSettings(), cfg, consumertest.NewNop()) assert.EqualError(t, err, "the windows perf counters receiver is only supported on Windows") assert.Nil(t, mReceiver) diff --git a/receiver/iisreceiver/factory_windows.go b/receiver/iisreceiver/factory_windows.go index 764e14b27191f..f5417df728961 100644 --- a/receiver/iisreceiver/factory_windows.go +++ b/receiver/iisreceiver/factory_windows.go @@ -22,15 +22,16 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/consumer" + "go.opentelemetry.io/collector/receiver" "go.opentelemetry.io/collector/receiver/scraperhelper" ) func createMetricsReceiver( _ context.Context, - params component.ReceiverCreateSettings, + params receiver.CreateSettings, rConf component.Config, nextConsumer consumer.Metrics, -) (component.MetricsReceiver, error) { +) (receiver.Metrics, error) { cfg := rConf.(*Config) rcvr := newIisReceiver(params, cfg, nextConsumer) diff --git a/receiver/iisreceiver/factory_windows_test.go b/receiver/iisreceiver/factory_windows_test.go index 08f8e7b548c43..c476c127e4269 100644 --- a/receiver/iisreceiver/factory_windows_test.go +++ b/receiver/iisreceiver/factory_windows_test.go @@ -22,8 +22,8 @@ import ( "testing" "github.com/stretchr/testify/require" - "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/consumer/consumertest" + "go.opentelemetry.io/collector/receiver/receivertest" ) func TestWindowsFactory(t *testing.T) { @@ -33,7 +33,7 @@ func TestWindowsFactory(t *testing.T) { r, err := f.CreateMetricsReceiver( context.Background(), - componenttest.NewNopReceiverCreateSettings(), + receivertest.NewNopCreateSettings(), cfg, consumertest.NewNop(), ) diff --git a/receiver/iisreceiver/go.mod b/receiver/iisreceiver/go.mod index b9aa90d6f495c..328681660b471 100644 --- a/receiver/iisreceiver/go.mod +++ b/receiver/iisreceiver/go.mod @@ -3,14 +3,14 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/receiver/iisrec go 1.18 require ( - github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/winperfcounters v0.66.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/winperfcounters v0.67.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector v0.67.0 + go.opentelemetry.io/collector/component v0.67.0 + go.opentelemetry.io/collector/confmap v0.67.0 + go.opentelemetry.io/collector/consumer v0.67.0 + go.opentelemetry.io/collector/pdata v1.0.0-rc1 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.24.0 ) @@ -29,7 +29,7 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/featuregate v0.67.0 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/receiver/iisreceiver/go.sum b/receiver/iisreceiver/go.sum index f0db1c5387639..b3a35bf3c7abb 100644 --- a/receiver/iisreceiver/go.sum +++ b/receiver/iisreceiver/go.sum @@ -279,18 +279,18 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/component v0.67.0 h1:GCBRZAqk4yNaT4L1uwlbbwophFHrxYccLZ4Uj1Ifs/M= +go.opentelemetry.io/collector/component v0.67.0/go.mod h1:Txa2lm9oe7xsGQN8u7GdUIrRpAHFIKsTO4Qi3/CSmKk= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/receiver/iisreceiver/integration_test.go b/receiver/iisreceiver/integration_test.go index 776fc59fe3f11..4537b9f0d852c 100644 --- a/receiver/iisreceiver/integration_test.go +++ b/receiver/iisreceiver/integration_test.go @@ -26,6 +26,7 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/consumer/consumertest" + "go.opentelemetry.io/collector/receiver/receivertest" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest/golden" @@ -39,7 +40,7 @@ func TestIisIntegration(t *testing.T) { cfg.ScraperControllerSettings.CollectionInterval = 100 * time.Millisecond consumer := new(consumertest.MetricsSink) - settings := componenttest.NewNopReceiverCreateSettings() + settings := receivertest.NewNopCreateSettings() rcvr, err := f.CreateMetricsReceiver(context.Background(), settings, cfg, consumer) require.NoError(t, err, "failed creating metrics receiver") require.NoError(t, rcvr.Start(context.Background(), componenttest.NewNopHost())) diff --git a/receiver/iisreceiver/internal/metadata/generated_metrics.go b/receiver/iisreceiver/internal/metadata/generated_metrics.go index a7184ef0ad268..e91b954e465b6 100644 --- a/receiver/iisreceiver/internal/metadata/generated_metrics.go +++ b/receiver/iisreceiver/internal/metadata/generated_metrics.go @@ -9,6 +9,7 @@ import ( "go.opentelemetry.io/collector/confmap" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" + "go.opentelemetry.io/collector/receiver" ) // MetricSettings provides common settings for a particular metric. @@ -810,7 +811,7 @@ func WithStartTime(startTime pcommon.Timestamp) metricBuilderOption { } } -func NewMetricsBuilder(ms MetricsSettings, settings component.ReceiverCreateSettings, options ...metricBuilderOption) *MetricsBuilder { +func NewMetricsBuilder(ms MetricsSettings, settings receiver.CreateSettings, options ...metricBuilderOption) *MetricsBuilder { mb := &MetricsBuilder{ startTime: pcommon.NewTimestampFromTime(time.Now()), metricsBuffer: pmetric.NewMetrics(), diff --git a/receiver/iisreceiver/internal/metadata/generated_metrics_test.go b/receiver/iisreceiver/internal/metadata/generated_metrics_test.go index 9dcd249d4f600..5d1806940d3ea 100644 --- a/receiver/iisreceiver/internal/metadata/generated_metrics_test.go +++ b/receiver/iisreceiver/internal/metadata/generated_metrics_test.go @@ -7,9 +7,9 @@ import ( "testing" "github.com/stretchr/testify/assert" - "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" + "go.opentelemetry.io/collector/receiver/receivertest" "go.uber.org/zap" "go.uber.org/zap/zaptest/observer" ) @@ -17,7 +17,7 @@ import ( func TestDefaultMetrics(t *testing.T) { start := pcommon.Timestamp(1_000_000_000) ts := pcommon.Timestamp(1_000_001_000) - mb := NewMetricsBuilder(DefaultMetricsSettings(), componenttest.NewNopReceiverCreateSettings(), WithStartTime(start)) + mb := NewMetricsBuilder(DefaultMetricsSettings(), receivertest.NewNopCreateSettings(), WithStartTime(start)) enabledMetrics := make(map[string]bool) enabledMetrics["iis.connection.active"] = true @@ -89,7 +89,7 @@ func TestAllMetrics(t *testing.T) { IisUptime: MetricSettings{Enabled: true}, } observedZapCore, observedLogs := observer.New(zap.WarnLevel) - settings := componenttest.NewNopReceiverCreateSettings() + settings := receivertest.NewNopCreateSettings() settings.Logger = zap.New(observedZapCore) mb := NewMetricsBuilder(metricsSettings, settings, WithStartTime(start)) @@ -314,7 +314,7 @@ func TestNoMetrics(t *testing.T) { IisUptime: MetricSettings{Enabled: false}, } observedZapCore, observedLogs := observer.New(zap.WarnLevel) - settings := componenttest.NewNopReceiverCreateSettings() + settings := receivertest.NewNopCreateSettings() settings.Logger = zap.New(observedZapCore) mb := NewMetricsBuilder(metricsSettings, settings, WithStartTime(start)) diff --git a/receiver/iisreceiver/scraper.go b/receiver/iisreceiver/scraper.go index b5b314099c096..33c821f488917 100644 --- a/receiver/iisreceiver/scraper.go +++ b/receiver/iisreceiver/scraper.go @@ -25,6 +25,7 @@ import ( "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" + "go.opentelemetry.io/collector/receiver" "go.opentelemetry.io/collector/receiver/scrapererror" "go.uber.org/multierr" "go.uber.org/zap" @@ -53,7 +54,7 @@ type watcherRecorder struct { } // newIisReceiver returns an iisReceiver -func newIisReceiver(settings component.ReceiverCreateSettings, cfg *Config, consumer consumer.Metrics) *iisReceiver { +func newIisReceiver(settings receiver.CreateSettings, cfg *Config, consumer consumer.Metrics) *iisReceiver { return &iisReceiver{ params: settings.TelemetrySettings, config: cfg, diff --git a/receiver/iisreceiver/scraper_test.go b/receiver/iisreceiver/scraper_test.go index 2e1554257b6f3..c6a6b9c694a7b 100644 --- a/receiver/iisreceiver/scraper_test.go +++ b/receiver/iisreceiver/scraper_test.go @@ -27,6 +27,7 @@ import ( "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/consumer/consumertest" "go.opentelemetry.io/collector/pdata/pcommon" + "go.opentelemetry.io/collector/receiver/receivertest" "go.uber.org/zap" "go.uber.org/zap/zapcore" "go.uber.org/zap/zaptest/observer" @@ -42,7 +43,7 @@ func TestScrape(t *testing.T) { cfg := createDefaultConfig().(*Config) scraper := newIisReceiver( - componenttest.NewNopReceiverCreateSettings(), + receivertest.NewNopCreateSettings(), cfg, consumertest.NewNop(), ) @@ -66,7 +67,7 @@ func TestScrapeFailure(t *testing.T) { core, obs := observer.New(zapcore.WarnLevel) logger := zap.New(core) - rcvrSettings := componenttest.NewNopReceiverCreateSettings() + rcvrSettings := receivertest.NewNopCreateSettings() rcvrSettings.Logger = logger scraper := newIisReceiver( diff --git a/receiver/influxdbreceiver/factory.go b/receiver/influxdbreceiver/factory.go index bb8a5fc6f2bf1..5762be0063151 100644 --- a/receiver/influxdbreceiver/factory.go +++ b/receiver/influxdbreceiver/factory.go @@ -21,6 +21,7 @@ import ( "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/consumer" + "go.opentelemetry.io/collector/receiver" ) const ( @@ -28,11 +29,11 @@ const ( stability = component.StabilityLevelBeta ) -func NewFactory() component.ReceiverFactory { - return component.NewReceiverFactory( +func NewFactory() receiver.Factory { + return receiver.NewFactory( typeStr, createDefaultConfig, - component.WithMetricsReceiver(createMetricsReceiver, stability)) + receiver.WithMetrics(createMetricsReceiver, stability)) } // createDefaultConfig creates the default configuration for receiver. @@ -45,6 +46,6 @@ func createDefaultConfig() component.Config { } } -func createMetricsReceiver(_ context.Context, params component.ReceiverCreateSettings, cfg component.Config, nextConsumer consumer.Metrics) (component.MetricsReceiver, error) { +func createMetricsReceiver(_ context.Context, params receiver.CreateSettings, cfg component.Config, nextConsumer consumer.Metrics) (receiver.Metrics, error) { return newMetricsReceiver(cfg.(*Config), params.TelemetrySettings, nextConsumer) } diff --git a/receiver/influxdbreceiver/go.mod b/receiver/influxdbreceiver/go.mod index f1ed93dba9de4..ee0011323d5d2 100644 --- a/receiver/influxdbreceiver/go.mod +++ b/receiver/influxdbreceiver/go.mod @@ -6,10 +6,10 @@ require ( github.com/influxdata/influxdb-observability/common v0.2.32 github.com/influxdata/influxdb-observability/influx2otel v0.2.32 github.com/influxdata/line-protocol/v2 v2.2.1 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.66.0 - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.67.0 + go.opentelemetry.io/collector v0.67.0 + go.opentelemetry.io/collector/component v0.67.0 + go.opentelemetry.io/collector/consumer v0.67.0 go.uber.org/zap v1.24.0 ) @@ -32,9 +32,9 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pelletier/go-toml v1.9.4 // indirect github.com/rs/cors v1.8.2 // indirect - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/confmap v0.67.0 // indirect + go.opentelemetry.io/collector/featuregate v0.67.0 // indirect + go.opentelemetry.io/collector/pdata v1.0.0-rc1 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect diff --git a/receiver/influxdbreceiver/go.sum b/receiver/influxdbreceiver/go.sum index 0d5e5c3479986..5457beb687a78 100644 --- a/receiver/influxdbreceiver/go.sum +++ b/receiver/influxdbreceiver/go.sum @@ -291,18 +291,18 @@ github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1 go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A= go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/component v0.67.0 h1:GCBRZAqk4yNaT4L1uwlbbwophFHrxYccLZ4Uj1Ifs/M= +go.opentelemetry.io/collector/component v0.67.0/go.mod h1:Txa2lm9oe7xsGQN8u7GdUIrRpAHFIKsTO4Qi3/CSmKk= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 h1:aUEBEdCa6iamGzg6fuYxDA8ThxvOG240mAvWDU+XLio= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4/go.mod h1:l2MdsbKTocpPS5nQZscqTR9jd8u96VYZdcpF8Sye7mA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= diff --git a/receiver/jaegerreceiver/factory.go b/receiver/jaegerreceiver/factory.go index fb74f5577e0bb..fcbb7c3c9496a 100644 --- a/receiver/jaegerreceiver/factory.go +++ b/receiver/jaegerreceiver/factory.go @@ -25,6 +25,7 @@ import ( "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/config/confignet" "go.opentelemetry.io/collector/consumer" + "go.opentelemetry.io/collector/receiver" ) const ( @@ -45,11 +46,11 @@ const ( ) // NewFactory creates a new Jaeger receiver factory. -func NewFactory() component.ReceiverFactory { - return component.NewReceiverFactory( +func NewFactory() receiver.Factory { + return receiver.NewFactory( typeStr, createDefaultConfig, - component.WithTracesReceiver(createTracesReceiver, stability)) + receiver.WithTraces(createTracesReceiver, stability)) } // CreateDefaultConfig creates the default configuration for Jaeger receiver. @@ -81,10 +82,10 @@ func createDefaultConfig() component.Config { // createTracesReceiver creates a trace receiver based on provided config. func createTracesReceiver( _ context.Context, - set component.ReceiverCreateSettings, + set receiver.CreateSettings, cfg component.Config, nextConsumer consumer.Traces, -) (component.TracesReceiver, error) { +) (receiver.Traces, error) { // Convert settings in the source config to configuration struct // that Jaeger receiver understands. diff --git a/receiver/jaegerreceiver/factory_test.go b/receiver/jaegerreceiver/factory_test.go index e43d4f0e5d7d3..aa39e323021ea 100644 --- a/receiver/jaegerreceiver/factory_test.go +++ b/receiver/jaegerreceiver/factory_test.go @@ -28,6 +28,7 @@ import ( "go.opentelemetry.io/collector/config/confignet" "go.opentelemetry.io/collector/config/configtls" "go.opentelemetry.io/collector/confmap/confmaptest" + "go.opentelemetry.io/collector/receiver/receivertest" ) func TestTypeStr(t *testing.T) { @@ -53,7 +54,7 @@ func TestCreateReceiver(t *testing.T) { Transport: "tcp", }, } - set := componenttest.NewNopReceiverCreateSettings() + set := receivertest.NewNopCreateSettings() tReceiver, err := factory.CreateTracesReceiver(context.Background(), set, cfg, nil) assert.NoError(t, err, "receiver creation failed") assert.NotNil(t, tReceiver, "receiver creation failed") @@ -73,7 +74,7 @@ func TestCreateReceiverGeneralConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, component.UnmarshalConfig(sub, cfg)) - set := componenttest.NewNopReceiverCreateSettings() + set := receivertest.NewNopCreateSettings() tReceiver, err := factory.CreateTracesReceiver(context.Background(), set, cfg, nil) assert.NoError(t, err, "receiver creation failed") assert.NotNil(t, tReceiver, "receiver creation failed") @@ -94,7 +95,7 @@ func TestCreateDefaultGRPCEndpoint(t *testing.T) { Transport: "tcp", }, } - set := componenttest.NewNopReceiverCreateSettings() + set := receivertest.NewNopCreateSettings() r, err := factory.CreateTracesReceiver(context.Background(), set, cfg, nil) assert.NoError(t, err, "unexpected error creating receiver") @@ -117,7 +118,7 @@ func TestCreateTLSGPRCEndpoint(t *testing.T) { }, }, } - set := componenttest.NewNopReceiverCreateSettings() + set := receivertest.NewNopCreateSettings() _, err := factory.CreateTracesReceiver(context.Background(), set, cfg, nil) assert.NoError(t, err, "tls-enabled receiver creation failed") @@ -137,7 +138,7 @@ func TestCreateTLSThriftHTTPEndpoint(t *testing.T) { }, } - set := componenttest.NewNopReceiverCreateSettings() + set := receivertest.NewNopCreateSettings() _, err := factory.CreateTracesReceiver(context.Background(), set, cfg, nil) assert.NoError(t, err, "tls-enabled receiver creation failed") @@ -147,7 +148,7 @@ func TestCreateInvalidHTTPEndpoint(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() - set := componenttest.NewNopReceiverCreateSettings() + set := receivertest.NewNopCreateSettings() r, err := factory.CreateTracesReceiver(context.Background(), set, cfg, nil) assert.NoError(t, err, "unexpected error creating receiver") @@ -161,7 +162,7 @@ func TestCreateInvalidThriftBinaryEndpoint(t *testing.T) { cfg.(*Config).Protocols.ThriftBinary = &ProtocolUDP{ Endpoint: defaultThriftBinaryBindEndpoint, } - set := componenttest.NewNopReceiverCreateSettings() + set := receivertest.NewNopCreateSettings() r, err := factory.CreateTracesReceiver(context.Background(), set, cfg, nil) assert.NoError(t, err, "unexpected error creating receiver") @@ -175,7 +176,7 @@ func TestCreateInvalidThriftCompactEndpoint(t *testing.T) { cfg.(*Config).Protocols.ThriftCompact = &ProtocolUDP{ Endpoint: defaultThriftCompactBindEndpoint, } - set := componenttest.NewNopReceiverCreateSettings() + set := receivertest.NewNopCreateSettings() r, err := factory.CreateTracesReceiver(context.Background(), set, cfg, nil) assert.NoError(t, err, "unexpected error creating receiver") diff --git a/receiver/jaegerreceiver/go.mod b/receiver/jaegerreceiver/go.mod index 0778ad7abac21..a1f67af5684db 100644 --- a/receiver/jaegerreceiver/go.mod +++ b/receiver/jaegerreceiver/go.mod @@ -6,15 +6,15 @@ require ( github.com/apache/thrift v0.17.0 github.com/gorilla/mux v1.8.0 github.com/jaegertracing/jaeger v1.39.1-0.20221110195127-14c11365a856 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.66.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.67.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector v0.67.0 + go.opentelemetry.io/collector/component v0.67.0 + go.opentelemetry.io/collector/confmap v0.67.0 + go.opentelemetry.io/collector/consumer v0.67.0 + go.opentelemetry.io/collector/pdata v1.0.0-rc1 + go.opentelemetry.io/collector/semconv v0.67.0 go.uber.org/multierr v1.8.0 google.golang.org/grpc v1.51.0 ) @@ -39,14 +39,14 @@ require ( github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/mostynb/go-grpc-compression v1.1.17 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.66.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.67.0 // indirect github.com/opentracing/opentracing-go v1.2.0 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rs/cors v1.8.2 // indirect github.com/uber/jaeger-client-go v2.30.0+incompatible // indirect github.com/uber/jaeger-lib v2.4.1+incompatible // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/featuregate v0.67.0 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 // indirect go.opentelemetry.io/otel v1.11.1 // indirect diff --git a/receiver/jaegerreceiver/go.sum b/receiver/jaegerreceiver/go.sum index 66793e43e7998..c6283a260bd05 100644 --- a/receiver/jaegerreceiver/go.sum +++ b/receiver/jaegerreceiver/go.sum @@ -330,20 +330,20 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 h1:Q5L9Urod3c8as6ZYaoaqBjarx/HXxsxy34DFZIU2fO4= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/component v0.67.0 h1:GCBRZAqk4yNaT4L1uwlbbwophFHrxYccLZ4Uj1Ifs/M= +go.opentelemetry.io/collector/component v0.67.0/go.mod h1:Txa2lm9oe7xsGQN8u7GdUIrRpAHFIKsTO4Qi3/CSmKk= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= +go.opentelemetry.io/collector/semconv v0.67.0 h1:zLAvcQa6Kgow52FFLrmk7/9ZVtEYyA73+xDtCcFG78Q= +go.opentelemetry.io/collector/semconv v0.67.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4 h1:PRXhsszxTt5bbPriTjmaweWUsAnJYeWBhUMLRetUgBU= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4/go.mod h1:05eWWy6ZWzmpeImD3UowLTB3VjDMU1yxQ+ENuVWDM3c= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 h1:aUEBEdCa6iamGzg6fuYxDA8ThxvOG240mAvWDU+XLio= diff --git a/receiver/jaegerreceiver/jaeger_agent_test.go b/receiver/jaegerreceiver/jaeger_agent_test.go index 03fd1b19ffba1..cfabbda4ff1b7 100644 --- a/receiver/jaegerreceiver/jaeger_agent_test.go +++ b/receiver/jaegerreceiver/jaeger_agent_test.go @@ -35,6 +35,7 @@ import ( "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/consumer/consumertest" "go.opentelemetry.io/collector/pdata/ptrace" + "go.opentelemetry.io/collector/receiver/receivertest" conventions "go.opentelemetry.io/collector/semconv/v1.6.1" "google.golang.org/grpc" @@ -61,7 +62,7 @@ func TestJaegerAgentUDP_ThriftCompact_InvalidPort(t *testing.T) { ServerConfigUDP: DefaultServerConfigUDP(), }, } - set := componenttest.NewNopReceiverCreateSettings() + set := receivertest.NewNopCreateSettings() jr, err := newJaegerReceiver(jaegerAgent, config, nil, set) require.NoError(t, err) @@ -90,7 +91,7 @@ func TestJaegerAgentUDP_ThriftBinary_PortInUse(t *testing.T) { ServerConfigUDP: DefaultServerConfigUDP(), }, } - set := componenttest.NewNopReceiverCreateSettings() + set := receivertest.NewNopCreateSettings() jr, err := newJaegerReceiver(jaegerAgent, config, nil, set) require.NoError(t, err) @@ -112,7 +113,7 @@ func TestJaegerAgentUDP_ThriftBinary_InvalidPort(t *testing.T) { ServerConfigUDP: DefaultServerConfigUDP(), }, } - set := componenttest.NewNopReceiverCreateSettings() + set := receivertest.NewNopCreateSettings() jr, err := newJaegerReceiver(jaegerAgent, config, nil, set) require.NoError(t, err) @@ -150,7 +151,7 @@ func TestJaegerHTTP(t *testing.T) { config := &configuration{ AgentHTTPEndpoint: endpoint, } - set := componenttest.NewNopReceiverCreateSettings() + set := receivertest.NewNopCreateSettings() jr, err := newJaegerReceiver(jaegerAgent, config, nil, set) require.NoError(t, err) t.Cleanup(func() { require.NoError(t, jr.Shutdown(context.Background())) }) @@ -180,7 +181,7 @@ func TestJaegerHTTP(t *testing.T) { func testJaegerAgent(t *testing.T, agentEndpoint string, receiverConfig *configuration) { // 1. Create the Jaeger receiver aka "server" sink := new(consumertest.TracesSink) - set := componenttest.NewNopReceiverCreateSettings() + set := receivertest.NewNopCreateSettings() jr, err := newJaegerReceiver(jaegerAgent, receiverConfig, sink, set) require.NoError(t, err) t.Cleanup(func() { require.NoError(t, jr.Shutdown(context.Background())) }) diff --git a/receiver/jaegerreceiver/trace_receiver.go b/receiver/jaegerreceiver/trace_receiver.go index ee07ac2e359eb..fdb5d541f8da6 100644 --- a/receiver/jaegerreceiver/trace_receiver.go +++ b/receiver/jaegerreceiver/trace_receiver.go @@ -44,6 +44,7 @@ import ( "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/obsreport" + "go.opentelemetry.io/collector/receiver" "go.uber.org/multierr" "google.golang.org/grpc" @@ -77,7 +78,7 @@ type jReceiver struct { goroutines sync.WaitGroup - settings component.ReceiverCreateSettings + settings receiver.CreateSettings grpcObsrecv *obsreport.Receiver httpObsrecv *obsreport.Receiver @@ -106,7 +107,7 @@ func newJaegerReceiver( id component.ID, config *configuration, nextConsumer consumer.Traces, - set component.ReceiverCreateSettings, + set receiver.CreateSettings, ) (*jReceiver, error) { grpcObsrecv, err := obsreport.NewReceiver(obsreport.ReceiverSettings{ ReceiverID: id, diff --git a/receiver/jaegerreceiver/trace_receiver_test.go b/receiver/jaegerreceiver/trace_receiver_test.go index c1d9a4bc3221b..67c1046000b9e 100644 --- a/receiver/jaegerreceiver/trace_receiver_test.go +++ b/receiver/jaegerreceiver/trace_receiver_test.go @@ -42,6 +42,7 @@ import ( "go.opentelemetry.io/collector/consumer/consumertest" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/ptrace" + "go.opentelemetry.io/collector/receiver/receivertest" conventions "go.opentelemetry.io/collector/semconv/v1.6.1" "google.golang.org/grpc" "google.golang.org/grpc/credentials" @@ -54,7 +55,7 @@ import ( var jaegerReceiver = component.NewIDWithName("jaeger", "receiver_test") func TestTraceSource(t *testing.T) { - set := componenttest.NewNopReceiverCreateSettings() + set := receivertest.NewNopCreateSettings() jr, err := newJaegerReceiver(jaegerReceiver, &configuration{}, nil, set) require.NoError(t, err) require.NotNil(t, jr) @@ -94,7 +95,7 @@ func TestReception(t *testing.T) { } sink := new(consumertest.TracesSink) - set := componenttest.NewNopReceiverCreateSettings() + set := receivertest.NewNopCreateSettings() jr, err := newJaegerReceiver(jaegerReceiver, config, sink, set) require.NoError(t, err) @@ -125,7 +126,7 @@ func TestPortsNotOpen(t *testing.T) { sink := new(consumertest.TracesSink) - set := componenttest.NewNopReceiverCreateSettings() + set := receivertest.NewNopCreateSettings() jr, err := newJaegerReceiver(jaegerReceiver, config, sink, set) require.NoError(t, err) @@ -160,7 +161,7 @@ func TestGRPCReception(t *testing.T) { } sink := new(consumertest.TracesSink) - set := componenttest.NewNopReceiverCreateSettings() + set := receivertest.NewNopCreateSettings() jr, err := newJaegerReceiver(jaegerReceiver, config, sink, set) require.NoError(t, err) @@ -218,7 +219,7 @@ func TestGRPCReceptionWithTLS(t *testing.T) { } sink := new(consumertest.TracesSink) - set := componenttest.NewNopReceiverCreateSettings() + set := receivertest.NewNopCreateSettings() jr, err := newJaegerReceiver(jaegerReceiver, config, sink, set) require.NoError(t, err) @@ -354,7 +355,7 @@ func TestSampling(t *testing.T) { } sink := new(consumertest.TracesSink) - set := componenttest.NewNopReceiverCreateSettings() + set := receivertest.NewNopCreateSettings() jr, err := newJaegerReceiver(jaegerReceiver, config, sink, set) require.NoError(t, err) diff --git a/receiver/jmxreceiver/factory.go b/receiver/jmxreceiver/factory.go index 33b430ccae37d..4c9a85a1e366d 100644 --- a/receiver/jmxreceiver/factory.go +++ b/receiver/jmxreceiver/factory.go @@ -22,6 +22,7 @@ import ( "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/exporter/exporterhelper" + "go.opentelemetry.io/collector/receiver" ) const ( @@ -30,11 +31,11 @@ const ( otlpEndpoint = "0.0.0.0:0" ) -func NewFactory() component.ReceiverFactory { - return component.NewReceiverFactory( +func NewFactory() receiver.Factory { + return receiver.NewFactory( typeStr, createDefaultConfig, - component.WithMetricsReceiver(createReceiver, stability)) + receiver.WithMetrics(createReceiver, stability)) } func createDefaultConfig() component.Config { @@ -53,10 +54,10 @@ func createDefaultConfig() component.Config { func createReceiver( _ context.Context, - params component.ReceiverCreateSettings, + params receiver.CreateSettings, cfg component.Config, consumer consumer.Metrics, -) (component.MetricsReceiver, error) { +) (receiver.Metrics, error) { jmxConfig := cfg.(*Config) if err := jmxConfig.Validate(); err != nil { return nil, err diff --git a/receiver/jmxreceiver/factory_test.go b/receiver/jmxreceiver/factory_test.go index 99943a6cc0103..65d02811d752c 100644 --- a/receiver/jmxreceiver/factory_test.go +++ b/receiver/jmxreceiver/factory_test.go @@ -21,8 +21,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/consumer/consumertest" + "go.opentelemetry.io/collector/receiver/receivertest" ) func TestWithInvalidConfig(t *testing.T) { @@ -34,7 +34,7 @@ func TestWithInvalidConfig(t *testing.T) { r, err := f.CreateMetricsReceiver( context.Background(), - componenttest.NewNopReceiverCreateSettings(), + receivertest.NewNopCreateSettings(), cfg, consumertest.NewNop(), ) require.Error(t, err) @@ -54,7 +54,7 @@ func TestWithValidConfig(t *testing.T) { cfg.(*Config).JARPath = "testdata/fake_jmx.jar" cfg.(*Config).TargetSystem = "jvm" - params := componenttest.NewNopReceiverCreateSettings() + params := receivertest.NewNopCreateSettings() r, err := f.CreateMetricsReceiver(context.Background(), params, cfg, consumertest.NewNop()) require.NoError(t, err) require.NotNil(t, r) diff --git a/receiver/jmxreceiver/go.mod b/receiver/jmxreceiver/go.mod index 27edf04767cbf..dfa92e466b94e 100644 --- a/receiver/jmxreceiver/go.mod +++ b/receiver/jmxreceiver/go.mod @@ -3,16 +3,16 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jmxrec go 1.18 require ( - github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.66.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.67.0 github.com/shirou/gopsutil/v3 v3.22.10 github.com/stretchr/testify v1.8.1 github.com/testcontainers/testcontainers-go v0.15.0 - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/receiver/otlpreceiver v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector v0.67.0 + go.opentelemetry.io/collector/component v0.67.0 + go.opentelemetry.io/collector/confmap v0.67.0 + go.opentelemetry.io/collector/consumer v0.67.0 + go.opentelemetry.io/collector/pdata v1.0.0-rc1 + go.opentelemetry.io/collector/receiver/otlpreceiver v0.67.0 go.uber.org/atomic v1.10.0 go.uber.org/zap v1.24.0 ) @@ -68,7 +68,7 @@ require ( github.com/tklauser/numcpus v0.6.0 // indirect github.com/yusufpapurcu/wmi v1.2.2 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/featuregate v0.67.0 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 // indirect go.opentelemetry.io/otel v1.11.1 // indirect diff --git a/receiver/jmxreceiver/go.sum b/receiver/jmxreceiver/go.sum index b7a4909dad85d..59101c5b00b0c 100644 --- a/receiver/jmxreceiver/go.sum +++ b/receiver/jmxreceiver/go.sum @@ -857,21 +857,21 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.66.1-0.20221202005155-1c54042beb70 h1:KBbbPVDV7o5w857g6ePphdu4MV87jrcQevFYDA1okUk= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:0Py8RNjNiFRH6/F+vM2uptdaw9hMj1FBdv0ySntM2gE= -go.opentelemetry.io/collector/semconv v0.66.0 h1:gz4fYzOVOt1EQCcOL6pbSmTRj93pZErjHD+H100pH+4= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/component v0.67.0 h1:GCBRZAqk4yNaT4L1uwlbbwophFHrxYccLZ4Uj1Ifs/M= +go.opentelemetry.io/collector/component v0.67.0/go.mod h1:Txa2lm9oe7xsGQN8u7GdUIrRpAHFIKsTO4Qi3/CSmKk= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.67.0 h1:pMluLYSSAH7n8zkPWYkWGY/pALrVxG9rHX8J/WDrcx0= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.67.0/go.mod h1:GIJc0eu4N2oJB420N3NhSFJ1IhAgCwvlTCMGWxKhXgg= +go.opentelemetry.io/collector/semconv v0.67.0 h1:zLAvcQa6Kgow52FFLrmk7/9ZVtEYyA73+xDtCcFG78Q= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4 h1:PRXhsszxTt5bbPriTjmaweWUsAnJYeWBhUMLRetUgBU= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4/go.mod h1:05eWWy6ZWzmpeImD3UowLTB3VjDMU1yxQ+ENuVWDM3c= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 h1:aUEBEdCa6iamGzg6fuYxDA8ThxvOG240mAvWDU+XLio= diff --git a/receiver/jmxreceiver/integration_test.go b/receiver/jmxreceiver/integration_test.go index 528e59663192d..ed923a51fdb30 100644 --- a/receiver/jmxreceiver/integration_test.go +++ b/receiver/jmxreceiver/integration_test.go @@ -35,6 +35,7 @@ import ( "go.opentelemetry.io/collector/consumer/consumertest" "go.opentelemetry.io/collector/exporter/exporterhelper" "go.opentelemetry.io/collector/pdata/pmetric" + "go.opentelemetry.io/collector/receiver/receivertest" "go.uber.org/zap" "go.uber.org/zap/zaptest/observer" ) @@ -149,7 +150,7 @@ func (suite *JMXIntegrationSuite) TestJMXReceiverHappyPath() { defer getLogsOnFailure(t, logObserver) logger := zap.New(logCore) - params := componenttest.NewNopReceiverCreateSettings() + params := receivertest.NewNopCreateSettings() params.Logger = logger cfg := &Config{ @@ -238,7 +239,7 @@ func (suite *JMXIntegrationSuite) TestJMXReceiverHappyPath() { } func TestJMXReceiverInvalidOTLPEndpointIntegration(t *testing.T) { - params := componenttest.NewNopReceiverCreateSettings() + params := receivertest.NewNopCreateSettings() cfg := &Config{ CollectionInterval: 100 * time.Millisecond, Endpoint: fmt.Sprintf("service:jmx:rmi:///jndi/rmi://localhost:7199/jmxrmi"), diff --git a/receiver/jmxreceiver/receiver.go b/receiver/jmxreceiver/receiver.go index 9d326430b8e69..0f3c7349fad7c 100644 --- a/receiver/jmxreceiver/receiver.go +++ b/receiver/jmxreceiver/receiver.go @@ -27,6 +27,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config/confignet" "go.opentelemetry.io/collector/consumer" + "go.opentelemetry.io/collector/receiver" "go.opentelemetry.io/collector/receiver/otlpreceiver" "go.uber.org/zap" @@ -36,20 +37,20 @@ import ( // jmxMainClass the class containing the main function for the JMX Metric Gatherer JAR const jmxMainClass = "io.opentelemetry.contrib.jmxmetrics.JmxMetrics" -var _ component.MetricsReceiver = (*jmxMetricReceiver)(nil) +var _ receiver.Metrics = (*jmxMetricReceiver)(nil) type jmxMetricReceiver struct { logger *zap.Logger config *Config subprocess *subprocess.Subprocess - params component.ReceiverCreateSettings - otlpReceiver component.MetricsReceiver + params receiver.CreateSettings + otlpReceiver receiver.Metrics nextConsumer consumer.Metrics configFile string } func newJMXMetricReceiver( - params component.ReceiverCreateSettings, + params receiver.CreateSettings, config *Config, nextConsumer consumer.Metrics, ) *jmxMetricReceiver { @@ -131,7 +132,7 @@ func (jmx *jmxMetricReceiver) Shutdown(ctx context.Context) error { return removeErr } -func (jmx *jmxMetricReceiver) buildOTLPReceiver() (component.MetricsReceiver, error) { +func (jmx *jmxMetricReceiver) buildOTLPReceiver() (receiver.Metrics, error) { endpoint := jmx.config.OTLPExporterConfig.Endpoint host, port, err := net.SplitHostPort(endpoint) if err != nil { diff --git a/receiver/jmxreceiver/receiver_test.go b/receiver/jmxreceiver/receiver_test.go index 735e0e8d3040f..25960c9b8c930 100644 --- a/receiver/jmxreceiver/receiver_test.go +++ b/receiver/jmxreceiver/receiver_test.go @@ -23,12 +23,13 @@ import ( "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/consumer/consumertest" "go.opentelemetry.io/collector/exporter/exporterhelper" + "go.opentelemetry.io/collector/receiver/receivertest" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/common/testutil" ) func TestReceiver(t *testing.T) { - params := componenttest.NewNopReceiverCreateSettings() + params := receivertest.NewNopCreateSettings() config := &Config{ Endpoint: "service:jmx:protocol:sap", OTLPExporterConfig: otlpExporterConfig{ @@ -156,7 +157,7 @@ otel.resource.attributes = abc=123,one=two`, for _, test := range tests { t.Run(test.name, func(tt *testing.T) { - params := componenttest.NewNopReceiverCreateSettings() + params := receivertest.NewNopCreateSettings() receiver := newJMXMetricReceiver(params, &test.config, consumertest.NewNop()) jmxConfig, err := receiver.buildJMXMetricGathererConfig() if test.expectedError == "" { @@ -189,7 +190,7 @@ func TestBuildOTLPReceiverInvalidEndpoints(t *testing.T) { } for _, test := range tests { t.Run(test.name, func(tt *testing.T) { - params := componenttest.NewNopReceiverCreateSettings() + params := receivertest.NewNopCreateSettings() jmxReceiver := newJMXMetricReceiver(params, &test.config, consumertest.NewNop()) otlpReceiver, err := jmxReceiver.buildOTLPReceiver() require.Error(t, err) diff --git a/receiver/journaldreceiver/go.mod b/receiver/journaldreceiver/go.mod index 0afc8c97dc059..8c6f794f62aaa 100644 --- a/receiver/journaldreceiver/go.mod +++ b/receiver/journaldreceiver/go.mod @@ -3,12 +3,12 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/receiver/journa go 1.18 require ( - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.66.0 + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.67.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector v0.67.0 + go.opentelemetry.io/collector/component v0.67.0 + go.opentelemetry.io/collector/confmap v0.67.0 + go.opentelemetry.io/collector/consumer v0.67.0 ) require ( @@ -30,8 +30,8 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rogpeppe/go-internal v1.8.1 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/featuregate v0.67.0 // indirect + go.opentelemetry.io/collector/pdata v1.0.0-rc1 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/receiver/journaldreceiver/go.sum b/receiver/journaldreceiver/go.sum index 5b92a495aa8b4..e22b023959628 100644 --- a/receiver/journaldreceiver/go.sum +++ b/receiver/journaldreceiver/go.sum @@ -305,18 +305,18 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/component v0.67.0 h1:GCBRZAqk4yNaT4L1uwlbbwophFHrxYccLZ4Uj1Ifs/M= +go.opentelemetry.io/collector/component v0.67.0/go.mod h1:Txa2lm9oe7xsGQN8u7GdUIrRpAHFIKsTO4Qi3/CSmKk= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/receiver/journaldreceiver/journald.go b/receiver/journaldreceiver/journald.go index fba2c2777db52..a6b7842b08f05 100644 --- a/receiver/journaldreceiver/journald.go +++ b/receiver/journaldreceiver/journald.go @@ -20,6 +20,7 @@ package journaldreceiver // import "github.com/open-telemetry/opentelemetry-coll import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" + "go.opentelemetry.io/collector/receiver" "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/adapter" "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/operator" @@ -32,7 +33,7 @@ const ( ) // NewFactory creates a factory for journald receiver -func NewFactory() component.ReceiverFactory { +func NewFactory() receiver.Factory { return adapter.NewFactory(ReceiverType{}, stability) } diff --git a/receiver/journaldreceiver/journald_nonlinux.go b/receiver/journaldreceiver/journald_nonlinux.go index dbb370cfffb1e..55093cfdb7139 100644 --- a/receiver/journaldreceiver/journald_nonlinux.go +++ b/receiver/journaldreceiver/journald_nonlinux.go @@ -24,6 +24,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer" + "go.opentelemetry.io/collector/receiver" "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/adapter" "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/operator" @@ -35,11 +36,11 @@ const ( ) // NewFactory creates a dummy factory. -func NewFactory() component.ReceiverFactory { - return component.NewReceiverFactory( +func NewFactory() receiver.Factory { + return receiver.NewFactory( typeStr, createDefaultConfig, - component.WithLogsReceiver(createLogsReceiver, stability)) + receiver.WithLogs(createLogsReceiver, stability)) } type JournaldConfig struct { @@ -57,9 +58,9 @@ func createDefaultConfig() component.Config { func createLogsReceiver( _ context.Context, - params component.ReceiverCreateSettings, + params receiver.CreateSettings, cfg component.Config, consumer consumer.Logs, -) (component.LogsReceiver, error) { +) (receiver.Logs, error) { return nil, fmt.Errorf("journald is only supported on linux") } diff --git a/receiver/journaldreceiver/journald_test.go b/receiver/journaldreceiver/journald_test.go index 36da727cebfe9..c44722491f0b7 100644 --- a/receiver/journaldreceiver/journald_test.go +++ b/receiver/journaldreceiver/journald_test.go @@ -25,10 +25,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/confmap/confmaptest" "go.opentelemetry.io/collector/consumer/consumertest" + "go.opentelemetry.io/collector/receiver/receivertest" "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/adapter" "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/operator" @@ -62,7 +62,7 @@ func TestInputConfigFailure(t *testing.T) { return *c }(), } - receiver, err := factory.CreateLogsReceiver(context.Background(), componenttest.NewNopReceiverCreateSettings(), badCfg, sink) + receiver, err := factory.CreateLogsReceiver(context.Background(), receivertest.NewNopCreateSettings(), badCfg, sink) require.Error(t, err, "receiver creation should fail if input config isn't valid") require.Nil(t, receiver, "receiver creation should fail if input config isn't valid") } diff --git a/receiver/k8sclusterreceiver/factory.go b/receiver/k8sclusterreceiver/factory.go index f02920e408d22..a1cb041fcff6b 100644 --- a/receiver/k8sclusterreceiver/factory.go +++ b/receiver/k8sclusterreceiver/factory.go @@ -19,6 +19,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" + "go.opentelemetry.io/collector/receiver" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig" ) @@ -53,9 +54,9 @@ func createDefaultConfig() component.Config { } // NewFactory creates a factory for k8s_cluster receiver. -func NewFactory() component.ReceiverFactory { - return component.NewReceiverFactory( +func NewFactory() receiver.Factory { + return receiver.NewFactory( typeStr, createDefaultConfig, - component.WithMetricsReceiver(newReceiver, stability)) + receiver.WithMetrics(newReceiver, stability)) } diff --git a/receiver/k8sclusterreceiver/factory_test.go b/receiver/k8sclusterreceiver/factory_test.go index 3bf8810064c50..76092b0154e62 100644 --- a/receiver/k8sclusterreceiver/factory_test.go +++ b/receiver/k8sclusterreceiver/factory_test.go @@ -26,6 +26,7 @@ import ( "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer/consumertest" + "go.opentelemetry.io/collector/receiver/receivertest" "k8s.io/client-go/kubernetes" "k8s.io/client-go/kubernetes/fake" @@ -51,7 +52,7 @@ func TestFactory(t *testing.T) { }, rCfg) r, err := f.CreateTracesReceiver( - context.Background(), componenttest.NewNopReceiverCreateSettings(), + context.Background(), receivertest.NewNopCreateSettings(), &config.ReceiverSettings{}, consumertest.NewNop(), ) require.Error(t, err) @@ -92,7 +93,7 @@ func TestFactoryDistributions(t *testing.T) { } func newTestReceiver(t *testing.T, cfg *Config) *kubernetesReceiver { - r, err := newReceiver(context.Background(), componenttest.NewNopReceiverCreateSettings(), cfg, consumertest.NewNop()) + r, err := newReceiver(context.Background(), receivertest.NewNopCreateSettings(), cfg, consumertest.NewNop()) require.NoError(t, err) require.NotNil(t, r) rcvr, ok := r.(*kubernetesReceiver) diff --git a/receiver/k8sclusterreceiver/go.mod b/receiver/k8sclusterreceiver/go.mod index 2e1f010cd13d4..8599e335283bf 100644 --- a/receiver/k8sclusterreceiver/go.mod +++ b/receiver/k8sclusterreceiver/go.mod @@ -5,19 +5,19 @@ go 1.18 require ( github.com/census-instrumentation/opencensus-proto v0.4.1 github.com/iancoleman/strcase v0.2.0 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/experimentalmetricmetadata v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.66.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/experimentalmetricmetadata v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.67.0 github.com/openshift/api v0.0.0-20210521075222-e273a339932a github.com/openshift/client-go v0.0.0-20210521082421-73d9475a9142 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector v0.67.0 + go.opentelemetry.io/collector/component v0.67.0 + go.opentelemetry.io/collector/confmap v0.67.0 + go.opentelemetry.io/collector/consumer v0.67.0 + go.opentelemetry.io/collector/pdata v1.0.0-rc1 + go.opentelemetry.io/collector/semconv v0.67.0 go.uber.org/atomic v1.10.0 go.uber.org/zap v1.24.0 google.golang.org/protobuf v1.28.1 @@ -61,7 +61,7 @@ require ( github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.66.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.67.0 // indirect github.com/pkg/errors v0.9.1 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/prometheus/client_golang v1.14.0 // indirect @@ -71,7 +71,7 @@ require ( github.com/prometheus/statsd_exporter v0.22.7 // indirect github.com/spf13/pflag v1.0.5 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/featuregate v0.67.0 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.33.0 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect diff --git a/receiver/k8sclusterreceiver/go.sum b/receiver/k8sclusterreceiver/go.sum index b4ec11f34bfbe..d652bb44411e0 100644 --- a/receiver/k8sclusterreceiver/go.sum +++ b/receiver/k8sclusterreceiver/go.sum @@ -469,20 +469,20 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 h1:Q5L9Urod3c8as6ZYaoaqBjarx/HXxsxy34DFZIU2fO4= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/component v0.67.0 h1:GCBRZAqk4yNaT4L1uwlbbwophFHrxYccLZ4Uj1Ifs/M= +go.opentelemetry.io/collector/component v0.67.0/go.mod h1:Txa2lm9oe7xsGQN8u7GdUIrRpAHFIKsTO4Qi3/CSmKk= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= +go.opentelemetry.io/collector/semconv v0.67.0 h1:zLAvcQa6Kgow52FFLrmk7/9ZVtEYyA73+xDtCcFG78Q= +go.opentelemetry.io/collector/semconv v0.67.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/receiver/k8sclusterreceiver/receiver.go b/receiver/k8sclusterreceiver/receiver.go index 6414eede3d4a1..274b20ce692f0 100644 --- a/receiver/k8sclusterreceiver/receiver.go +++ b/receiver/k8sclusterreceiver/receiver.go @@ -22,6 +22,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/obsreport" + "go.opentelemetry.io/collector/receiver" ) const ( @@ -30,13 +31,13 @@ const ( defaultInitialSyncTimeout = 10 * time.Minute ) -var _ component.MetricsReceiver = (*kubernetesReceiver)(nil) +var _ receiver.Metrics = (*kubernetesReceiver)(nil) type kubernetesReceiver struct { resourceWatcher *resourceWatcher config *Config - settings component.ReceiverCreateSettings + settings receiver.CreateSettings consumer consumer.Metrics cancel context.CancelFunc obsrecv *obsreport.Receiver @@ -113,7 +114,7 @@ func (kr *kubernetesReceiver) dispatchMetrics(ctx context.Context) { } // newReceiver creates the Kubernetes cluster receiver with the given configuration. -func newReceiver(_ context.Context, set component.ReceiverCreateSettings, cfg component.Config, consumer consumer.Metrics) (component.MetricsReceiver, error) { +func newReceiver(_ context.Context, set receiver.CreateSettings, cfg component.Config, consumer consumer.Metrics) (receiver.Metrics, error) { rCfg := cfg.(*Config) obsrecv, err := obsreport.NewReceiver(obsreport.ReceiverSettings{ diff --git a/receiver/k8seventsreceiver/factory.go b/receiver/k8seventsreceiver/factory.go index 92c626690e9aa..c2e5dc662c37b 100644 --- a/receiver/k8seventsreceiver/factory.go +++ b/receiver/k8seventsreceiver/factory.go @@ -20,6 +20,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer" + "go.opentelemetry.io/collector/receiver" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig" ) @@ -32,11 +33,11 @@ const ( ) // NewFactory creates a factory for k8s_cluster receiver. -func NewFactory() component.ReceiverFactory { - return component.NewReceiverFactory( +func NewFactory() receiver.Factory { + return receiver.NewFactory( typeStr, createDefaultConfig, - component.WithLogsReceiver(createLogsReceiver, stability)) + receiver.WithLogs(createLogsReceiver, stability)) } func createDefaultConfig() component.Config { @@ -50,10 +51,10 @@ func createDefaultConfig() component.Config { func createLogsReceiver( _ context.Context, - params component.ReceiverCreateSettings, + params receiver.CreateSettings, cfg component.Config, consumer consumer.Logs, -) (component.LogsReceiver, error) { +) (receiver.Logs, error) { rCfg := cfg.(*Config) k8sInterface, err := rCfg.getK8sClient() diff --git a/receiver/k8seventsreceiver/factory_test.go b/receiver/k8seventsreceiver/factory_test.go index 825efea5bfd0b..fd48c328f3320 100644 --- a/receiver/k8seventsreceiver/factory_test.go +++ b/receiver/k8seventsreceiver/factory_test.go @@ -21,9 +21,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer/consumertest" + "go.opentelemetry.io/collector/receiver/receivertest" k8s "k8s.io/client-go/kubernetes" "k8s.io/client-go/kubernetes/fake" @@ -52,7 +52,7 @@ func TestCreateReceiver(t *testing.T) { // Fails with bad K8s Config. r, err := createLogsReceiver( - context.Background(), componenttest.NewNopReceiverCreateSettings(), + context.Background(), receivertest.NewNopCreateSettings(), rCfg, consumertest.NewNop(), ) assert.Error(t, err) @@ -64,7 +64,7 @@ func TestCreateReceiver(t *testing.T) { } r, err = createLogsReceiver( context.Background(), - componenttest.NewNopReceiverCreateSettings(), + receivertest.NewNopCreateSettings(), rCfg, consumertest.NewNop(), ) assert.NoError(t, err) diff --git a/receiver/k8seventsreceiver/go.mod b/receiver/k8seventsreceiver/go.mod index d3472a6897959..69428cd1f2dd3 100644 --- a/receiver/k8seventsreceiver/go.mod +++ b/receiver/k8seventsreceiver/go.mod @@ -3,14 +3,14 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8seve go 1.18 require ( - github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.66.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.67.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector v0.67.0 + go.opentelemetry.io/collector/component v0.67.0 + go.opentelemetry.io/collector/confmap v0.67.0 + go.opentelemetry.io/collector/consumer v0.67.0 + go.opentelemetry.io/collector/pdata v1.0.0-rc1 + go.opentelemetry.io/collector/semconv v0.67.0 go.uber.org/zap v1.24.0 k8s.io/api v0.25.4 k8s.io/apimachinery v0.25.4 @@ -52,7 +52,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/spf13/pflag v1.0.5 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/featuregate v0.67.0 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/receiver/k8seventsreceiver/go.sum b/receiver/k8seventsreceiver/go.sum index 6cf2b74aa0b65..38a328737b719 100644 --- a/receiver/k8seventsreceiver/go.sum +++ b/receiver/k8seventsreceiver/go.sum @@ -450,20 +450,20 @@ go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 h1:Q5L9Urod3c8as6ZYaoaqBjarx/HXxsxy34DFZIU2fO4= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/component v0.67.0 h1:GCBRZAqk4yNaT4L1uwlbbwophFHrxYccLZ4Uj1Ifs/M= +go.opentelemetry.io/collector/component v0.67.0/go.mod h1:Txa2lm9oe7xsGQN8u7GdUIrRpAHFIKsTO4Qi3/CSmKk= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= +go.opentelemetry.io/collector/semconv v0.67.0 h1:zLAvcQa6Kgow52FFLrmk7/9ZVtEYyA73+xDtCcFG78Q= +go.opentelemetry.io/collector/semconv v0.67.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/receiver/k8seventsreceiver/receiver.go b/receiver/k8seventsreceiver/receiver.go index 4f5027027de45..dee74b393904d 100644 --- a/receiver/k8seventsreceiver/receiver.go +++ b/receiver/k8seventsreceiver/receiver.go @@ -21,6 +21,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/obsreport" + "go.opentelemetry.io/collector/receiver" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/fields" k8s "k8s.io/client-go/kubernetes" @@ -29,7 +30,7 @@ import ( type k8seventsReceiver struct { config *Config - settings component.ReceiverCreateSettings + settings receiver.CreateSettings client k8s.Interface logsConsumer consumer.Logs stopperChanList []chan struct{} @@ -41,11 +42,11 @@ type k8seventsReceiver struct { // newReceiver creates the Kubernetes events receiver with the given configuration. func newReceiver( - set component.ReceiverCreateSettings, + set receiver.CreateSettings, config *Config, consumer consumer.Logs, client k8s.Interface, -) (component.LogsReceiver, error) { +) (receiver.Logs, error) { transport := "http" obsrecv, err := obsreport.NewReceiver(obsreport.ReceiverSettings{ diff --git a/receiver/k8seventsreceiver/receiver_test.go b/receiver/k8seventsreceiver/receiver_test.go index 1e937119c3b34..6fe8cc0f25c67 100644 --- a/receiver/k8seventsreceiver/receiver_test.go +++ b/receiver/k8seventsreceiver/receiver_test.go @@ -23,6 +23,7 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/consumer/consumertest" + "go.opentelemetry.io/collector/receiver/receivertest" corev1 "k8s.io/api/core/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" @@ -33,7 +34,7 @@ func TestNewReceiver(t *testing.T) { rCfg := createDefaultConfig().(*Config) client := fake.NewSimpleClientset() r, err := newReceiver( - componenttest.NewNopReceiverCreateSettings(), + receivertest.NewNopCreateSettings(), rCfg, consumertest.NewNop(), client, @@ -46,7 +47,7 @@ func TestNewReceiver(t *testing.T) { rCfg.Namespaces = []string{"test", "another_test"} r1, err := newReceiver( - componenttest.NewNopReceiverCreateSettings(), + receivertest.NewNopCreateSettings(), rCfg, consumertest.NewNop(), client, @@ -63,7 +64,7 @@ func TestHandleEvent(t *testing.T) { client := fake.NewSimpleClientset() sink := new(consumertest.LogsSink) r, err := newReceiver( - componenttest.NewNopReceiverCreateSettings(), + receivertest.NewNopCreateSettings(), rCfg, sink, client, @@ -83,7 +84,7 @@ func TestDropEventsOlderThanStartupTime(t *testing.T) { client := fake.NewSimpleClientset() sink := new(consumertest.LogsSink) r, err := newReceiver( - componenttest.NewNopReceiverCreateSettings(), + receivertest.NewNopCreateSettings(), rCfg, sink, client, @@ -120,7 +121,7 @@ func TestAllowEvent(t *testing.T) { rCfg := createDefaultConfig().(*Config) client := fake.NewSimpleClientset() r, err := newReceiver( - componenttest.NewNopReceiverCreateSettings(), + receivertest.NewNopCreateSettings(), rCfg, consumertest.NewNop(), client, diff --git a/receiver/k8sobjectsreceiver/factory.go b/receiver/k8sobjectsreceiver/factory.go index b07101c3d16df..0406d0152ac42 100644 --- a/receiver/k8sobjectsreceiver/factory.go +++ b/receiver/k8sobjectsreceiver/factory.go @@ -20,6 +20,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer" + "go.opentelemetry.io/collector/receiver" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig" ) @@ -29,11 +30,11 @@ const ( stability = component.StabilityLevelAlpha ) -func NewFactory() component.ReceiverFactory { - return component.NewReceiverFactory( +func NewFactory() receiver.Factory { + return receiver.NewFactory( typeStr, createDefaultConfig, - component.WithLogsReceiver( + receiver.WithLogs( createLogsReceiver, stability, ), @@ -51,10 +52,10 @@ func createDefaultConfig() component.Config { func createLogsReceiver( _ context.Context, - params component.ReceiverCreateSettings, + params receiver.CreateSettings, cfg component.Config, consumer consumer.Logs, -) (component.LogsReceiver, error) { +) (receiver.Logs, error) { rcfg := cfg.(*Config) return newReceiver(params, rcfg, consumer) } diff --git a/receiver/k8sobjectsreceiver/factory_test.go b/receiver/k8sobjectsreceiver/factory_test.go index dbd0b199b8428..a4764bc7188f6 100644 --- a/receiver/k8sobjectsreceiver/factory_test.go +++ b/receiver/k8sobjectsreceiver/factory_test.go @@ -21,9 +21,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer/consumertest" + "go.opentelemetry.io/collector/receiver/receivertest" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig" ) @@ -52,7 +52,7 @@ func TestCreateReceiver(t *testing.T) { // Fails with bad K8s Config. r, err := createLogsReceiver( - context.Background(), componenttest.NewNopReceiverCreateSettings(), + context.Background(), receivertest.NewNopCreateSettings(), rCfg, consumertest.NewNop(), ) assert.Error(t, err) @@ -63,7 +63,7 @@ func TestCreateReceiver(t *testing.T) { r, err = createLogsReceiver( context.Background(), - componenttest.NewNopReceiverCreateSettings(), + receivertest.NewNopCreateSettings(), rCfg, consumertest.NewNop(), ) assert.NoError(t, err) diff --git a/receiver/k8sobjectsreceiver/go.mod b/receiver/k8sobjectsreceiver/go.mod index 122a5529a8d7f..9066571adf5c9 100644 --- a/receiver/k8sobjectsreceiver/go.mod +++ b/receiver/k8sobjectsreceiver/go.mod @@ -3,14 +3,14 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8sobj go 1.18 require ( - github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.66.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.67.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector v0.67.0 + go.opentelemetry.io/collector/component v0.67.0 + go.opentelemetry.io/collector/confmap v0.67.0 + go.opentelemetry.io/collector/consumer v0.67.0 + go.opentelemetry.io/collector/pdata v1.0.0-rc1 + go.opentelemetry.io/collector/semconv v0.67.0 go.uber.org/zap v1.24.0 k8s.io/apimachinery v0.25.4 k8s.io/client-go v0.25.4 @@ -47,7 +47,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/spf13/pflag v1.0.5 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/featuregate v0.67.0 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/receiver/k8sobjectsreceiver/go.sum b/receiver/k8sobjectsreceiver/go.sum index fe3dd84aa5304..364e3cd843c20 100644 --- a/receiver/k8sobjectsreceiver/go.sum +++ b/receiver/k8sobjectsreceiver/go.sum @@ -442,20 +442,20 @@ go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 h1:Q5L9Urod3c8as6ZYaoaqBjarx/HXxsxy34DFZIU2fO4= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/component v0.67.0 h1:GCBRZAqk4yNaT4L1uwlbbwophFHrxYccLZ4Uj1Ifs/M= +go.opentelemetry.io/collector/component v0.67.0/go.mod h1:Txa2lm9oe7xsGQN8u7GdUIrRpAHFIKsTO4Qi3/CSmKk= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= +go.opentelemetry.io/collector/semconv v0.67.0 h1:zLAvcQa6Kgow52FFLrmk7/9ZVtEYyA73+xDtCcFG78Q= +go.opentelemetry.io/collector/semconv v0.67.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/receiver/k8sobjectsreceiver/receiver.go b/receiver/k8sobjectsreceiver/receiver.go index 7b32ec15203bf..77e3e66957cb4 100644 --- a/receiver/k8sobjectsreceiver/receiver.go +++ b/receiver/k8sobjectsreceiver/receiver.go @@ -22,13 +22,14 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/obsreport" + "go.opentelemetry.io/collector/receiver" "go.uber.org/zap" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/dynamic" ) type k8sobjectsreceiver struct { - setting component.ReceiverCreateSettings + setting receiver.CreateSettings objects []*K8sObjectsConfig stopperChanList []chan struct{} client dynamic.Interface @@ -37,7 +38,7 @@ type k8sobjectsreceiver struct { mu sync.Mutex } -func newReceiver(params component.ReceiverCreateSettings, config *Config, consumer consumer.Logs) (component.LogsReceiver, error) { +func newReceiver(params receiver.CreateSettings, config *Config, consumer consumer.Logs) (receiver.Logs, error) { transport := "http" client, err := config.getDynamicClient() if err != nil { diff --git a/receiver/k8sobjectsreceiver/receiver_test.go b/receiver/k8sobjectsreceiver/receiver_test.go index 8b75893f049ff..2c1a3b689c2d8 100644 --- a/receiver/k8sobjectsreceiver/receiver_test.go +++ b/receiver/k8sobjectsreceiver/receiver_test.go @@ -23,6 +23,7 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/consumer/consumertest" + "go.opentelemetry.io/collector/receiver/receivertest" ) func TestNewReceiver(t *testing.T) { @@ -31,7 +32,7 @@ func TestNewReceiver(t *testing.T) { rCfg := createDefaultConfig().(*Config) rCfg.makeDynamicClient = newMockDynamicClient().getMockDynamicClient r, err := newReceiver( - componenttest.NewNopReceiverCreateSettings(), + receivertest.NewNopCreateSettings(), rCfg, consumertest.NewNop(), ) @@ -76,7 +77,7 @@ func TestPullObject(t *testing.T) { consumer := newMockLogConsumer() r, err := newReceiver( - componenttest.NewNopReceiverCreateSettings(), + receivertest.NewNopCreateSettings(), rCfg, consumer, ) @@ -111,7 +112,7 @@ func TestWatchObject(t *testing.T) { consumer := newMockLogConsumer() r, err := newReceiver( - componenttest.NewNopReceiverCreateSettings(), + receivertest.NewNopCreateSettings(), rCfg, consumer, ) diff --git a/receiver/kafkametricsreceiver/broker_scraper.go b/receiver/kafkametricsreceiver/broker_scraper.go index d2497511bd43a..bbe516b1fdad6 100644 --- a/receiver/kafkametricsreceiver/broker_scraper.go +++ b/receiver/kafkametricsreceiver/broker_scraper.go @@ -23,6 +23,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" + "go.opentelemetry.io/collector/receiver" "go.opentelemetry.io/collector/receiver/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkametricsreceiver/internal/metadata" @@ -30,7 +31,7 @@ import ( type brokerScraper struct { client sarama.Client - settings component.ReceiverCreateSettings + settings receiver.CreateSettings config Config saramaConfig *sarama.Config mb *metadata.MetricsBuilder @@ -69,7 +70,7 @@ func (s *brokerScraper) scrape(context.Context) (pmetric.Metrics, error) { } func createBrokerScraper(_ context.Context, cfg Config, saramaConfig *sarama.Config, - settings component.ReceiverCreateSettings) (scraperhelper.Scraper, error) { + settings receiver.CreateSettings) (scraperhelper.Scraper, error) { s := brokerScraper{ settings: settings, config: cfg, diff --git a/receiver/kafkametricsreceiver/broker_scraper_test.go b/receiver/kafkametricsreceiver/broker_scraper_test.go index ed0d78c45b798..06129b2c934ee 100644 --- a/receiver/kafkametricsreceiver/broker_scraper_test.go +++ b/receiver/kafkametricsreceiver/broker_scraper_test.go @@ -23,6 +23,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component/componenttest" + "go.opentelemetry.io/collector/receiver/receivertest" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkametricsreceiver/internal/metadata" ) @@ -36,7 +37,7 @@ func TestBrokerShutdown(t *testing.T) { On("Closed").Return(false) scraper := brokerScraper{ client: client, - settings: componenttest.NewNopReceiverCreateSettings(), + settings: receivertest.NewNopCreateSettings(), config: Config{}, } _ = scraper.shutdown(context.Background()) @@ -50,7 +51,7 @@ func TestBrokerShutdown_closed(t *testing.T) { On("Closed").Return(true) scraper := brokerScraper{ client: client, - settings: componenttest.NewNopReceiverCreateSettings(), + settings: receivertest.NewNopCreateSettings(), config: Config{}, } _ = scraper.shutdown(context.Background()) @@ -65,7 +66,7 @@ func TestBrokerScraper_Name(t *testing.T) { func TestBrokerScraper_createBrokerScraper(t *testing.T) { sc := sarama.NewConfig() newSaramaClient = mockNewSaramaClient - bs, err := createBrokerScraper(context.Background(), Config{}, sc, componenttest.NewNopReceiverCreateSettings()) + bs, err := createBrokerScraper(context.Background(), Config{}, sc, receivertest.NewNopCreateSettings()) assert.NoError(t, err) assert.NotNil(t, bs) } @@ -73,7 +74,7 @@ func TestBrokerScraper_createBrokerScraper(t *testing.T) { func TestBrokerScraperStart(t *testing.T) { newSaramaClient = mockNewSaramaClient sc := sarama.NewConfig() - bs, err := createBrokerScraper(context.Background(), Config{}, sc, componenttest.NewNopReceiverCreateSettings()) + bs, err := createBrokerScraper(context.Background(), Config{}, sc, receivertest.NewNopCreateSettings()) assert.NoError(t, err) assert.NotNil(t, bs) assert.NoError(t, bs.Start(context.Background(), nil)) @@ -84,7 +85,7 @@ func TestBrokerScraper_scrape_handles_client_error(t *testing.T) { return nil, fmt.Errorf("new client failed") } sc := sarama.NewConfig() - bs, err := createBrokerScraper(context.Background(), Config{}, sc, componenttest.NewNopReceiverCreateSettings()) + bs, err := createBrokerScraper(context.Background(), Config{}, sc, receivertest.NewNopCreateSettings()) assert.NoError(t, err) assert.NotNil(t, bs) _, err = bs.Scrape(context.Background()) @@ -96,7 +97,7 @@ func TestBrokerScraper_shutdown_handles_nil_client(t *testing.T) { return nil, fmt.Errorf("new client failed") } sc := sarama.NewConfig() - bs, err := createBrokerScraper(context.Background(), Config{}, sc, componenttest.NewNopReceiverCreateSettings()) + bs, err := createBrokerScraper(context.Background(), Config{}, sc, receivertest.NewNopCreateSettings()) assert.NoError(t, err) assert.NotNil(t, bs) err = bs.Shutdown(context.Background()) @@ -108,7 +109,7 @@ func TestBrokerScraper_scrape(t *testing.T) { client.Mock.On("Brokers").Return(testBrokers) bs := brokerScraper{ client: client, - settings: componenttest.NewNopReceiverCreateSettings(), + settings: receivertest.NewNopCreateSettings(), config: Config{Metrics: metadata.DefaultMetricsSettings()}, } require.NoError(t, bs.start(context.Background(), componenttest.NewNopHost())) @@ -123,7 +124,7 @@ func TestBrokerScraper_scrape(t *testing.T) { func TestBrokersScraper_createBrokerScraper(t *testing.T) { sc := sarama.NewConfig() newSaramaClient = mockNewSaramaClient - bs, err := createBrokerScraper(context.Background(), Config{}, sc, componenttest.NewNopReceiverCreateSettings()) + bs, err := createBrokerScraper(context.Background(), Config{}, sc, receivertest.NewNopCreateSettings()) assert.NoError(t, err) assert.NotNil(t, bs) } diff --git a/receiver/kafkametricsreceiver/consumer_scraper.go b/receiver/kafkametricsreceiver/consumer_scraper.go index 898e897f0e8ce..dfd208ecf8472 100644 --- a/receiver/kafkametricsreceiver/consumer_scraper.go +++ b/receiver/kafkametricsreceiver/consumer_scraper.go @@ -24,6 +24,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" + "go.opentelemetry.io/collector/receiver" "go.opentelemetry.io/collector/receiver/scraperhelper" "go.uber.org/multierr" @@ -32,7 +33,7 @@ import ( type consumerScraper struct { client sarama.Client - settings component.ReceiverCreateSettings + settings receiver.CreateSettings groupFilter *regexp.Regexp topicFilter *regexp.Regexp clusterAdmin sarama.ClusterAdmin @@ -175,7 +176,7 @@ func (s *consumerScraper) scrape(context.Context) (pmetric.Metrics, error) { } func createConsumerScraper(_ context.Context, cfg Config, saramaConfig *sarama.Config, - settings component.ReceiverCreateSettings) (scraperhelper.Scraper, error) { + settings receiver.CreateSettings) (scraperhelper.Scraper, error) { groupFilter, err := regexp.Compile(cfg.GroupMatch) if err != nil { return nil, fmt.Errorf("failed to compile group_match: %w", err) diff --git a/receiver/kafkametricsreceiver/consumer_scraper_test.go b/receiver/kafkametricsreceiver/consumer_scraper_test.go index 54842dfc997b3..bc70e766aca87 100644 --- a/receiver/kafkametricsreceiver/consumer_scraper_test.go +++ b/receiver/kafkametricsreceiver/consumer_scraper_test.go @@ -24,6 +24,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component/componenttest" + "go.opentelemetry.io/collector/receiver/receivertest" ) func TestConsumerShutdown(t *testing.T) { @@ -61,7 +62,7 @@ func TestConsumerScraper_createConsumerScraper(t *testing.T) { sc := sarama.NewConfig() newSaramaClient = mockNewSaramaClient newClusterAdmin = mockNewClusterAdmin - cs, err := createConsumerScraper(context.Background(), Config{}, sc, componenttest.NewNopReceiverCreateSettings()) + cs, err := createConsumerScraper(context.Background(), Config{}, sc, receivertest.NewNopCreateSettings()) assert.NoError(t, err) assert.NotNil(t, cs) } @@ -71,7 +72,7 @@ func TestConsumerScraper_scrape_handles_client_error(t *testing.T) { return nil, fmt.Errorf("new client failed") } sc := sarama.NewConfig() - cs, err := createConsumerScraper(context.Background(), Config{}, sc, componenttest.NewNopReceiverCreateSettings()) + cs, err := createConsumerScraper(context.Background(), Config{}, sc, receivertest.NewNopCreateSettings()) assert.NoError(t, err) assert.NotNil(t, cs) _, err = cs.Scrape(context.Background()) @@ -83,7 +84,7 @@ func TestConsumerScraper_scrape_handles_nil_client(t *testing.T) { return nil, fmt.Errorf("new client failed") } sc := sarama.NewConfig() - cs, err := createConsumerScraper(context.Background(), Config{}, sc, componenttest.NewNopReceiverCreateSettings()) + cs, err := createConsumerScraper(context.Background(), Config{}, sc, receivertest.NewNopCreateSettings()) assert.NoError(t, err) assert.NotNil(t, cs) err = cs.Shutdown(context.Background()) @@ -101,7 +102,7 @@ func TestConsumerScraper_scrape_handles_clusterAdmin_error(t *testing.T) { return nil, fmt.Errorf("new cluster admin failed") } sc := sarama.NewConfig() - cs, err := createConsumerScraper(context.Background(), Config{}, sc, componenttest.NewNopReceiverCreateSettings()) + cs, err := createConsumerScraper(context.Background(), Config{}, sc, receivertest.NewNopCreateSettings()) assert.NoError(t, err) assert.NotNil(t, cs) _, err = cs.Scrape(context.Background()) @@ -112,7 +113,7 @@ func TestConsumerScraperStart(t *testing.T) { newSaramaClient = mockNewSaramaClient newClusterAdmin = mockNewClusterAdmin sc := sarama.NewConfig() - cs, err := createConsumerScraper(context.Background(), Config{}, sc, componenttest.NewNopReceiverCreateSettings()) + cs, err := createConsumerScraper(context.Background(), Config{}, sc, receivertest.NewNopCreateSettings()) assert.NoError(t, err) assert.NotNil(t, cs) err = cs.Start(context.Background(), nil) @@ -125,7 +126,7 @@ func TestConsumerScraper_createScraper_handles_invalid_topic_match(t *testing.T) sc := sarama.NewConfig() cs, err := createConsumerScraper(context.Background(), Config{ TopicMatch: "[", - }, sc, componenttest.NewNopReceiverCreateSettings()) + }, sc, receivertest.NewNopCreateSettings()) assert.Error(t, err) assert.Nil(t, cs) } @@ -136,7 +137,7 @@ func TestConsumerScraper_createScraper_handles_invalid_group_match(t *testing.T) sc := sarama.NewConfig() cs, err := createConsumerScraper(context.Background(), Config{ GroupMatch: "[", - }, sc, componenttest.NewNopReceiverCreateSettings()) + }, sc, receivertest.NewNopCreateSettings()) assert.Error(t, err) assert.Nil(t, cs) } @@ -145,7 +146,7 @@ func TestConsumerScraper_scrape(t *testing.T) { filter := regexp.MustCompile(defaultGroupMatch) cs := consumerScraper{ client: newMockClient(), - settings: componenttest.NewNopReceiverCreateSettings(), + settings: receivertest.NewNopCreateSettings(), clusterAdmin: newMockClusterAdmin(), topicFilter: filter, groupFilter: filter, @@ -163,7 +164,7 @@ func TestConsumerScraper_scrape_handlesListTopicError(t *testing.T) { clusterAdmin.topics = nil cs := consumerScraper{ client: client, - settings: componenttest.NewNopReceiverCreateSettings(), + settings: receivertest.NewNopCreateSettings(), clusterAdmin: clusterAdmin, topicFilter: filter, groupFilter: filter, @@ -178,7 +179,7 @@ func TestConsumerScraper_scrape_handlesListConsumerGroupError(t *testing.T) { clusterAdmin.consumerGroups = nil cs := consumerScraper{ client: newMockClient(), - settings: componenttest.NewNopReceiverCreateSettings(), + settings: receivertest.NewNopCreateSettings(), clusterAdmin: clusterAdmin, topicFilter: filter, groupFilter: filter, @@ -193,7 +194,7 @@ func TestConsumerScraper_scrape_handlesDescribeConsumerError(t *testing.T) { clusterAdmin.consumerGroupDescriptions = nil cs := consumerScraper{ client: newMockClient(), - settings: componenttest.NewNopReceiverCreateSettings(), + settings: receivertest.NewNopCreateSettings(), clusterAdmin: clusterAdmin, topicFilter: filter, groupFilter: filter, @@ -210,7 +211,7 @@ func TestConsumerScraper_scrape_handlesOffsetPartialError(t *testing.T) { clusterAdmin.consumerGroupOffsets = nil cs := consumerScraper{ client: client, - settings: componenttest.NewNopReceiverCreateSettings(), + settings: receivertest.NewNopCreateSettings(), groupFilter: filter, topicFilter: filter, clusterAdmin: clusterAdmin, @@ -228,7 +229,7 @@ func TestConsumerScraper_scrape_handlesPartitionPartialError(t *testing.T) { clusterAdmin.consumerGroupOffsets = nil cs := consumerScraper{ client: client, - settings: componenttest.NewNopReceiverCreateSettings(), + settings: receivertest.NewNopCreateSettings(), groupFilter: filter, topicFilter: filter, clusterAdmin: clusterAdmin, diff --git a/receiver/kafkametricsreceiver/factory.go b/receiver/kafkametricsreceiver/factory.go index 9685188083de6..4d8215c738736 100644 --- a/receiver/kafkametricsreceiver/factory.go +++ b/receiver/kafkametricsreceiver/factory.go @@ -19,6 +19,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/consumer" + "go.opentelemetry.io/collector/receiver" "go.opentelemetry.io/collector/receiver/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkametricsreceiver/internal/metadata" @@ -34,11 +35,11 @@ const ( ) // NewFactory creates kafkametrics receiver factory. -func NewFactory() component.ReceiverFactory { - return component.NewReceiverFactory( +func NewFactory() receiver.Factory { + return receiver.NewFactory( typeStr, createDefaultConfig, - component.WithMetricsReceiver(createMetricsReceiver, stability)) + receiver.WithMetrics(createMetricsReceiver, stability)) } func createDefaultConfig() component.Config { @@ -54,9 +55,9 @@ func createDefaultConfig() component.Config { func createMetricsReceiver( ctx context.Context, - params component.ReceiverCreateSettings, + params receiver.CreateSettings, cfg component.Config, - nextConsumer consumer.Metrics) (component.MetricsReceiver, error) { + nextConsumer consumer.Metrics) (receiver.Metrics, error) { c := cfg.(*Config) r, err := newMetricsReceiver(ctx, *c, params, nextConsumer) if err != nil { diff --git a/receiver/kafkametricsreceiver/factory_test.go b/receiver/kafkametricsreceiver/factory_test.go index dffb1a5ddd6c2..3a9382685701e 100644 --- a/receiver/kafkametricsreceiver/factory_test.go +++ b/receiver/kafkametricsreceiver/factory_test.go @@ -19,9 +19,10 @@ import ( "testing" "github.com/stretchr/testify/assert" - "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/consumer" + "go.opentelemetry.io/collector/receiver" + "go.opentelemetry.io/collector/receiver/receivertest" ) func TestCreateDefaultConfig(t *testing.T) { @@ -37,14 +38,14 @@ func TestCreateMetricsReceiver_errors(t *testing.T) { cfg.Brokers = []string{"invalid:9092"} cfg.ProtocolVersion = "2.0.0" cfg.Scrapers = []string{"topics"} - r, err := createMetricsReceiver(context.Background(), componenttest.NewNopReceiverCreateSettings(), cfg, nil) + r, err := createMetricsReceiver(context.Background(), receivertest.NewNopCreateSettings(), cfg, nil) assert.Error(t, err) assert.Nil(t, r) } func TestCreateMetricsReceiver(t *testing.T) { prev := newMetricsReceiver - newMetricsReceiver = func(ctx context.Context, config Config, params component.ReceiverCreateSettings, consumer consumer.Metrics) (component.MetricsReceiver, error) { + newMetricsReceiver = func(ctx context.Context, config Config, params receiver.CreateSettings, consumer consumer.Metrics) (receiver.Metrics, error) { return nil, nil } factory := NewFactory() @@ -52,7 +53,7 @@ func TestCreateMetricsReceiver(t *testing.T) { cfg.Brokers = []string{"invalid:9092"} cfg.ProtocolVersion = "2.0.0" cfg.Scrapers = []string{"topics"} - _, err := createMetricsReceiver(context.Background(), componenttest.NewNopReceiverCreateSettings(), cfg, nil) + _, err := createMetricsReceiver(context.Background(), receivertest.NewNopCreateSettings(), cfg, nil) newMetricsReceiver = prev assert.Nil(t, err) } diff --git a/receiver/kafkametricsreceiver/go.mod b/receiver/kafkametricsreceiver/go.mod index 18534806ed321..28d5866d02b51 100644 --- a/receiver/kafkametricsreceiver/go.mod +++ b/receiver/kafkametricsreceiver/go.mod @@ -4,14 +4,14 @@ go 1.18 require ( github.com/Shopify/sarama v1.37.2 - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/kafkaexporter v0.66.0 + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/kafkaexporter v0.67.0 github.com/stretchr/testify v1.8.1 github.com/testcontainers/testcontainers-go v0.15.0 - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector v0.67.0 + go.opentelemetry.io/collector/component v0.67.0 + go.opentelemetry.io/collector/confmap v0.67.0 + go.opentelemetry.io/collector/consumer v0.67.0 + go.opentelemetry.io/collector/pdata v1.0.0-rc1 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.24.0 ) @@ -61,8 +61,8 @@ 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/internal/coreinternal v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.66.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.67.0 // indirect github.com/opencontainers/go-digest v1.0.0 // indirect github.com/opencontainers/image-spec v1.0.3-0.20211202183452-c5a74bcca799 // indirect github.com/opencontainers/runc v1.1.3 // indirect @@ -79,8 +79,8 @@ require ( github.com/xdg-go/scram v1.1.1 // indirect github.com/xdg-go/stringprep v1.0.3 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect - go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/featuregate v0.67.0 // indirect + go.opentelemetry.io/collector/semconv v0.67.0 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/receiver/kafkametricsreceiver/go.sum b/receiver/kafkametricsreceiver/go.sum index 80b850e693bcb..7987529b08a62 100644 --- a/receiver/kafkametricsreceiver/go.sum +++ b/receiver/kafkametricsreceiver/go.sum @@ -874,20 +874,20 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 h1:Q5L9Urod3c8as6ZYaoaqBjarx/HXxsxy34DFZIU2fO4= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/component v0.67.0 h1:GCBRZAqk4yNaT4L1uwlbbwophFHrxYccLZ4Uj1Ifs/M= +go.opentelemetry.io/collector/component v0.67.0/go.mod h1:Txa2lm9oe7xsGQN8u7GdUIrRpAHFIKsTO4Qi3/CSmKk= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= +go.opentelemetry.io/collector/semconv v0.67.0 h1:zLAvcQa6Kgow52FFLrmk7/9ZVtEYyA73+xDtCcFG78Q= +go.opentelemetry.io/collector/semconv v0.67.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/receiver/kafkametricsreceiver/internal/metadata/generated_metrics.go b/receiver/kafkametricsreceiver/internal/metadata/generated_metrics.go index 16e5e839f740c..326f5bf483c20 100644 --- a/receiver/kafkametricsreceiver/internal/metadata/generated_metrics.go +++ b/receiver/kafkametricsreceiver/internal/metadata/generated_metrics.go @@ -9,6 +9,7 @@ import ( "go.opentelemetry.io/collector/confmap" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" + "go.opentelemetry.io/collector/receiver" ) // MetricSettings provides common settings for a particular metric. @@ -688,7 +689,7 @@ func WithStartTime(startTime pcommon.Timestamp) metricBuilderOption { } } -func NewMetricsBuilder(ms MetricsSettings, settings component.ReceiverCreateSettings, options ...metricBuilderOption) *MetricsBuilder { +func NewMetricsBuilder(ms MetricsSettings, settings receiver.CreateSettings, options ...metricBuilderOption) *MetricsBuilder { mb := &MetricsBuilder{ startTime: pcommon.NewTimestampFromTime(time.Now()), metricsBuffer: pmetric.NewMetrics(), diff --git a/receiver/kafkametricsreceiver/internal/metadata/generated_metrics_test.go b/receiver/kafkametricsreceiver/internal/metadata/generated_metrics_test.go index 47def1ee4ad5e..5a3dcf1142368 100644 --- a/receiver/kafkametricsreceiver/internal/metadata/generated_metrics_test.go +++ b/receiver/kafkametricsreceiver/internal/metadata/generated_metrics_test.go @@ -7,9 +7,9 @@ import ( "testing" "github.com/stretchr/testify/assert" - "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" + "go.opentelemetry.io/collector/receiver/receivertest" "go.uber.org/zap" "go.uber.org/zap/zaptest/observer" ) @@ -17,7 +17,7 @@ import ( func TestDefaultMetrics(t *testing.T) { start := pcommon.Timestamp(1_000_000_000) ts := pcommon.Timestamp(1_000_001_000) - mb := NewMetricsBuilder(DefaultMetricsSettings(), componenttest.NewNopReceiverCreateSettings(), WithStartTime(start)) + mb := NewMetricsBuilder(DefaultMetricsSettings(), receivertest.NewNopCreateSettings(), WithStartTime(start)) enabledMetrics := make(map[string]bool) enabledMetrics["kafka.brokers"] = true @@ -85,7 +85,7 @@ func TestAllMetrics(t *testing.T) { KafkaTopicPartitions: MetricSettings{Enabled: true}, } observedZapCore, observedLogs := observer.New(zap.WarnLevel) - settings := componenttest.NewNopReceiverCreateSettings() + settings := receivertest.NewNopCreateSettings() settings.Logger = zap.New(observedZapCore) mb := NewMetricsBuilder(metricsSettings, settings, WithStartTime(start)) @@ -320,7 +320,7 @@ func TestNoMetrics(t *testing.T) { KafkaTopicPartitions: MetricSettings{Enabled: false}, } observedZapCore, observedLogs := observer.New(zap.WarnLevel) - settings := componenttest.NewNopReceiverCreateSettings() + settings := receivertest.NewNopCreateSettings() settings.Logger = zap.New(observedZapCore) mb := NewMetricsBuilder(metricsSettings, settings, WithStartTime(start)) diff --git a/receiver/kafkametricsreceiver/kafkametrics_e2e_test.go b/receiver/kafkametricsreceiver/kafkametrics_e2e_test.go index f843c6d519fa4..a02265e472fba 100644 --- a/receiver/kafkametricsreceiver/kafkametrics_e2e_test.go +++ b/receiver/kafkametricsreceiver/kafkametrics_e2e_test.go @@ -27,8 +27,9 @@ import ( testcontainers "github.com/testcontainers/testcontainers-go" "github.com/testcontainers/testcontainers-go/wait" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/consumer/consumertest" + "go.opentelemetry.io/collector/receiver" + "go.opentelemetry.io/collector/receiver/receivertest" ) const ( @@ -89,9 +90,9 @@ func TestIntegrationSingleNode(t *testing.T) { cfg.CollectionInterval = 5 * time.Second consumer := new(consumertest.MetricsSink) - var receiver component.MetricsReceiver + var receiver receiver.Metrics - receiver, err = f.CreateMetricsReceiver(context.Background(), componenttest.NewNopReceiverCreateSettings(), cfg, consumer) + receiver, err = f.CreateMetricsReceiver(context.Background(), receivertest.NewNopCreateSettings(), cfg, consumer) require.NoError(t, err, "failed to create receiver") require.Eventuallyf(t, func() bool { err = receiver.Start(context.Background(), &testHost{t: t}) diff --git a/receiver/kafkametricsreceiver/receiver.go b/receiver/kafkametricsreceiver/receiver.go index cb2fdd22acf92..0d0e5c32185c8 100644 --- a/receiver/kafkametricsreceiver/receiver.go +++ b/receiver/kafkametricsreceiver/receiver.go @@ -19,8 +19,8 @@ import ( "fmt" "github.com/Shopify/sarama" - "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/consumer" + "go.opentelemetry.io/collector/receiver" "go.opentelemetry.io/collector/receiver/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/kafkaexporter" @@ -32,7 +32,7 @@ const ( consumersScraperName = "consumers" ) -type createKafkaScraper func(context.Context, Config, *sarama.Config, component.ReceiverCreateSettings) (scraperhelper.Scraper, error) +type createKafkaScraper func(context.Context, Config, *sarama.Config, receiver.CreateSettings) (scraperhelper.Scraper, error) var ( allScrapers = map[string]createKafkaScraper{ @@ -45,9 +45,9 @@ var ( var newMetricsReceiver = func( ctx context.Context, config Config, - params component.ReceiverCreateSettings, + params receiver.CreateSettings, consumer consumer.Metrics, -) (component.MetricsReceiver, error) { +) (receiver.Metrics, error) { sc := sarama.NewConfig() sc.ClientID = config.ClientID if config.ProtocolVersion != "" { diff --git a/receiver/kafkametricsreceiver/receiver_test.go b/receiver/kafkametricsreceiver/receiver_test.go index 8cb32b297418d..08cb3cb750b92 100644 --- a/receiver/kafkametricsreceiver/receiver_test.go +++ b/receiver/kafkametricsreceiver/receiver_test.go @@ -21,11 +21,11 @@ import ( "github.com/Shopify/sarama" "github.com/stretchr/testify/assert" - "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config/configtls" "go.opentelemetry.io/collector/consumer/consumertest" "go.opentelemetry.io/collector/pdata/pmetric" + "go.opentelemetry.io/collector/receiver" + "go.opentelemetry.io/collector/receiver/receivertest" "go.opentelemetry.io/collector/receiver/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/kafkaexporter" @@ -34,7 +34,7 @@ import ( func TestNewReceiver_invalid_version_err(t *testing.T) { c := createDefaultConfig().(*Config) c.ProtocolVersion = "invalid" - r, err := newMetricsReceiver(context.Background(), *c, componenttest.NewNopReceiverCreateSettings(), nil) + r, err := newMetricsReceiver(context.Background(), *c, receivertest.NewNopCreateSettings(), nil) assert.Error(t, err) assert.Nil(t, r) } @@ -42,11 +42,11 @@ func TestNewReceiver_invalid_version_err(t *testing.T) { func TestNewReceiver_invalid_scraper_error(t *testing.T) { c := createDefaultConfig().(*Config) c.Scrapers = []string{"brokers", "cpu"} - mockScraper := func(context.Context, Config, *sarama.Config, component.ReceiverCreateSettings) (scraperhelper.Scraper, error) { + mockScraper := func(context.Context, Config, *sarama.Config, receiver.CreateSettings) (scraperhelper.Scraper, error) { return nil, nil } allScrapers["brokers"] = mockScraper - r, err := newMetricsReceiver(context.Background(), *c, componenttest.NewNopReceiverCreateSettings(), nil) + r, err := newMetricsReceiver(context.Background(), *c, receivertest.NewNopCreateSettings(), nil) assert.Nil(t, r) expectedError := fmt.Errorf("no scraper found for key: cpu") if assert.Error(t, err) { @@ -63,7 +63,7 @@ func TestNewReceiver_invalid_auth_error(t *testing.T) { }, }, } - r, err := newMetricsReceiver(context.Background(), *c, componenttest.NewNopReceiverCreateSettings(), nil) + r, err := newMetricsReceiver(context.Background(), *c, receivertest.NewNopCreateSettings(), nil) assert.Error(t, err) assert.Contains(t, err.Error(), "failed to load TLS config") assert.Nil(t, r) @@ -72,13 +72,13 @@ func TestNewReceiver_invalid_auth_error(t *testing.T) { func TestNewReceiver(t *testing.T) { c := createDefaultConfig().(*Config) c.Scrapers = []string{"brokers"} - mockScraper := func(context.Context, Config, *sarama.Config, component.ReceiverCreateSettings) (scraperhelper.Scraper, error) { + mockScraper := func(context.Context, Config, *sarama.Config, receiver.CreateSettings) (scraperhelper.Scraper, error) { return scraperhelper.NewScraper("brokers", func(ctx context.Context) (pmetric.Metrics, error) { return pmetric.Metrics{}, nil }) } allScrapers["brokers"] = mockScraper - r, err := newMetricsReceiver(context.Background(), *c, componenttest.NewNopReceiverCreateSettings(), consumertest.NewNop()) + r, err := newMetricsReceiver(context.Background(), *c, receivertest.NewNopCreateSettings(), consumertest.NewNop()) assert.Nil(t, err) assert.NotNil(t, r) } @@ -86,11 +86,11 @@ func TestNewReceiver(t *testing.T) { func TestNewReceiver_handles_scraper_error(t *testing.T) { c := createDefaultConfig().(*Config) c.Scrapers = []string{"brokers"} - mockScraper := func(context.Context, Config, *sarama.Config, component.ReceiverCreateSettings) (scraperhelper.Scraper, error) { + mockScraper := func(context.Context, Config, *sarama.Config, receiver.CreateSettings) (scraperhelper.Scraper, error) { return nil, fmt.Errorf("fail") } allScrapers["brokers"] = mockScraper - r, err := newMetricsReceiver(context.Background(), *c, componenttest.NewNopReceiverCreateSettings(), consumertest.NewNop()) + r, err := newMetricsReceiver(context.Background(), *c, receivertest.NewNopCreateSettings(), consumertest.NewNop()) assert.NotNil(t, err) assert.Nil(t, r) } diff --git a/receiver/kafkametricsreceiver/topic_scraper.go b/receiver/kafkametricsreceiver/topic_scraper.go index 8a0a179755993..66a29aeb88bf3 100644 --- a/receiver/kafkametricsreceiver/topic_scraper.go +++ b/receiver/kafkametricsreceiver/topic_scraper.go @@ -24,6 +24,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" + "go.opentelemetry.io/collector/receiver" "go.opentelemetry.io/collector/receiver/scrapererror" "go.opentelemetry.io/collector/receiver/scraperhelper" "go.uber.org/zap" @@ -33,7 +34,7 @@ import ( type topicScraper struct { client sarama.Client - settings component.ReceiverCreateSettings + settings receiver.CreateSettings topicFilter *regexp.Regexp saramaConfig *sarama.Config config Config @@ -116,7 +117,7 @@ func (s *topicScraper) scrape(context.Context) (pmetric.Metrics, error) { return s.mb.Emit(), scrapeErrors.Combine() } -func createTopicsScraper(_ context.Context, cfg Config, saramaConfig *sarama.Config, settings component.ReceiverCreateSettings) (scraperhelper.Scraper, error) { +func createTopicsScraper(_ context.Context, cfg Config, saramaConfig *sarama.Config, settings receiver.CreateSettings) (scraperhelper.Scraper, error) { topicFilter, err := regexp.Compile(cfg.TopicMatch) if err != nil { return nil, fmt.Errorf("failed to compile topic filter: %w", err) diff --git a/receiver/kafkametricsreceiver/topic_scraper_test.go b/receiver/kafkametricsreceiver/topic_scraper_test.go index 2b70619b29df9..3f8d637ce51a6 100644 --- a/receiver/kafkametricsreceiver/topic_scraper_test.go +++ b/receiver/kafkametricsreceiver/topic_scraper_test.go @@ -24,6 +24,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component/componenttest" + "go.opentelemetry.io/collector/receiver/receivertest" ) func TestTopicShutdown(t *testing.T) { @@ -35,7 +36,7 @@ func TestTopicShutdown(t *testing.T) { On("Closed").Return(false) scraper := brokerScraper{ client: client, - settings: componenttest.NewNopReceiverCreateSettings(), + settings: receivertest.NewNopCreateSettings(), config: Config{}, } _ = scraper.shutdown(context.Background()) @@ -49,7 +50,7 @@ func TestTopicShutdown_closed(t *testing.T) { On("Closed").Return(true) scraper := topicScraper{ client: client, - settings: componenttest.NewNopReceiverCreateSettings(), + settings: receivertest.NewNopCreateSettings(), config: Config{}, } _ = scraper.shutdown(context.Background()) @@ -64,7 +65,7 @@ func TestTopicScraper_Name(t *testing.T) { func TestTopicScraper_createsScraper(t *testing.T) { sc := sarama.NewConfig() newSaramaClient = mockNewSaramaClient - ms, err := createTopicsScraper(context.Background(), Config{}, sc, componenttest.NewNopReceiverCreateSettings()) + ms, err := createTopicsScraper(context.Background(), Config{}, sc, receivertest.NewNopCreateSettings()) assert.NoError(t, err) assert.NotNil(t, ms) } @@ -74,7 +75,7 @@ func TestTopicScraper_ScrapeHandlesError(t *testing.T) { return nil, fmt.Errorf("no scraper here") } sc := sarama.NewConfig() - ms, err := createTopicsScraper(context.Background(), Config{}, sc, componenttest.NewNopReceiverCreateSettings()) + ms, err := createTopicsScraper(context.Background(), Config{}, sc, receivertest.NewNopCreateSettings()) assert.NotNil(t, ms) assert.Nil(t, err) _, err = ms.Scrape(context.Background()) @@ -86,7 +87,7 @@ func TestTopicScraper_ShutdownHandlesNilClient(t *testing.T) { return nil, fmt.Errorf("no scraper here") } sc := sarama.NewConfig() - ms, err := createTopicsScraper(context.Background(), Config{}, sc, componenttest.NewNopReceiverCreateSettings()) + ms, err := createTopicsScraper(context.Background(), Config{}, sc, receivertest.NewNopCreateSettings()) assert.NotNil(t, ms) assert.Nil(t, err) err = ms.Shutdown(context.Background()) @@ -96,7 +97,7 @@ func TestTopicScraper_ShutdownHandlesNilClient(t *testing.T) { func TestTopicScraper_startScraperCreatesClient(t *testing.T) { newSaramaClient = mockNewSaramaClient sc := sarama.NewConfig() - ms, err := createTopicsScraper(context.Background(), Config{}, sc, componenttest.NewNopReceiverCreateSettings()) + ms, err := createTopicsScraper(context.Background(), Config{}, sc, receivertest.NewNopCreateSettings()) assert.NotNil(t, ms) assert.NoError(t, err) err = ms.Start(context.Background(), nil) @@ -108,7 +109,7 @@ func TestTopicScraper_createScraperHandles_invalid_topicMatch(t *testing.T) { sc := sarama.NewConfig() ms, err := createTopicsScraper(context.Background(), Config{ TopicMatch: "[", - }, sc, componenttest.NewNopReceiverCreateSettings()) + }, sc, receivertest.NewNopCreateSettings()) assert.Error(t, err) assert.Nil(t, ms) } @@ -121,7 +122,7 @@ func TestTopicScraper_scrapes(t *testing.T) { match := regexp.MustCompile(config.TopicMatch) scraper := topicScraper{ client: client, - settings: componenttest.NewNopReceiverCreateSettings(), + settings: receivertest.NewNopCreateSettings(), config: *config, topicFilter: match, } @@ -156,7 +157,7 @@ func TestTopicScraper_scrape_handlesTopicError(t *testing.T) { match := regexp.MustCompile(config.TopicMatch) scraper := topicScraper{ client: client, - settings: componenttest.NewNopReceiverCreateSettings(), + settings: receivertest.NewNopCreateSettings(), topicFilter: match, } _, err := scraper.scrape(context.Background()) @@ -170,7 +171,7 @@ func TestTopicScraper_scrape_handlesPartitionError(t *testing.T) { match := regexp.MustCompile(config.TopicMatch) scraper := topicScraper{ client: client, - settings: componenttest.NewNopReceiverCreateSettings(), + settings: receivertest.NewNopCreateSettings(), topicFilter: match, } require.NoError(t, scraper.start(context.Background(), componenttest.NewNopHost())) @@ -188,7 +189,7 @@ func TestTopicScraper_scrape_handlesPartialScrapeErrors(t *testing.T) { match := regexp.MustCompile(config.TopicMatch) scraper := topicScraper{ client: client, - settings: componenttest.NewNopReceiverCreateSettings(), + settings: receivertest.NewNopCreateSettings(), topicFilter: match, } require.NoError(t, scraper.start(context.Background(), componenttest.NewNopHost())) diff --git a/receiver/kafkareceiver/factory.go b/receiver/kafkareceiver/factory.go index 366934bea16ca..15296c7404059 100644 --- a/receiver/kafkareceiver/factory.go +++ b/receiver/kafkareceiver/factory.go @@ -22,6 +22,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer" + "go.opentelemetry.io/collector/receiver" "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/kafkaexporter" ) @@ -80,7 +81,7 @@ func WithLogsUnmarshalers(logsUnmarshalers ...LogsUnmarshaler) FactoryOption { } // NewFactory creates Kafka receiver factory. -func NewFactory(options ...FactoryOption) component.ReceiverFactory { +func NewFactory(options ...FactoryOption) receiver.Factory { _ = view.Register(MetricViews()...) f := &kafkaReceiverFactory{ @@ -91,12 +92,12 @@ func NewFactory(options ...FactoryOption) component.ReceiverFactory { for _, o := range options { o(f) } - return component.NewReceiverFactory( + return receiver.NewFactory( typeStr, createDefaultConfig, - component.WithTracesReceiver(f.createTracesReceiver, stability), - component.WithMetricsReceiver(f.createMetricsReceiver, stability), - component.WithLogsReceiver(f.createLogsReceiver, stability), + receiver.WithTraces(f.createTracesReceiver, stability), + receiver.WithMetrics(f.createMetricsReceiver, stability), + receiver.WithLogs(f.createLogsReceiver, stability), ) } @@ -134,10 +135,10 @@ type kafkaReceiverFactory struct { func (f *kafkaReceiverFactory) createTracesReceiver( _ context.Context, - set component.ReceiverCreateSettings, + set receiver.CreateSettings, cfg component.Config, nextConsumer consumer.Traces, -) (component.TracesReceiver, error) { +) (receiver.Traces, error) { c := cfg.(*Config) r, err := newTracesReceiver(*c, set, f.tracesUnmarshalers, nextConsumer) if err != nil { @@ -148,10 +149,10 @@ func (f *kafkaReceiverFactory) createTracesReceiver( func (f *kafkaReceiverFactory) createMetricsReceiver( _ context.Context, - set component.ReceiverCreateSettings, + set receiver.CreateSettings, cfg component.Config, nextConsumer consumer.Metrics, -) (component.MetricsReceiver, error) { +) (receiver.Metrics, error) { c := cfg.(*Config) r, err := newMetricsReceiver(*c, set, f.metricsUnmarshalers, nextConsumer) if err != nil { @@ -162,10 +163,10 @@ func (f *kafkaReceiverFactory) createMetricsReceiver( func (f *kafkaReceiverFactory) createLogsReceiver( _ context.Context, - set component.ReceiverCreateSettings, + set receiver.CreateSettings, cfg component.Config, nextConsumer consumer.Logs, -) (component.LogsReceiver, error) { +) (receiver.Logs, error) { c := cfg.(*Config) r, err := newLogsReceiver(*c, set, f.logsUnmarshalers, nextConsumer) if err != nil { diff --git a/receiver/kafkareceiver/factory_test.go b/receiver/kafkareceiver/factory_test.go index 000433e951833..79b9474d474ba 100644 --- a/receiver/kafkareceiver/factory_test.go +++ b/receiver/kafkareceiver/factory_test.go @@ -24,6 +24,7 @@ import ( "go.opentelemetry.io/collector/pdata/plog" "go.opentelemetry.io/collector/pdata/pmetric" "go.opentelemetry.io/collector/pdata/ptrace" + "go.opentelemetry.io/collector/receiver/receivertest" ) func TestCreateDefaultConfig(t *testing.T) { @@ -41,7 +42,7 @@ func TestCreateTracesReceiver(t *testing.T) { cfg.Brokers = []string{"invalid:9092"} cfg.ProtocolVersion = "2.0.0" f := kafkaReceiverFactory{tracesUnmarshalers: defaultTracesUnmarshalers()} - r, err := f.createTracesReceiver(context.Background(), componenttest.NewNopReceiverCreateSettings(), cfg, nil) + r, err := f.createTracesReceiver(context.Background(), receivertest.NewNopCreateSettings(), cfg, nil) // no available broker require.Error(t, err) assert.Nil(t, r) @@ -53,7 +54,7 @@ func TestCreateTracesReceiver_error(t *testing.T) { // disable contacting broker at startup cfg.Metadata.Full = false f := kafkaReceiverFactory{tracesUnmarshalers: defaultTracesUnmarshalers()} - r, err := f.createTracesReceiver(context.Background(), componenttest.NewNopReceiverCreateSettings(), cfg, nil) + r, err := f.createTracesReceiver(context.Background(), receivertest.NewNopCreateSettings(), cfg, nil) require.NoError(t, err) assert.NotNil(t, r) } @@ -68,13 +69,13 @@ func TestWithTracesUnmarshalers(t *testing.T) { t.Run("custom_encoding", func(t *testing.T) { cfg.Encoding = unmarshaler.Encoding() - receiver, err := f.CreateTracesReceiver(context.Background(), componenttest.NewNopReceiverCreateSettings(), cfg, nil) + receiver, err := f.CreateTracesReceiver(context.Background(), receivertest.NewNopCreateSettings(), cfg, nil) require.NoError(t, err) require.NotNil(t, receiver) }) t.Run("default_encoding", func(t *testing.T) { cfg.Encoding = defaultEncoding - receiver, err := f.CreateTracesReceiver(context.Background(), componenttest.NewNopReceiverCreateSettings(), cfg, nil) + receiver, err := f.CreateTracesReceiver(context.Background(), receivertest.NewNopCreateSettings(), cfg, nil) require.NoError(t, err) assert.NotNil(t, receiver) }) @@ -85,7 +86,7 @@ func TestCreateMetricsReceiver(t *testing.T) { cfg.Brokers = []string{"invalid:9092"} cfg.ProtocolVersion = "2.0.0" f := kafkaReceiverFactory{metricsUnmarshalers: defaultMetricsUnmarshalers()} - r, err := f.createMetricsReceiver(context.Background(), componenttest.NewNopReceiverCreateSettings(), cfg, nil) + r, err := f.createMetricsReceiver(context.Background(), receivertest.NewNopCreateSettings(), cfg, nil) // no available broker require.Error(t, err) assert.Nil(t, r) @@ -97,7 +98,7 @@ func TestCreateMetricsReceiver_error(t *testing.T) { // disable contacting broker at startup cfg.Metadata.Full = false f := kafkaReceiverFactory{metricsUnmarshalers: defaultMetricsUnmarshalers()} - r, err := f.createMetricsReceiver(context.Background(), componenttest.NewNopReceiverCreateSettings(), cfg, nil) + r, err := f.createMetricsReceiver(context.Background(), receivertest.NewNopCreateSettings(), cfg, nil) require.NoError(t, err) assert.NotNil(t, r) } @@ -112,13 +113,13 @@ func TestWithMetricsUnmarshalers(t *testing.T) { t.Run("custom_encoding", func(t *testing.T) { cfg.Encoding = unmarshaler.Encoding() - receiver, err := f.CreateMetricsReceiver(context.Background(), componenttest.NewNopReceiverCreateSettings(), cfg, nil) + receiver, err := f.CreateMetricsReceiver(context.Background(), receivertest.NewNopCreateSettings(), cfg, nil) require.NoError(t, err) require.NotNil(t, receiver) }) t.Run("default_encoding", func(t *testing.T) { cfg.Encoding = defaultEncoding - receiver, err := f.CreateMetricsReceiver(context.Background(), componenttest.NewNopReceiverCreateSettings(), cfg, nil) + receiver, err := f.CreateMetricsReceiver(context.Background(), receivertest.NewNopCreateSettings(), cfg, nil) require.NoError(t, err) assert.NotNil(t, receiver) }) @@ -129,7 +130,7 @@ func TestCreateLogsReceiver(t *testing.T) { cfg.Brokers = []string{"invalid:9092"} cfg.ProtocolVersion = "2.0.0" f := kafkaReceiverFactory{logsUnmarshalers: defaultLogsUnmarshalers()} - r, err := f.createLogsReceiver(context.Background(), componenttest.NewNopReceiverCreateSettings(), cfg, nil) + r, err := f.createLogsReceiver(context.Background(), receivertest.NewNopCreateSettings(), cfg, nil) // no available broker require.Error(t, err) assert.Nil(t, r) @@ -141,7 +142,7 @@ func TestCreateLogsReceiver_error(t *testing.T) { // disable contacting broker at startup cfg.Metadata.Full = false f := kafkaReceiverFactory{logsUnmarshalers: defaultLogsUnmarshalers()} - r, err := f.createLogsReceiver(context.Background(), componenttest.NewNopReceiverCreateSettings(), cfg, nil) + r, err := f.createLogsReceiver(context.Background(), receivertest.NewNopCreateSettings(), cfg, nil) require.NoError(t, err) assert.NotNil(t, r) } @@ -156,13 +157,13 @@ func TestWithLogsUnmarshalers(t *testing.T) { t.Run("custom_encoding", func(t *testing.T) { cfg.Encoding = unmarshaler.Encoding() - exporter, err := f.CreateLogsReceiver(context.Background(), componenttest.NewNopReceiverCreateSettings(), cfg, nil) + exporter, err := f.CreateLogsReceiver(context.Background(), receivertest.NewNopCreateSettings(), cfg, nil) require.NoError(t, err) require.NotNil(t, exporter) }) t.Run("default_encoding", func(t *testing.T) { cfg.Encoding = defaultEncoding - exporter, err := f.CreateLogsReceiver(context.Background(), componenttest.NewNopReceiverCreateSettings(), cfg, nil) + exporter, err := f.CreateLogsReceiver(context.Background(), receivertest.NewNopCreateSettings(), cfg, nil) require.NoError(t, err) assert.NotNil(t, exporter) }) diff --git a/receiver/kafkareceiver/go.mod b/receiver/kafkareceiver/go.mod index 06a8ba924dc42..de97fa35aba97 100644 --- a/receiver/kafkareceiver/go.mod +++ b/receiver/kafkareceiver/go.mod @@ -7,19 +7,19 @@ require ( github.com/apache/thrift v0.17.0 github.com/gogo/protobuf v1.3.2 github.com/jaegertracing/jaeger v1.39.1-0.20221110195127-14c11365a856 - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/kafkaexporter v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/zipkin v0.66.0 + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/kafkaexporter v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/zipkin v0.67.0 github.com/openzipkin/zipkin-go v0.4.1 github.com/stretchr/testify v1.8.1 go.opencensus.io v0.24.0 - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector v0.67.0 + go.opentelemetry.io/collector/component v0.67.0 + go.opentelemetry.io/collector/confmap v0.67.0 + go.opentelemetry.io/collector/consumer v0.67.0 + go.opentelemetry.io/collector/pdata v1.0.0-rc1 + go.opentelemetry.io/collector/semconv v0.67.0 go.uber.org/zap v1.24.0 ) @@ -58,7 +58,7 @@ require ( github.com/xdg-go/pbkdf2 v1.0.0 // indirect github.com/xdg-go/scram v1.1.1 // indirect github.com/xdg-go/stringprep v1.0.3 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/featuregate v0.67.0 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/receiver/kafkareceiver/go.sum b/receiver/kafkareceiver/go.sum index bb7b07715ebf8..d0b3faf3a2b90 100644 --- a/receiver/kafkareceiver/go.sum +++ b/receiver/kafkareceiver/go.sum @@ -337,20 +337,20 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 h1:Q5L9Urod3c8as6ZYaoaqBjarx/HXxsxy34DFZIU2fO4= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/component v0.67.0 h1:GCBRZAqk4yNaT4L1uwlbbwophFHrxYccLZ4Uj1Ifs/M= +go.opentelemetry.io/collector/component v0.67.0/go.mod h1:Txa2lm9oe7xsGQN8u7GdUIrRpAHFIKsTO4Qi3/CSmKk= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= +go.opentelemetry.io/collector/semconv v0.67.0 h1:zLAvcQa6Kgow52FFLrmk7/9ZVtEYyA73+xDtCcFG78Q= +go.opentelemetry.io/collector/semconv v0.67.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/receiver/kafkareceiver/kafka_receiver.go b/receiver/kafkareceiver/kafka_receiver.go index 09eb70356773c..e5c234d870564 100644 --- a/receiver/kafkareceiver/kafka_receiver.go +++ b/receiver/kafkareceiver/kafka_receiver.go @@ -25,6 +25,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/obsreport" + "go.opentelemetry.io/collector/receiver" "go.uber.org/zap" "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/kafkaexporter" @@ -44,7 +45,7 @@ type kafkaTracesConsumer struct { cancelConsumeLoop context.CancelFunc unmarshaler TracesUnmarshaler - settings component.ReceiverCreateSettings + settings receiver.CreateSettings autocommitEnabled bool messageMarking MessageMarking @@ -58,7 +59,7 @@ type kafkaMetricsConsumer struct { cancelConsumeLoop context.CancelFunc unmarshaler MetricsUnmarshaler - settings component.ReceiverCreateSettings + settings receiver.CreateSettings autocommitEnabled bool messageMarking MessageMarking @@ -72,17 +73,17 @@ type kafkaLogsConsumer struct { cancelConsumeLoop context.CancelFunc unmarshaler LogsUnmarshaler - settings component.ReceiverCreateSettings + settings receiver.CreateSettings autocommitEnabled bool messageMarking MessageMarking } -var _ component.TracesReceiver = (*kafkaTracesConsumer)(nil) -var _ component.MetricsReceiver = (*kafkaMetricsConsumer)(nil) -var _ component.LogsReceiver = (*kafkaLogsConsumer)(nil) +var _ receiver.Traces = (*kafkaTracesConsumer)(nil) +var _ receiver.Metrics = (*kafkaMetricsConsumer)(nil) +var _ receiver.Logs = (*kafkaLogsConsumer)(nil) -func newTracesReceiver(config Config, set component.ReceiverCreateSettings, unmarshalers map[string]TracesUnmarshaler, nextConsumer consumer.Traces) (*kafkaTracesConsumer, error) { +func newTracesReceiver(config Config, set receiver.CreateSettings, unmarshalers map[string]TracesUnmarshaler, nextConsumer consumer.Traces) (*kafkaTracesConsumer, error) { unmarshaler := unmarshalers[config.Encoding] if unmarshaler == nil { return nil, errUnrecognizedEncoding @@ -168,7 +169,7 @@ func (c *kafkaTracesConsumer) Shutdown(context.Context) error { return c.consumerGroup.Close() } -func newMetricsReceiver(config Config, set component.ReceiverCreateSettings, unmarshalers map[string]MetricsUnmarshaler, nextConsumer consumer.Metrics) (*kafkaMetricsConsumer, error) { +func newMetricsReceiver(config Config, set receiver.CreateSettings, unmarshalers map[string]MetricsUnmarshaler, nextConsumer consumer.Metrics) (*kafkaMetricsConsumer, error) { unmarshaler := unmarshalers[config.Encoding] if unmarshaler == nil { return nil, errUnrecognizedEncoding @@ -257,7 +258,7 @@ func (c *kafkaMetricsConsumer) Shutdown(context.Context) error { return c.consumerGroup.Close() } -func newLogsReceiver(config Config, set component.ReceiverCreateSettings, unmarshalers map[string]LogsUnmarshaler, nextConsumer consumer.Logs) (*kafkaLogsConsumer, error) { +func newLogsReceiver(config Config, set receiver.CreateSettings, unmarshalers map[string]LogsUnmarshaler, nextConsumer consumer.Logs) (*kafkaLogsConsumer, error) { unmarshaler := unmarshalers[config.Encoding] if unmarshaler == nil { return nil, errUnrecognizedEncoding diff --git a/receiver/kafkareceiver/kafka_receiver_test.go b/receiver/kafkareceiver/kafka_receiver_test.go index 2afdedf1edfd7..552e88107250c 100644 --- a/receiver/kafkareceiver/kafka_receiver_test.go +++ b/receiver/kafkareceiver/kafka_receiver_test.go @@ -32,6 +32,7 @@ import ( "go.opentelemetry.io/collector/pdata/plog" "go.opentelemetry.io/collector/pdata/pmetric" "go.opentelemetry.io/collector/pdata/ptrace" + "go.opentelemetry.io/collector/receiver/receivertest" "go.uber.org/zap" "go.uber.org/zap/zapcore" "go.uber.org/zap/zaptest/observer" @@ -45,7 +46,7 @@ func TestNewTracesReceiver_version_err(t *testing.T) { Encoding: defaultEncoding, ProtocolVersion: "none", } - r, err := newTracesReceiver(c, componenttest.NewNopReceiverCreateSettings(), defaultTracesUnmarshalers(), consumertest.NewNop()) + r, err := newTracesReceiver(c, receivertest.NewNopCreateSettings(), defaultTracesUnmarshalers(), consumertest.NewNop()) assert.Error(t, err) assert.Nil(t, r) } @@ -54,7 +55,7 @@ func TestNewTracesReceiver_encoding_err(t *testing.T) { c := Config{ Encoding: "foo", } - r, err := newTracesReceiver(c, componenttest.NewNopReceiverCreateSettings(), defaultTracesUnmarshalers(), consumertest.NewNop()) + r, err := newTracesReceiver(c, receivertest.NewNopCreateSettings(), defaultTracesUnmarshalers(), consumertest.NewNop()) require.Error(t, err) assert.Nil(t, r) assert.EqualError(t, err, errUnrecognizedEncoding.Error()) @@ -75,7 +76,7 @@ func TestNewTracesReceiver_err_auth_type(t *testing.T) { Full: false, }, } - r, err := newTracesReceiver(c, componenttest.NewNopReceiverCreateSettings(), defaultTracesUnmarshalers(), consumertest.NewNop()) + r, err := newTracesReceiver(c, receivertest.NewNopCreateSettings(), defaultTracesUnmarshalers(), consumertest.NewNop()) assert.Error(t, err) assert.Contains(t, err.Error(), "failed to load TLS config") assert.Nil(t, r) @@ -84,7 +85,7 @@ func TestNewTracesReceiver_err_auth_type(t *testing.T) { func TestTracesReceiverStart(t *testing.T) { c := kafkaTracesConsumer{ nextConsumer: consumertest.NewNop(), - settings: componenttest.NewNopReceiverCreateSettings(), + settings: receivertest.NewNopCreateSettings(), consumerGroup: &testConsumerGroup{}, } @@ -95,7 +96,7 @@ func TestTracesReceiverStart(t *testing.T) { func TestTracesReceiverStartConsume(t *testing.T) { c := kafkaTracesConsumer{ nextConsumer: consumertest.NewNop(), - settings: componenttest.NewNopReceiverCreateSettings(), + settings: receivertest.NewNopCreateSettings(), consumerGroup: &testConsumerGroup{}, } ctx, cancelFunc := context.WithCancel(context.Background()) @@ -110,7 +111,7 @@ func TestTracesReceiverStartConsume(t *testing.T) { func TestTracesReceiver_error(t *testing.T) { zcore, logObserver := observer.New(zapcore.ErrorLevel) logger := zap.New(zcore) - settings := componenttest.NewNopReceiverCreateSettings() + settings := receivertest.NewNopCreateSettings() settings.Logger = logger expectedErr := errors.New("handler error") @@ -133,7 +134,7 @@ func TestTracesConsumerGroupHandler(t *testing.T) { require.NoError(t, view.Register(views...)) defer view.Unregister(views...) - obsrecv, err := obsreport.NewReceiver(obsreport.ReceiverSettings{ReceiverCreateSettings: componenttest.NewNopReceiverCreateSettings()}) + obsrecv, err := obsreport.NewReceiver(obsreport.ReceiverSettings{ReceiverCreateSettings: receivertest.NewNopCreateSettings()}) require.NoError(t, err) c := tracesConsumerGroupHandler{ unmarshaler: newPdataTracesUnmarshaler(&ptrace.ProtoUnmarshaler{}, defaultEncoding), @@ -177,7 +178,7 @@ func TestTracesConsumerGroupHandler(t *testing.T) { } func TestTracesConsumerGroupHandler_error_unmarshal(t *testing.T) { - obsrecv, err := obsreport.NewReceiver(obsreport.ReceiverSettings{ReceiverCreateSettings: componenttest.NewNopReceiverCreateSettings()}) + obsrecv, err := obsreport.NewReceiver(obsreport.ReceiverSettings{ReceiverCreateSettings: receivertest.NewNopCreateSettings()}) require.NoError(t, err) c := tracesConsumerGroupHandler{ unmarshaler: newPdataTracesUnmarshaler(&ptrace.ProtoUnmarshaler{}, defaultEncoding), @@ -204,7 +205,7 @@ func TestTracesConsumerGroupHandler_error_unmarshal(t *testing.T) { func TestTracesConsumerGroupHandler_error_nextConsumer(t *testing.T) { consumerError := errors.New("failed to consume") - obsrecv, err := obsreport.NewReceiver(obsreport.ReceiverSettings{ReceiverCreateSettings: componenttest.NewNopReceiverCreateSettings()}) + obsrecv, err := obsreport.NewReceiver(obsreport.ReceiverSettings{ReceiverCreateSettings: receivertest.NewNopCreateSettings()}) require.NoError(t, err) c := tracesConsumerGroupHandler{ unmarshaler: newPdataTracesUnmarshaler(&ptrace.ProtoUnmarshaler{}, defaultEncoding), @@ -240,7 +241,7 @@ func TestNewMetricsReceiver_version_err(t *testing.T) { Encoding: defaultEncoding, ProtocolVersion: "none", } - r, err := newMetricsReceiver(c, componenttest.NewNopReceiverCreateSettings(), defaultMetricsUnmarshalers(), consumertest.NewNop()) + r, err := newMetricsReceiver(c, receivertest.NewNopCreateSettings(), defaultMetricsUnmarshalers(), consumertest.NewNop()) assert.Error(t, err) assert.Nil(t, r) } @@ -249,7 +250,7 @@ func TestNewMetricsReceiver_encoding_err(t *testing.T) { c := Config{ Encoding: "foo", } - r, err := newMetricsReceiver(c, componenttest.NewNopReceiverCreateSettings(), defaultMetricsUnmarshalers(), consumertest.NewNop()) + r, err := newMetricsReceiver(c, receivertest.NewNopCreateSettings(), defaultMetricsUnmarshalers(), consumertest.NewNop()) require.Error(t, err) assert.Nil(t, r) assert.EqualError(t, err, errUnrecognizedEncoding.Error()) @@ -270,7 +271,7 @@ func TestNewMetricsExporter_err_auth_type(t *testing.T) { Full: false, }, } - r, err := newMetricsReceiver(c, componenttest.NewNopReceiverCreateSettings(), defaultMetricsUnmarshalers(), consumertest.NewNop()) + r, err := newMetricsReceiver(c, receivertest.NewNopCreateSettings(), defaultMetricsUnmarshalers(), consumertest.NewNop()) assert.Error(t, err) assert.Contains(t, err.Error(), "failed to load TLS config") assert.Nil(t, r) @@ -279,7 +280,7 @@ func TestNewMetricsExporter_err_auth_type(t *testing.T) { func TestMetricsReceiverStart(t *testing.T) { c := kafkaMetricsConsumer{ nextConsumer: consumertest.NewNop(), - settings: componenttest.NewNopReceiverCreateSettings(), + settings: receivertest.NewNopCreateSettings(), consumerGroup: &testConsumerGroup{}, } @@ -290,7 +291,7 @@ func TestMetricsReceiverStart(t *testing.T) { func TestMetricsReceiverStartConsume(t *testing.T) { c := kafkaMetricsConsumer{ nextConsumer: consumertest.NewNop(), - settings: componenttest.NewNopReceiverCreateSettings(), + settings: receivertest.NewNopCreateSettings(), consumerGroup: &testConsumerGroup{}, } ctx, cancelFunc := context.WithCancel(context.Background()) @@ -305,7 +306,7 @@ func TestMetricsReceiverStartConsume(t *testing.T) { func TestMetricsReceiver_error(t *testing.T) { zcore, logObserver := observer.New(zapcore.ErrorLevel) logger := zap.New(zcore) - settings := componenttest.NewNopReceiverCreateSettings() + settings := receivertest.NewNopCreateSettings() settings.Logger = logger expectedErr := errors.New("handler error") @@ -328,7 +329,7 @@ func TestMetricsConsumerGroupHandler(t *testing.T) { require.NoError(t, view.Register(views...)) defer view.Unregister(views...) - obsrecv, err := obsreport.NewReceiver(obsreport.ReceiverSettings{ReceiverCreateSettings: componenttest.NewNopReceiverCreateSettings()}) + obsrecv, err := obsreport.NewReceiver(obsreport.ReceiverSettings{ReceiverCreateSettings: receivertest.NewNopCreateSettings()}) require.NoError(t, err) c := metricsConsumerGroupHandler{ unmarshaler: newPdataMetricsUnmarshaler(&pmetric.ProtoUnmarshaler{}, defaultEncoding), @@ -372,7 +373,7 @@ func TestMetricsConsumerGroupHandler(t *testing.T) { } func TestMetricsConsumerGroupHandler_error_unmarshal(t *testing.T) { - obsrecv, err := obsreport.NewReceiver(obsreport.ReceiverSettings{ReceiverCreateSettings: componenttest.NewNopReceiverCreateSettings()}) + obsrecv, err := obsreport.NewReceiver(obsreport.ReceiverSettings{ReceiverCreateSettings: receivertest.NewNopCreateSettings()}) require.NoError(t, err) c := metricsConsumerGroupHandler{ unmarshaler: newPdataMetricsUnmarshaler(&pmetric.ProtoUnmarshaler{}, defaultEncoding), @@ -399,7 +400,7 @@ func TestMetricsConsumerGroupHandler_error_unmarshal(t *testing.T) { func TestMetricsConsumerGroupHandler_error_nextConsumer(t *testing.T) { consumerError := errors.New("failed to consume") - obsrecv, err := obsreport.NewReceiver(obsreport.ReceiverSettings{ReceiverCreateSettings: componenttest.NewNopReceiverCreateSettings()}) + obsrecv, err := obsreport.NewReceiver(obsreport.ReceiverSettings{ReceiverCreateSettings: receivertest.NewNopCreateSettings()}) require.NoError(t, err) c := metricsConsumerGroupHandler{ unmarshaler: newPdataMetricsUnmarshaler(&pmetric.ProtoUnmarshaler{}, defaultEncoding), @@ -434,7 +435,7 @@ func TestNewLogsReceiver_version_err(t *testing.T) { Encoding: defaultEncoding, ProtocolVersion: "none", } - r, err := newLogsReceiver(c, componenttest.NewNopReceiverCreateSettings(), defaultLogsUnmarshalers(), consumertest.NewNop()) + r, err := newLogsReceiver(c, receivertest.NewNopCreateSettings(), defaultLogsUnmarshalers(), consumertest.NewNop()) assert.Error(t, err) assert.Nil(t, r) } @@ -443,7 +444,7 @@ func TestNewLogsReceiver_encoding_err(t *testing.T) { c := Config{ Encoding: "foo", } - r, err := newLogsReceiver(c, componenttest.NewNopReceiverCreateSettings(), defaultLogsUnmarshalers(), consumertest.NewNop()) + r, err := newLogsReceiver(c, receivertest.NewNopCreateSettings(), defaultLogsUnmarshalers(), consumertest.NewNop()) require.Error(t, err) assert.Nil(t, r) assert.EqualError(t, err, errUnrecognizedEncoding.Error()) @@ -464,7 +465,7 @@ func TestNewLogsExporter_err_auth_type(t *testing.T) { Full: false, }, } - r, err := newLogsReceiver(c, componenttest.NewNopReceiverCreateSettings(), defaultLogsUnmarshalers(), consumertest.NewNop()) + r, err := newLogsReceiver(c, receivertest.NewNopCreateSettings(), defaultLogsUnmarshalers(), consumertest.NewNop()) assert.Error(t, err) assert.Contains(t, err.Error(), "failed to load TLS config") assert.Nil(t, r) @@ -473,7 +474,7 @@ func TestNewLogsExporter_err_auth_type(t *testing.T) { func TestLogsReceiverStart(t *testing.T) { c := kafkaLogsConsumer{ nextConsumer: consumertest.NewNop(), - settings: componenttest.NewNopReceiverCreateSettings(), + settings: receivertest.NewNopCreateSettings(), consumerGroup: &testConsumerGroup{}, } @@ -484,7 +485,7 @@ func TestLogsReceiverStart(t *testing.T) { func TestLogsReceiverStartConsume(t *testing.T) { c := kafkaLogsConsumer{ nextConsumer: consumertest.NewNop(), - settings: componenttest.NewNopReceiverCreateSettings(), + settings: receivertest.NewNopCreateSettings(), consumerGroup: &testConsumerGroup{}, } ctx, cancelFunc := context.WithCancel(context.Background()) @@ -499,7 +500,7 @@ func TestLogsReceiverStartConsume(t *testing.T) { func TestLogsReceiver_error(t *testing.T) { zcore, logObserver := observer.New(zapcore.ErrorLevel) logger := zap.New(zcore) - settings := componenttest.NewNopReceiverCreateSettings() + settings := receivertest.NewNopCreateSettings() settings.Logger = logger expectedErr := errors.New("handler error") @@ -522,7 +523,7 @@ func TestLogsConsumerGroupHandler(t *testing.T) { require.NoError(t, view.Register(views...)) defer view.Unregister(views...) - obsrecv, err := obsreport.NewReceiver(obsreport.ReceiverSettings{ReceiverCreateSettings: componenttest.NewNopReceiverCreateSettings()}) + obsrecv, err := obsreport.NewReceiver(obsreport.ReceiverSettings{ReceiverCreateSettings: receivertest.NewNopCreateSettings()}) require.NoError(t, err) c := logsConsumerGroupHandler{ unmarshaler: newPdataLogsUnmarshaler(&plog.ProtoUnmarshaler{}, defaultEncoding), @@ -566,7 +567,7 @@ func TestLogsConsumerGroupHandler(t *testing.T) { } func TestLogsConsumerGroupHandler_error_unmarshal(t *testing.T) { - obsrecv, err := obsreport.NewReceiver(obsreport.ReceiverSettings{ReceiverCreateSettings: componenttest.NewNopReceiverCreateSettings()}) + obsrecv, err := obsreport.NewReceiver(obsreport.ReceiverSettings{ReceiverCreateSettings: receivertest.NewNopCreateSettings()}) require.NoError(t, err) c := logsConsumerGroupHandler{ unmarshaler: newPdataLogsUnmarshaler(&plog.ProtoUnmarshaler{}, defaultEncoding), @@ -593,7 +594,7 @@ func TestLogsConsumerGroupHandler_error_unmarshal(t *testing.T) { func TestLogsConsumerGroupHandler_error_nextConsumer(t *testing.T) { consumerError := errors.New("failed to consume") - obsrecv, err := obsreport.NewReceiver(obsreport.ReceiverSettings{ReceiverCreateSettings: componenttest.NewNopReceiverCreateSettings()}) + obsrecv, err := obsreport.NewReceiver(obsreport.ReceiverSettings{ReceiverCreateSettings: receivertest.NewNopCreateSettings()}) require.NoError(t, err) c := logsConsumerGroupHandler{ unmarshaler: newPdataLogsUnmarshaler(&plog.ProtoUnmarshaler{}, defaultEncoding), diff --git a/receiver/kubeletstatsreceiver/factory.go b/receiver/kubeletstatsreceiver/factory.go index c23e7f0d79f14..23c1f678f38fe 100644 --- a/receiver/kubeletstatsreceiver/factory.go +++ b/receiver/kubeletstatsreceiver/factory.go @@ -20,6 +20,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/consumer" + "go.opentelemetry.io/collector/receiver" "go.opentelemetry.io/collector/receiver/scraperhelper" "go.uber.org/zap" @@ -42,11 +43,11 @@ var defaultMetricGroups = []kubelet.MetricGroup{ } // NewFactory creates a factory for kubeletstats receiver. -func NewFactory() component.ReceiverFactory { - return component.NewReceiverFactory( +func NewFactory() receiver.Factory { + return receiver.NewFactory( typeStr, createDefaultConfig, - component.WithMetricsReceiver(createMetricsReceiver, stability)) + receiver.WithMetrics(createMetricsReceiver, stability)) } func createDefaultConfig() component.Config { @@ -66,10 +67,10 @@ func createDefaultConfig() component.Config { func createMetricsReceiver( ctx context.Context, - set component.ReceiverCreateSettings, + set receiver.CreateSettings, baseCfg component.Config, consumer consumer.Metrics, -) (component.MetricsReceiver, error) { +) (receiver.Metrics, error) { cfg := baseCfg.(*Config) rOptions, err := cfg.getReceiverOptions() if err != nil { diff --git a/receiver/kubeletstatsreceiver/factory_test.go b/receiver/kubeletstatsreceiver/factory_test.go index e83365999b748..85eb1c7b1dafa 100644 --- a/receiver/kubeletstatsreceiver/factory_test.go +++ b/receiver/kubeletstatsreceiver/factory_test.go @@ -31,6 +31,7 @@ import ( "go.opentelemetry.io/collector/config/configtls" "go.opentelemetry.io/collector/confmap" "go.opentelemetry.io/collector/consumer/consumertest" + "go.opentelemetry.io/collector/receiver/receivertest" "go.opentelemetry.io/collector/receiver/scraperhelper" "go.uber.org/zap" @@ -55,7 +56,7 @@ func TestCreateTracesReceiver(t *testing.T) { factory := NewFactory() traceReceiver, err := factory.CreateTracesReceiver( context.Background(), - componenttest.NewNopReceiverCreateSettings(), + receivertest.NewNopCreateSettings(), factory.CreateDefaultConfig(), nil, ) @@ -67,7 +68,7 @@ func TestCreateMetricsReceiver(t *testing.T) { factory := NewFactory() metricsReceiver, err := factory.CreateMetricsReceiver( context.Background(), - componenttest.NewNopReceiverCreateSettings(), + receivertest.NewNopCreateSettings(), tlsConfig(), consumertest.NewNop(), ) @@ -82,7 +83,7 @@ func TestFactoryInvalidExtraMetadataLabels(t *testing.T) { } metricsReceiver, err := factory.CreateMetricsReceiver( context.Background(), - componenttest.NewNopReceiverCreateSettings(), + receivertest.NewNopCreateSettings(), &cfg, consumertest.NewNop(), ) @@ -102,7 +103,7 @@ func TestFactoryBadAuthType(t *testing.T) { } _, err := factory.CreateMetricsReceiver( context.Background(), - componenttest.NewNopReceiverCreateSettings(), + receivertest.NewNopCreateSettings(), cfg, consumertest.NewNop(), ) diff --git a/receiver/kubeletstatsreceiver/go.mod b/receiver/kubeletstatsreceiver/go.mod index a6e5c38aabd1d..f65393fe7df1b 100644 --- a/receiver/kubeletstatsreceiver/go.mod +++ b/receiver/kubeletstatsreceiver/go.mod @@ -3,15 +3,15 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kubele go 1.18 require ( - github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/kubelet v0.66.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/kubelet v0.67.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector v0.67.0 + go.opentelemetry.io/collector/component v0.67.0 + go.opentelemetry.io/collector/confmap v0.67.0 + go.opentelemetry.io/collector/consumer v0.67.0 + go.opentelemetry.io/collector/pdata v1.0.0-rc1 + go.opentelemetry.io/collector/semconv v0.67.0 go.uber.org/zap v1.24.0 k8s.io/api v0.25.4 k8s.io/apimachinery v0.25.4 @@ -44,7 +44,7 @@ require ( github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.66.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.67.0 // indirect github.com/openshift/api v0.0.0-20210521075222-e273a339932a // indirect github.com/openshift/client-go v0.0.0-20210521082421-73d9475a9142 // indirect github.com/pelletier/go-toml v1.9.4 // indirect @@ -53,7 +53,7 @@ require ( github.com/rogpeppe/go-internal v1.6.1 // indirect github.com/spf13/pflag v1.0.5 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/featuregate v0.67.0 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/receiver/kubeletstatsreceiver/go.sum b/receiver/kubeletstatsreceiver/go.sum index 28e1d1d30a728..8cb8ecec462fb 100644 --- a/receiver/kubeletstatsreceiver/go.sum +++ b/receiver/kubeletstatsreceiver/go.sum @@ -444,20 +444,20 @@ go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 h1:Q5L9Urod3c8as6ZYaoaqBjarx/HXxsxy34DFZIU2fO4= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/component v0.67.0 h1:GCBRZAqk4yNaT4L1uwlbbwophFHrxYccLZ4Uj1Ifs/M= +go.opentelemetry.io/collector/component v0.67.0/go.mod h1:Txa2lm9oe7xsGQN8u7GdUIrRpAHFIKsTO4Qi3/CSmKk= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= +go.opentelemetry.io/collector/semconv v0.67.0 h1:zLAvcQa6Kgow52FFLrmk7/9ZVtEYyA73+xDtCcFG78Q= +go.opentelemetry.io/collector/semconv v0.67.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/receiver/kubeletstatsreceiver/internal/kubelet/accumulator_test.go b/receiver/kubeletstatsreceiver/internal/kubelet/accumulator_test.go index 9ef6cfe636cd8..4b2c11c488e96 100644 --- a/receiver/kubeletstatsreceiver/internal/kubelet/accumulator_test.go +++ b/receiver/kubeletstatsreceiver/internal/kubelet/accumulator_test.go @@ -20,7 +20,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.opentelemetry.io/collector/component/componenttest" + "go.opentelemetry.io/collector/receiver/receivertest" "go.uber.org/zap" "go.uber.org/zap/zapcore" "go.uber.org/zap/zaptest/observer" @@ -214,9 +214,9 @@ func TestMetadataErrorCases(t *testing.T) { logger: logger, metricGroupsToCollect: tt.metricGroupsToCollect, mbs: &metadata.MetricsBuilders{ - NodeMetricsBuilder: metadata.NewMetricsBuilder(metadata.DefaultMetricsSettings(), componenttest.NewNopReceiverCreateSettings()), - PodMetricsBuilder: metadata.NewMetricsBuilder(metadata.DefaultMetricsSettings(), componenttest.NewNopReceiverCreateSettings()), - OtherMetricsBuilder: metadata.NewMetricsBuilder(metadata.DefaultMetricsSettings(), componenttest.NewNopReceiverCreateSettings()), + NodeMetricsBuilder: metadata.NewMetricsBuilder(metadata.DefaultMetricsSettings(), receivertest.NewNopCreateSettings()), + PodMetricsBuilder: metadata.NewMetricsBuilder(metadata.DefaultMetricsSettings(), receivertest.NewNopCreateSettings()), + OtherMetricsBuilder: metadata.NewMetricsBuilder(metadata.DefaultMetricsSettings(), receivertest.NewNopCreateSettings()), }, } @@ -240,10 +240,10 @@ func TestNilHandling(t *testing.T) { VolumeMetricGroup: true, }, mbs: &metadata.MetricsBuilders{ - NodeMetricsBuilder: metadata.NewMetricsBuilder(metadata.DefaultMetricsSettings(), componenttest.NewNopReceiverCreateSettings()), - PodMetricsBuilder: metadata.NewMetricsBuilder(metadata.DefaultMetricsSettings(), componenttest.NewNopReceiverCreateSettings()), - ContainerMetricsBuilder: metadata.NewMetricsBuilder(metadata.DefaultMetricsSettings(), componenttest.NewNopReceiverCreateSettings()), - OtherMetricsBuilder: metadata.NewMetricsBuilder(metadata.DefaultMetricsSettings(), componenttest.NewNopReceiverCreateSettings()), + NodeMetricsBuilder: metadata.NewMetricsBuilder(metadata.DefaultMetricsSettings(), receivertest.NewNopCreateSettings()), + PodMetricsBuilder: metadata.NewMetricsBuilder(metadata.DefaultMetricsSettings(), receivertest.NewNopCreateSettings()), + ContainerMetricsBuilder: metadata.NewMetricsBuilder(metadata.DefaultMetricsSettings(), receivertest.NewNopCreateSettings()), + OtherMetricsBuilder: metadata.NewMetricsBuilder(metadata.DefaultMetricsSettings(), receivertest.NewNopCreateSettings()), }, } assert.NotPanics(t, func() { diff --git a/receiver/kubeletstatsreceiver/internal/kubelet/metrics_test.go b/receiver/kubeletstatsreceiver/internal/kubelet/metrics_test.go index 2b440e0001726..27710cf0b366c 100644 --- a/receiver/kubeletstatsreceiver/internal/kubelet/metrics_test.go +++ b/receiver/kubeletstatsreceiver/internal/kubelet/metrics_test.go @@ -19,9 +19,9 @@ import ( "testing" "github.com/stretchr/testify/require" - "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" + "go.opentelemetry.io/collector/receiver/receivertest" "go.uber.org/zap" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kubeletstatsreceiver/internal/metadata" @@ -46,10 +46,10 @@ func TestMetricAccumulator(t *testing.T) { podsMetadata, _ := metadataProvider.Pods() k8sMetadata := NewMetadata([]MetadataLabel{MetadataLabelContainerID}, podsMetadata, nil) mbs := &metadata.MetricsBuilders{ - NodeMetricsBuilder: metadata.NewMetricsBuilder(metadata.DefaultMetricsSettings(), componenttest.NewNopReceiverCreateSettings()), - PodMetricsBuilder: metadata.NewMetricsBuilder(metadata.DefaultMetricsSettings(), componenttest.NewNopReceiverCreateSettings()), - ContainerMetricsBuilder: metadata.NewMetricsBuilder(metadata.DefaultMetricsSettings(), componenttest.NewNopReceiverCreateSettings()), - OtherMetricsBuilder: metadata.NewMetricsBuilder(metadata.DefaultMetricsSettings(), componenttest.NewNopReceiverCreateSettings()), + NodeMetricsBuilder: metadata.NewMetricsBuilder(metadata.DefaultMetricsSettings(), receivertest.NewNopCreateSettings()), + PodMetricsBuilder: metadata.NewMetricsBuilder(metadata.DefaultMetricsSettings(), receivertest.NewNopCreateSettings()), + ContainerMetricsBuilder: metadata.NewMetricsBuilder(metadata.DefaultMetricsSettings(), receivertest.NewNopCreateSettings()), + OtherMetricsBuilder: metadata.NewMetricsBuilder(metadata.DefaultMetricsSettings(), receivertest.NewNopCreateSettings()), } requireMetricsOk(t, MetricsData(zap.NewNop(), summary, k8sMetadata, ValidMetricGroups, mbs)) // Disable all groups @@ -196,10 +196,10 @@ func fakeMetrics() []pmetric.Metrics { NodeMetricGroup: true, } mbs := &metadata.MetricsBuilders{ - NodeMetricsBuilder: metadata.NewMetricsBuilder(metadata.DefaultMetricsSettings(), componenttest.NewNopReceiverCreateSettings()), - PodMetricsBuilder: metadata.NewMetricsBuilder(metadata.DefaultMetricsSettings(), componenttest.NewNopReceiverCreateSettings()), - ContainerMetricsBuilder: metadata.NewMetricsBuilder(metadata.DefaultMetricsSettings(), componenttest.NewNopReceiverCreateSettings()), - OtherMetricsBuilder: metadata.NewMetricsBuilder(metadata.DefaultMetricsSettings(), componenttest.NewNopReceiverCreateSettings()), + NodeMetricsBuilder: metadata.NewMetricsBuilder(metadata.DefaultMetricsSettings(), receivertest.NewNopCreateSettings()), + PodMetricsBuilder: metadata.NewMetricsBuilder(metadata.DefaultMetricsSettings(), receivertest.NewNopCreateSettings()), + ContainerMetricsBuilder: metadata.NewMetricsBuilder(metadata.DefaultMetricsSettings(), receivertest.NewNopCreateSettings()), + OtherMetricsBuilder: metadata.NewMetricsBuilder(metadata.DefaultMetricsSettings(), receivertest.NewNopCreateSettings()), } return MetricsData(zap.NewNop(), summary, Metadata{}, mgs, mbs) } diff --git a/receiver/kubeletstatsreceiver/internal/metadata/generated_metrics.go b/receiver/kubeletstatsreceiver/internal/metadata/generated_metrics.go index cfa8d4f7a3e4e..06ae6d9bb2d6c 100644 --- a/receiver/kubeletstatsreceiver/internal/metadata/generated_metrics.go +++ b/receiver/kubeletstatsreceiver/internal/metadata/generated_metrics.go @@ -9,6 +9,7 @@ import ( "go.opentelemetry.io/collector/confmap" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" + "go.opentelemetry.io/collector/receiver" ) // MetricSettings provides common settings for a particular metric. @@ -2384,7 +2385,7 @@ func WithStartTime(startTime pcommon.Timestamp) metricBuilderOption { } } -func NewMetricsBuilder(ms MetricsSettings, settings component.ReceiverCreateSettings, options ...metricBuilderOption) *MetricsBuilder { +func NewMetricsBuilder(ms MetricsSettings, settings receiver.CreateSettings, options ...metricBuilderOption) *MetricsBuilder { mb := &MetricsBuilder{ startTime: pcommon.NewTimestampFromTime(time.Now()), metricsBuffer: pmetric.NewMetrics(), diff --git a/receiver/kubeletstatsreceiver/internal/metadata/generated_metrics_test.go b/receiver/kubeletstatsreceiver/internal/metadata/generated_metrics_test.go index d6434ec82e9e0..0c105a9bd72b3 100644 --- a/receiver/kubeletstatsreceiver/internal/metadata/generated_metrics_test.go +++ b/receiver/kubeletstatsreceiver/internal/metadata/generated_metrics_test.go @@ -7,9 +7,9 @@ import ( "testing" "github.com/stretchr/testify/assert" - "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" + "go.opentelemetry.io/collector/receiver/receivertest" "go.uber.org/zap" "go.uber.org/zap/zaptest/observer" ) @@ -17,7 +17,7 @@ import ( func TestDefaultMetrics(t *testing.T) { start := pcommon.Timestamp(1_000_000_000) ts := pcommon.Timestamp(1_000_001_000) - mb := NewMetricsBuilder(DefaultMetricsSettings(), componenttest.NewNopReceiverCreateSettings(), WithStartTime(start)) + mb := NewMetricsBuilder(DefaultMetricsSettings(), receivertest.NewNopCreateSettings(), WithStartTime(start)) enabledMetrics := make(map[string]bool) enabledMetrics["container.cpu.time"] = true @@ -209,7 +209,7 @@ func TestAllMetrics(t *testing.T) { K8sVolumeInodesUsed: MetricSettings{Enabled: true}, } observedZapCore, observedLogs := observer.New(zap.WarnLevel) - settings := componenttest.NewNopReceiverCreateSettings() + settings := receivertest.NewNopCreateSettings() settings.Logger = zap.New(observedZapCore) mb := NewMetricsBuilder(metricsSettings, settings, WithStartTime(start)) @@ -885,7 +885,7 @@ func TestNoMetrics(t *testing.T) { K8sVolumeInodesUsed: MetricSettings{Enabled: false}, } observedZapCore, observedLogs := observer.New(zap.WarnLevel) - settings := componenttest.NewNopReceiverCreateSettings() + settings := receivertest.NewNopCreateSettings() settings.Logger = zap.New(observedZapCore) mb := NewMetricsBuilder(metricsSettings, settings, WithStartTime(start)) diff --git a/receiver/kubeletstatsreceiver/scraper.go b/receiver/kubeletstatsreceiver/scraper.go index 4310ad0377eda..95a432f983ad6 100644 --- a/receiver/kubeletstatsreceiver/scraper.go +++ b/receiver/kubeletstatsreceiver/scraper.go @@ -19,8 +19,8 @@ import ( "fmt" "time" - "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/pdata/pmetric" + "go.opentelemetry.io/collector/receiver" "go.opentelemetry.io/collector/receiver/scraperhelper" "go.uber.org/zap" v1 "k8s.io/api/core/v1" @@ -51,7 +51,7 @@ type kubletScraper struct { func newKubletScraper( restClient kubelet.RestClient, - set component.ReceiverCreateSettings, + set receiver.CreateSettings, rOptions *scraperOptions, metricsConfig metadata.MetricsSettings, ) (scraperhelper.Scraper, error) { diff --git a/receiver/kubeletstatsreceiver/scraper_test.go b/receiver/kubeletstatsreceiver/scraper_test.go index 4ac17d19b3b47..95f5019d72a1f 100644 --- a/receiver/kubeletstatsreceiver/scraper_test.go +++ b/receiver/kubeletstatsreceiver/scraper_test.go @@ -22,8 +22,8 @@ import ( "testing" "github.com/stretchr/testify/require" - "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/pdata/pcommon" + "go.opentelemetry.io/collector/receiver/receivertest" "go.uber.org/zap" "go.uber.org/zap/zaptest/observer" "k8s.io/client-go/kubernetes" @@ -62,7 +62,7 @@ func TestScraper(t *testing.T) { } r, err := newKubletScraper( &fakeRestClient{}, - componenttest.NewNopReceiverCreateSettings(), + receivertest.NewNopCreateSettings(), options, metadata.DefaultMetricsSettings(), ) @@ -112,7 +112,7 @@ func TestScraperWithMetadata(t *testing.T) { } r, err := newKubletScraper( &fakeRestClient{}, - componenttest.NewNopReceiverCreateSettings(), + receivertest.NewNopCreateSettings(), options, metadata.DefaultMetricsSettings(), ) @@ -193,7 +193,7 @@ func TestScraperWithMetricGroups(t *testing.T) { t.Run(test.name, func(t *testing.T) { r, err := newKubletScraper( &fakeRestClient{}, - componenttest.NewNopReceiverCreateSettings(), + receivertest.NewNopCreateSettings(), &scraperOptions{ extraMetadataLabels: []kubelet.MetadataLabel{kubelet.MetadataLabelContainerID}, metricGroupsToCollect: test.metricGroups, @@ -340,7 +340,7 @@ func TestScraperWithPVCDetailedLabels(t *testing.T) { t.Run(test.name, func(t *testing.T) { r, err := newKubletScraper( &fakeRestClient{}, - componenttest.NewNopReceiverCreateSettings(), + receivertest.NewNopCreateSettings(), &scraperOptions{ extraMetadataLabels: []kubelet.MetadataLabel{kubelet.MetadataLabelVolumeType}, metricGroupsToCollect: map[kubelet.MetricGroup]bool{ @@ -448,7 +448,7 @@ func TestClientErrors(t *testing.T) { t.Run(test.name, func(t *testing.T) { core, observedLogs := observer.New(zap.ErrorLevel) logger := zap.New(core) - settings := componenttest.NewNopReceiverCreateSettings() + settings := receivertest.NewNopCreateSettings() settings.Logger = logger options := &scraperOptions{ extraMetadataLabels: test.extraMetadataLabels, diff --git a/receiver/memcachedreceiver/factory.go b/receiver/memcachedreceiver/factory.go index a80fba4b86af6..710cee48d922c 100644 --- a/receiver/memcachedreceiver/factory.go +++ b/receiver/memcachedreceiver/factory.go @@ -22,6 +22,7 @@ import ( "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confignet" "go.opentelemetry.io/collector/consumer" + "go.opentelemetry.io/collector/receiver" "go.opentelemetry.io/collector/receiver/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/memcachedreceiver/internal/metadata" @@ -36,11 +37,11 @@ const ( ) // NewFactory creates a factory for memcached receiver. -func NewFactory() component.ReceiverFactory { - return component.NewReceiverFactory( +func NewFactory() receiver.Factory { + return receiver.NewFactory( typeStr, createDefaultConfig, - component.WithMetricsReceiver(createMetricsReceiver, stability)) + receiver.WithMetrics(createMetricsReceiver, stability)) } func createDefaultConfig() component.Config { @@ -59,10 +60,10 @@ func createDefaultConfig() component.Config { func createMetricsReceiver( _ context.Context, - params component.ReceiverCreateSettings, + params receiver.CreateSettings, rConf component.Config, consumer consumer.Metrics, -) (component.MetricsReceiver, error) { +) (receiver.Metrics, error) { cfg := rConf.(*Config) ms := newMemcachedScraper(params, cfg) diff --git a/receiver/memcachedreceiver/factory_test.go b/receiver/memcachedreceiver/factory_test.go index f7fd2d8e7f890..096749ac2b2fb 100644 --- a/receiver/memcachedreceiver/factory_test.go +++ b/receiver/memcachedreceiver/factory_test.go @@ -22,6 +22,7 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/consumer/consumertest" + "go.opentelemetry.io/collector/receiver/receivertest" "go.opentelemetry.io/collector/receiver/scraperhelper" ) @@ -41,7 +42,7 @@ func TestCreateMetricsReceiver(t *testing.T) { factory := NewFactory() metricsReceiver, err := factory.CreateMetricsReceiver( context.Background(), - componenttest.NewNopReceiverCreateSettings(), + receivertest.NewNopCreateSettings(), &Config{ ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ CollectionInterval: 10 * time.Second, diff --git a/receiver/memcachedreceiver/go.mod b/receiver/memcachedreceiver/go.mod index 4a79ff8afc606..84bba2d64e3b1 100644 --- a/receiver/memcachedreceiver/go.mod +++ b/receiver/memcachedreceiver/go.mod @@ -4,14 +4,14 @@ go 1.18 require ( github.com/grobie/gomemcache v0.0.0-20180201122607-1f779c573665 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest v0.66.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest v0.67.0 github.com/stretchr/testify v1.8.1 github.com/testcontainers/testcontainers-go v0.15.0 - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector v0.67.0 + go.opentelemetry.io/collector/component v0.67.0 + go.opentelemetry.io/collector/confmap v0.67.0 + go.opentelemetry.io/collector/consumer v0.67.0 + go.opentelemetry.io/collector/pdata v1.0.0-rc1 go.uber.org/zap v1.24.0 ) @@ -53,7 +53,7 @@ require ( github.com/rogpeppe/go-internal v1.6.1 // indirect github.com/sirupsen/logrus v1.8.1 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/featuregate v0.67.0 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/receiver/memcachedreceiver/go.sum b/receiver/memcachedreceiver/go.sum index 6e3e410e5a828..4986e26d81791 100644 --- a/receiver/memcachedreceiver/go.sum +++ b/receiver/memcachedreceiver/go.sum @@ -823,18 +823,18 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/component v0.67.0 h1:GCBRZAqk4yNaT4L1uwlbbwophFHrxYccLZ4Uj1Ifs/M= +go.opentelemetry.io/collector/component v0.67.0/go.mod h1:Txa2lm9oe7xsGQN8u7GdUIrRpAHFIKsTO4Qi3/CSmKk= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/receiver/memcachedreceiver/integration_test.go b/receiver/memcachedreceiver/integration_test.go index 5c1ae2f70eaa9..37254a7faf288 100644 --- a/receiver/memcachedreceiver/integration_test.go +++ b/receiver/memcachedreceiver/integration_test.go @@ -30,6 +30,7 @@ import ( "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/consumer/consumertest" "go.opentelemetry.io/collector/pdata/pmetric" + "go.opentelemetry.io/collector/receiver/receivertest" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest" ) @@ -59,7 +60,7 @@ func TestIntegration(t *testing.T) { consumer := new(consumertest.MetricsSink) - rcvr, err := f.CreateMetricsReceiver(context.Background(), componenttest.NewNopReceiverCreateSettings(), cfg, consumer) + rcvr, err := f.CreateMetricsReceiver(context.Background(), receivertest.NewNopCreateSettings(), cfg, consumer) require.NoError(t, err, "failed creating metrics receiver") require.NoError(t, rcvr.Start(context.Background(), componenttest.NewNopHost())) diff --git a/receiver/memcachedreceiver/internal/metadata/generated_metrics.go b/receiver/memcachedreceiver/internal/metadata/generated_metrics.go index 665ba2aa86892..61e6120319b36 100644 --- a/receiver/memcachedreceiver/internal/metadata/generated_metrics.go +++ b/receiver/memcachedreceiver/internal/metadata/generated_metrics.go @@ -9,6 +9,7 @@ import ( "go.opentelemetry.io/collector/confmap" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" + "go.opentelemetry.io/collector/receiver" ) // MetricSettings provides common settings for a particular metric. @@ -829,7 +830,7 @@ func WithStartTime(startTime pcommon.Timestamp) metricBuilderOption { } } -func NewMetricsBuilder(ms MetricsSettings, settings component.ReceiverCreateSettings, options ...metricBuilderOption) *MetricsBuilder { +func NewMetricsBuilder(ms MetricsSettings, settings receiver.CreateSettings, options ...metricBuilderOption) *MetricsBuilder { mb := &MetricsBuilder{ startTime: pcommon.NewTimestampFromTime(time.Now()), metricsBuffer: pmetric.NewMetrics(), diff --git a/receiver/memcachedreceiver/internal/metadata/generated_metrics_test.go b/receiver/memcachedreceiver/internal/metadata/generated_metrics_test.go index 9a0d1d681343b..2d81ef3f8e0b3 100644 --- a/receiver/memcachedreceiver/internal/metadata/generated_metrics_test.go +++ b/receiver/memcachedreceiver/internal/metadata/generated_metrics_test.go @@ -7,9 +7,9 @@ import ( "testing" "github.com/stretchr/testify/assert" - "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" + "go.opentelemetry.io/collector/receiver/receivertest" "go.uber.org/zap" "go.uber.org/zap/zaptest/observer" ) @@ -17,7 +17,7 @@ import ( func TestDefaultMetrics(t *testing.T) { start := pcommon.Timestamp(1_000_000_000) ts := pcommon.Timestamp(1_000_001_000) - mb := NewMetricsBuilder(DefaultMetricsSettings(), componenttest.NewNopReceiverCreateSettings(), WithStartTime(start)) + mb := NewMetricsBuilder(DefaultMetricsSettings(), receivertest.NewNopCreateSettings(), WithStartTime(start)) enabledMetrics := make(map[string]bool) enabledMetrics["memcached.bytes"] = true @@ -85,7 +85,7 @@ func TestAllMetrics(t *testing.T) { MemcachedThreads: MetricSettings{Enabled: true}, } observedZapCore, observedLogs := observer.New(zap.WarnLevel) - settings := componenttest.NewNopReceiverCreateSettings() + settings := receivertest.NewNopCreateSettings() settings.Logger = zap.New(observedZapCore) mb := NewMetricsBuilder(metricsSettings, settings, WithStartTime(start)) @@ -296,7 +296,7 @@ func TestNoMetrics(t *testing.T) { MemcachedThreads: MetricSettings{Enabled: false}, } observedZapCore, observedLogs := observer.New(zap.WarnLevel) - settings := componenttest.NewNopReceiverCreateSettings() + settings := receivertest.NewNopCreateSettings() settings.Logger = zap.New(observedZapCore) mb := NewMetricsBuilder(metricsSettings, settings, WithStartTime(start)) diff --git a/receiver/memcachedreceiver/scraper.go b/receiver/memcachedreceiver/scraper.go index cb23860a2855f..924c4c57c96c4 100644 --- a/receiver/memcachedreceiver/scraper.go +++ b/receiver/memcachedreceiver/scraper.go @@ -19,9 +19,9 @@ import ( "strconv" "time" - "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" + "go.opentelemetry.io/collector/receiver" "go.uber.org/zap" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/memcachedreceiver/internal/metadata" @@ -35,7 +35,7 @@ type memcachedScraper struct { } func newMemcachedScraper( - settings component.ReceiverCreateSettings, + settings receiver.CreateSettings, config *Config, ) memcachedScraper { return memcachedScraper{ diff --git a/receiver/memcachedreceiver/scraper_test.go b/receiver/memcachedreceiver/scraper_test.go index 70bcfc6f2c407..33b0126db1a66 100644 --- a/receiver/memcachedreceiver/scraper_test.go +++ b/receiver/memcachedreceiver/scraper_test.go @@ -21,7 +21,7 @@ import ( "time" "github.com/stretchr/testify/require" - "go.opentelemetry.io/collector/component/componenttest" + "go.opentelemetry.io/collector/receiver/receivertest" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest/golden" @@ -30,7 +30,7 @@ import ( func TestScraper(t *testing.T) { f := NewFactory() cfg := f.CreateDefaultConfig().(*Config) - scraper := newMemcachedScraper(componenttest.NewNopReceiverCreateSettings(), cfg) + scraper := newMemcachedScraper(receivertest.NewNopCreateSettings(), cfg) scraper.newClient = func(endpoint string, timeout time.Duration) (client, error) { return &fakeClient{}, nil } diff --git a/receiver/mongodbatlasreceiver/alerts.go b/receiver/mongodbatlasreceiver/alerts.go index 8395853d86151..10e693733519a 100644 --- a/receiver/mongodbatlasreceiver/alerts.go +++ b/receiver/mongodbatlasreceiver/alerts.go @@ -39,6 +39,7 @@ import ( "go.opentelemetry.io/collector/extension/experimental/storage" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/plog" + rcvr "go.opentelemetry.io/collector/receiver" "go.uber.org/multierr" "go.uber.org/zap" @@ -95,7 +96,7 @@ type alertsReceiver struct { storageClient storage.Client } -func newAlertsReceiver(params component.ReceiverCreateSettings, baseConfig *Config, consumer consumer.Logs) (*alertsReceiver, error) { +func newAlertsReceiver(params rcvr.CreateSettings, baseConfig *Config, consumer consumer.Logs) (*alertsReceiver, error) { cfg := baseConfig.Alerts var tlsConfig *tls.Config diff --git a/receiver/mongodbatlasreceiver/alerts_integration_test.go b/receiver/mongodbatlasreceiver/alerts_integration_test.go index a770e9fa9bdac..1b20d3155f9e1 100644 --- a/receiver/mongodbatlasreceiver/alerts_integration_test.go +++ b/receiver/mongodbatlasreceiver/alerts_integration_test.go @@ -42,6 +42,7 @@ import ( "go.opentelemetry.io/collector/config/configtls" "go.opentelemetry.io/collector/consumer/consumertest" "go.opentelemetry.io/collector/pdata/plog" + "go.opentelemetry.io/collector/receiver/receivertest" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/common/testutil" ) @@ -67,7 +68,7 @@ func TestAlertsReceiver(t *testing.T) { recv, err := fact.CreateLogsReceiver( context.Background(), - componenttest.NewNopReceiverCreateSettings(), + receivertest.NewNopCreateSettings(), &Config{ Alerts: AlertConfig{ Enabled: true, @@ -131,7 +132,7 @@ func TestAlertsReceiverTLS(t *testing.T) { recv, err := fact.CreateLogsReceiver( context.Background(), - componenttest.NewNopReceiverCreateSettings(), + receivertest.NewNopCreateSettings(), &Config{ Alerts: AlertConfig{ Enabled: true, @@ -217,7 +218,7 @@ func TestAtlasPoll(t *testing.T) { recv, err := fact.CreateLogsReceiver( context.Background(), - componenttest.NewNopReceiverCreateSettings(), + receivertest.NewNopCreateSettings(), &Config{ Alerts: AlertConfig{ Enabled: true, diff --git a/receiver/mongodbatlasreceiver/alerts_test.go b/receiver/mongodbatlasreceiver/alerts_test.go index 33b49dbc8cdb5..f2464e576af3f 100644 --- a/receiver/mongodbatlasreceiver/alerts_test.go +++ b/receiver/mongodbatlasreceiver/alerts_test.go @@ -38,6 +38,7 @@ import ( "go.opentelemetry.io/collector/exporter/exporterhelper" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/plog" + "go.opentelemetry.io/collector/receiver/receivertest" "go.opentelemetry.io/collector/receiver/scraperhelper" "go.uber.org/zap/zaptest" @@ -410,7 +411,7 @@ func TestHandleRequest(t *testing.T) { consumer = &consumertest.LogsSink{} } - set := componenttest.NewNopReceiverCreateSettings() + set := receivertest.NewNopCreateSettings() set.Logger = zaptest.NewLogger(t) ar, err := newAlertsReceiver(set, &Config{Alerts: AlertConfig{Secret: "some_secret"}}, consumer) require.NoError(t, err, "Failed to create alerts receiver") @@ -726,7 +727,7 @@ func TestAlertsRetrieval(t *testing.T) { t.Run(tc.name, func(t *testing.T) { t.Parallel() logSink := &consumertest.LogsSink{} - alertsRcvr, err := newAlertsReceiver(componenttest.NewNopReceiverCreateSettings(), tc.config(), logSink) + alertsRcvr, err := newAlertsReceiver(receivertest.NewNopCreateSettings(), tc.config(), logSink) require.NoError(t, err) alertsRcvr.client = tc.client() @@ -747,7 +748,7 @@ func TestAlertsRetrieval(t *testing.T) { func TestAlertPollingExclusions(t *testing.T) { logSink := &consumertest.LogsSink{} - alertsRcvr, err := newAlertsReceiver(componenttest.NewNopReceiverCreateSettings(), &Config{ + alertsRcvr, err := newAlertsReceiver(receivertest.NewNopCreateSettings(), &Config{ Alerts: AlertConfig{ Enabled: true, Mode: alertModePoll, diff --git a/receiver/mongodbatlasreceiver/factory.go b/receiver/mongodbatlasreceiver/factory.go index 6b7dcc7c3c29c..b0e028925d1eb 100644 --- a/receiver/mongodbatlasreceiver/factory.go +++ b/receiver/mongodbatlasreceiver/factory.go @@ -22,6 +22,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/exporter/exporterhelper" + rcvr "go.opentelemetry.io/collector/receiver" "go.opentelemetry.io/collector/receiver/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/mongodbatlasreceiver/internal/metadata" @@ -36,21 +37,21 @@ const ( ) // NewFactory creates a factory for MongoDB Atlas receiver -func NewFactory() component.ReceiverFactory { - return component.NewReceiverFactory( +func NewFactory() rcvr.Factory { + return rcvr.NewFactory( typeStr, createDefaultConfig, - component.WithMetricsReceiver(createMetricsReceiver, stability), - component.WithLogsReceiver(createCombinedLogReceiver, stability)) + rcvr.WithMetrics(createMetricsReceiver, stability), + rcvr.WithLogs(createCombinedLogReceiver, stability)) } func createMetricsReceiver( _ context.Context, - params component.ReceiverCreateSettings, + params rcvr.CreateSettings, rConf component.Config, consumer consumer.Metrics, -) (component.MetricsReceiver, error) { +) (rcvr.Metrics, error) { cfg := rConf.(*Config) recv := newMongoDBAtlasReceiver(params, cfg) ms, err := newMongoDBAtlasScraper(recv) @@ -63,10 +64,10 @@ func createMetricsReceiver( func createCombinedLogReceiver( ctx context.Context, - params component.ReceiverCreateSettings, + params rcvr.CreateSettings, rConf component.Config, consumer consumer.Logs, -) (component.LogsReceiver, error) { +) (rcvr.Logs, error) { cfg := rConf.(*Config) if !cfg.Alerts.Enabled && !cfg.Logs.Enabled { diff --git a/receiver/mongodbatlasreceiver/factory_test.go b/receiver/mongodbatlasreceiver/factory_test.go index f5280676ec704..00e0626de3e2e 100644 --- a/receiver/mongodbatlasreceiver/factory_test.go +++ b/receiver/mongodbatlasreceiver/factory_test.go @@ -19,9 +19,9 @@ import ( "testing" "github.com/stretchr/testify/require" - "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config/configtls" "go.opentelemetry.io/collector/consumer/consumertest" + "go.opentelemetry.io/collector/receiver/receivertest" ) func TestType(t *testing.T) { @@ -38,7 +38,7 @@ func TestBadAlertsReceiver(t *testing.T) { cfg.Alerts.TLS = &configtls.TLSServerSetting{ ClientCAFile: "/not/a/file", } - params := componenttest.NewNopReceiverCreateSettings() + params := receivertest.NewNopCreateSettings() _, err := createCombinedLogReceiver(context.Background(), params, cfg, consumertest.NewNop()) require.Error(t, err) diff --git a/receiver/mongodbatlasreceiver/go.mod b/receiver/mongodbatlasreceiver/go.mod index a0dc82cb6a08d..9d04c1e8fbf22 100644 --- a/receiver/mongodbatlasreceiver/go.mod +++ b/receiver/mongodbatlasreceiver/go.mod @@ -5,15 +5,15 @@ go 1.18 require ( github.com/cenkalti/backoff/v4 v4.2.0 github.com/mongodb-forks/digest v1.0.4 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.66.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.67.0 github.com/stretchr/testify v1.8.1 go.mongodb.org/atlas v0.19.0 - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector v0.67.0 + go.opentelemetry.io/collector/component v0.67.0 + go.opentelemetry.io/collector/confmap v0.67.0 + go.opentelemetry.io/collector/consumer v0.67.0 + go.opentelemetry.io/collector/pdata v1.0.0-rc1 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.24.0 ) @@ -40,7 +40,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/stretchr/objx v0.5.0 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/featuregate v0.67.0 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/receiver/mongodbatlasreceiver/go.sum b/receiver/mongodbatlasreceiver/go.sum index 3cce1d242039f..052e085d7b633 100644 --- a/receiver/mongodbatlasreceiver/go.sum +++ b/receiver/mongodbatlasreceiver/go.sum @@ -315,18 +315,18 @@ go.mongodb.org/atlas v0.19.0 h1:gvezG9d0KsSDaExEdTtcGqZHRvvVazzuEcBUpBXxmlg= go.mongodb.org/atlas v0.19.0/go.mod h1:PFk1IGhiGjFXHGVspOK7i1U2nnPjK8wAjYwQf6FoVf4= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/component v0.67.0 h1:GCBRZAqk4yNaT4L1uwlbbwophFHrxYccLZ4Uj1Ifs/M= +go.opentelemetry.io/collector/component v0.67.0/go.mod h1:Txa2lm9oe7xsGQN8u7GdUIrRpAHFIKsTO4Qi3/CSmKk= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/receiver/mongodbatlasreceiver/internal/metadata/generated_metrics.go b/receiver/mongodbatlasreceiver/internal/metadata/generated_metrics.go index b6f8aad579bca..44dc788a90b04 100644 --- a/receiver/mongodbatlasreceiver/internal/metadata/generated_metrics.go +++ b/receiver/mongodbatlasreceiver/internal/metadata/generated_metrics.go @@ -9,6 +9,7 @@ import ( "go.opentelemetry.io/collector/confmap" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" + "go.opentelemetry.io/collector/receiver" ) // MetricSettings provides common settings for a particular metric. @@ -4303,7 +4304,7 @@ func WithStartTime(startTime pcommon.Timestamp) metricBuilderOption { } } -func NewMetricsBuilder(ms MetricsSettings, settings component.ReceiverCreateSettings, options ...metricBuilderOption) *MetricsBuilder { +func NewMetricsBuilder(ms MetricsSettings, settings receiver.CreateSettings, options ...metricBuilderOption) *MetricsBuilder { mb := &MetricsBuilder{ startTime: pcommon.NewTimestampFromTime(time.Now()), metricsBuffer: pmetric.NewMetrics(), diff --git a/receiver/mongodbatlasreceiver/internal/metadata/generated_metrics_test.go b/receiver/mongodbatlasreceiver/internal/metadata/generated_metrics_test.go index 792623d3dcb55..b18021e8e07e1 100644 --- a/receiver/mongodbatlasreceiver/internal/metadata/generated_metrics_test.go +++ b/receiver/mongodbatlasreceiver/internal/metadata/generated_metrics_test.go @@ -7,9 +7,9 @@ import ( "testing" "github.com/stretchr/testify/assert" - "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" + "go.opentelemetry.io/collector/receiver/receivertest" "go.uber.org/zap" "go.uber.org/zap/zaptest/observer" ) @@ -17,7 +17,7 @@ import ( func TestDefaultMetrics(t *testing.T) { start := pcommon.Timestamp(1_000_000_000) ts := pcommon.Timestamp(1_000_001_000) - mb := NewMetricsBuilder(DefaultMetricsSettings(), componenttest.NewNopReceiverCreateSettings(), WithStartTime(start)) + mb := NewMetricsBuilder(DefaultMetricsSettings(), receivertest.NewNopCreateSettings(), WithStartTime(start)) enabledMetrics := make(map[string]bool) enabledMetrics["mongodbatlas.db.counts"] = true @@ -293,7 +293,7 @@ func TestAllMetrics(t *testing.T) { MongodbatlasSystemPagingUsageMax: MetricSettings{Enabled: true}, } observedZapCore, observedLogs := observer.New(zap.WarnLevel) - settings := componenttest.NewNopReceiverCreateSettings() + settings := receivertest.NewNopCreateSettings() settings.Logger = zap.New(observedZapCore) mb := NewMetricsBuilder(metricsSettings, settings, WithStartTime(start)) @@ -1352,7 +1352,7 @@ func TestNoMetrics(t *testing.T) { MongodbatlasSystemPagingUsageMax: MetricSettings{Enabled: false}, } observedZapCore, observedLogs := observer.New(zap.WarnLevel) - settings := componenttest.NewNopReceiverCreateSettings() + settings := receivertest.NewNopCreateSettings() settings.Logger = zap.New(observedZapCore) mb := NewMetricsBuilder(metricsSettings, settings, WithStartTime(start)) diff --git a/receiver/mongodbatlasreceiver/logs.go b/receiver/mongodbatlasreceiver/logs.go index 8573fe808a4bb..3c82ff06271f1 100644 --- a/receiver/mongodbatlasreceiver/logs.go +++ b/receiver/mongodbatlasreceiver/logs.go @@ -26,6 +26,7 @@ import ( "go.mongodb.org/atlas/mongodbatlas" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/consumer" + rcvr "go.opentelemetry.io/collector/receiver" "go.uber.org/zap" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/mongodbatlasreceiver/internal" @@ -53,7 +54,7 @@ type ProjectContext struct { // MongoDB Atlas Documentation reccommends a polling interval of 5 minutes: https://www.mongodb.com/docs/atlas/reference/api/logs/#logs const collectionInterval = time.Minute * 5 -func newMongoDBAtlasLogsReceiver(settings component.ReceiverCreateSettings, cfg *Config, consumer consumer.Logs) *logsReceiver { +func newMongoDBAtlasLogsReceiver(settings rcvr.CreateSettings, cfg *Config, consumer consumer.Logs) *logsReceiver { client := internal.NewMongoDBAtlasClient(cfg.PublicKey, cfg.PrivateKey, cfg.RetrySettings, settings.Logger) return &logsReceiver{ log: settings.Logger, diff --git a/receiver/mongodbatlasreceiver/logs_test.go b/receiver/mongodbatlasreceiver/logs_test.go index e66836b3599d7..213237207608f 100644 --- a/receiver/mongodbatlasreceiver/logs_test.go +++ b/receiver/mongodbatlasreceiver/logs_test.go @@ -22,6 +22,7 @@ import ( "go.mongodb.org/atlas/mongodbatlas" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/consumer/consumertest" + "go.opentelemetry.io/collector/receiver/receivertest" "go.uber.org/zap" ) @@ -49,7 +50,7 @@ func TestDefaultLoggingConfig(t *testing.T) { cfg := factory.CreateDefaultConfig().(*Config) cfg.Logs.Enabled = true - recv, err := createCombinedLogReceiver(context.Background(), componenttest.NewNopReceiverCreateSettings(), cfg, consumertest.NewNop()) + recv, err := createCombinedLogReceiver(context.Background(), receivertest.NewNopCreateSettings(), cfg, consumertest.NewNop()) require.NoError(t, err) require.NotNil(t, recv, "receiver creation failed") @@ -64,7 +65,7 @@ func TestNoLoggingEnabled(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig().(*Config) - recv, err := createCombinedLogReceiver(context.Background(), componenttest.NewNopReceiverCreateSettings(), cfg, consumertest.NewNop()) + recv, err := createCombinedLogReceiver(context.Background(), receivertest.NewNopCreateSettings(), cfg, consumertest.NewNop()) require.Error(t, err) require.Nil(t, recv, "receiver creation failed") } diff --git a/receiver/mongodbatlasreceiver/receiver.go b/receiver/mongodbatlasreceiver/receiver.go index 6496e866fb0a3..088c7003f7974 100644 --- a/receiver/mongodbatlasreceiver/receiver.go +++ b/receiver/mongodbatlasreceiver/receiver.go @@ -21,8 +21,8 @@ import ( "time" "go.mongodb.org/atlas/mongodbatlas" - "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/pdata/pmetric" + rcvr "go.opentelemetry.io/collector/receiver" "go.opentelemetry.io/collector/receiver/scraperhelper" "go.uber.org/zap" @@ -45,7 +45,7 @@ type timeconstraints struct { resolution string } -func newMongoDBAtlasReceiver(settings component.ReceiverCreateSettings, cfg *Config) *receiver { +func newMongoDBAtlasReceiver(settings rcvr.CreateSettings, cfg *Config) *receiver { client := internal.NewMongoDBAtlasClient(cfg.PublicKey, cfg.PrivateKey, cfg.RetrySettings, settings.Logger) return &receiver{ log: settings.Logger, diff --git a/receiver/mongodbatlasreceiver/receiver_test.go b/receiver/mongodbatlasreceiver/receiver_test.go index fbeb49e604285..cf02f414a9a81 100644 --- a/receiver/mongodbatlasreceiver/receiver_test.go +++ b/receiver/mongodbatlasreceiver/receiver_test.go @@ -22,12 +22,13 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/consumer/consumertest" + "go.opentelemetry.io/collector/receiver/receivertest" ) func TestDefaultConfig(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() - recv, err := createMetricsReceiver(context.Background(), componenttest.NewNopReceiverCreateSettings(), cfg, consumertest.NewNop()) + recv, err := createMetricsReceiver(context.Background(), receivertest.NewNopCreateSettings(), cfg, consumertest.NewNop()) require.NoError(t, err) require.NotNil(t, recv, "receiver creation failed") diff --git a/receiver/mongodbreceiver/factory.go b/receiver/mongodbreceiver/factory.go index e9c12f83e41b0..57fd8d5d3e832 100644 --- a/receiver/mongodbreceiver/factory.go +++ b/receiver/mongodbreceiver/factory.go @@ -23,6 +23,7 @@ import ( "go.opentelemetry.io/collector/config/confignet" "go.opentelemetry.io/collector/config/configtls" "go.opentelemetry.io/collector/consumer" + "go.opentelemetry.io/collector/receiver" "go.opentelemetry.io/collector/receiver/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/mongodbreceiver/internal/metadata" @@ -34,11 +35,11 @@ const ( ) // NewFactory creates a factory for mongodb receiver. -func NewFactory() component.ReceiverFactory { - return component.NewReceiverFactory( +func NewFactory() receiver.Factory { + return receiver.NewFactory( typeStr, createDefaultConfig, - component.WithMetricsReceiver(createMetricsReceiver, stability)) + receiver.WithMetrics(createMetricsReceiver, stability)) } func createDefaultConfig() component.Config { @@ -60,10 +61,10 @@ func createDefaultConfig() component.Config { func createMetricsReceiver( _ context.Context, - params component.ReceiverCreateSettings, + params receiver.CreateSettings, rConf component.Config, consumer consumer.Metrics, -) (component.MetricsReceiver, error) { +) (receiver.Metrics, error) { cfg := rConf.(*Config) ms := newMongodbScraper(params, cfg) diff --git a/receiver/mongodbreceiver/factory_test.go b/receiver/mongodbreceiver/factory_test.go index 9633dbf3ce356..920f15538a4a2 100644 --- a/receiver/mongodbreceiver/factory_test.go +++ b/receiver/mongodbreceiver/factory_test.go @@ -21,8 +21,8 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/consumer/consumertest" + "go.opentelemetry.io/collector/receiver/receivertest" "go.opentelemetry.io/collector/receiver/scraperhelper" ) @@ -41,7 +41,7 @@ func TestCreateMetricsReceiver(t *testing.T) { factory := NewFactory() _, err := factory.CreateMetricsReceiver( context.Background(), - componenttest.NewNopReceiverCreateSettings(), + receivertest.NewNopCreateSettings(), &Config{ ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ CollectionInterval: 10 * time.Second, diff --git a/receiver/mongodbreceiver/go.mod b/receiver/mongodbreceiver/go.mod index 758c0c756622b..cbad35b52b4f2 100644 --- a/receiver/mongodbreceiver/go.mod +++ b/receiver/mongodbreceiver/go.mod @@ -4,15 +4,15 @@ go 1.18 require ( github.com/hashicorp/go-version v1.6.0 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest v0.66.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest v0.67.0 github.com/stretchr/testify v1.8.1 github.com/testcontainers/testcontainers-go v0.15.0 go.mongodb.org/mongo-driver v1.10.3 - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector v0.67.0 + go.opentelemetry.io/collector/component v0.67.0 + go.opentelemetry.io/collector/confmap v0.67.0 + go.opentelemetry.io/collector/consumer v0.67.0 + go.opentelemetry.io/collector/pdata v1.0.0-rc1 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.24.0 ) @@ -62,7 +62,7 @@ require ( github.com/xdg-go/stringprep v1.0.3 // indirect github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/featuregate v0.67.0 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/receiver/mongodbreceiver/go.sum b/receiver/mongodbreceiver/go.sum index f0718e2296f74..0ee70ced43a01 100644 --- a/receiver/mongodbreceiver/go.sum +++ b/receiver/mongodbreceiver/go.sum @@ -840,18 +840,18 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/component v0.67.0 h1:GCBRZAqk4yNaT4L1uwlbbwophFHrxYccLZ4Uj1Ifs/M= +go.opentelemetry.io/collector/component v0.67.0/go.mod h1:Txa2lm9oe7xsGQN8u7GdUIrRpAHFIKsTO4Qi3/CSmKk= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/receiver/mongodbreceiver/integration_test.go b/receiver/mongodbreceiver/integration_test.go index 66dc8b4e39a79..3e0dee52daff0 100644 --- a/receiver/mongodbreceiver/integration_test.go +++ b/receiver/mongodbreceiver/integration_test.go @@ -30,6 +30,7 @@ import ( "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config/confignet" "go.opentelemetry.io/collector/consumer/consumertest" + "go.opentelemetry.io/collector/receiver/receivertest" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest/golden" @@ -95,7 +96,7 @@ func TestMongodbIntegration(t *testing.T) { cfg.Insecure = true consumer := new(consumertest.MetricsSink) - settings := componenttest.NewNopReceiverCreateSettings() + settings := receivertest.NewNopCreateSettings() rcvr, err := f.CreateMetricsReceiver(context.Background(), settings, cfg, consumer) require.NoError(t, err, "failed creating metrics receiver") @@ -133,7 +134,7 @@ func TestMongodbIntegration(t *testing.T) { cfg.Insecure = true consumer := new(consumertest.MetricsSink) - settings := componenttest.NewNopReceiverCreateSettings() + settings := receivertest.NewNopCreateSettings() rcvr, err := f.CreateMetricsReceiver(context.Background(), settings, cfg, consumer) require.NoError(t, err, "failed creating metrics receiver") @@ -171,7 +172,7 @@ func TestMongodbIntegration(t *testing.T) { cfg.Insecure = true consumer := new(consumertest.MetricsSink) - settings := componenttest.NewNopReceiverCreateSettings() + settings := receivertest.NewNopCreateSettings() rcvr, err := f.CreateMetricsReceiver(context.Background(), settings, cfg, consumer) require.NoError(t, err, "failed creating metrics receiver") @@ -207,7 +208,7 @@ func TestMongodbIntegration(t *testing.T) { cfg.Insecure = true consumer := new(consumertest.MetricsSink) - settings := componenttest.NewNopReceiverCreateSettings() + settings := receivertest.NewNopCreateSettings() rcvr, err := f.CreateMetricsReceiver(context.Background(), settings, cfg, consumer) require.NoError(t, err, "failed creating metrics receiver") diff --git a/receiver/mongodbreceiver/internal/metadata/generated_metrics.go b/receiver/mongodbreceiver/internal/metadata/generated_metrics.go index 765d12a06544d..f6a4a0f6ca1b8 100644 --- a/receiver/mongodbreceiver/internal/metadata/generated_metrics.go +++ b/receiver/mongodbreceiver/internal/metadata/generated_metrics.go @@ -9,6 +9,7 @@ import ( "go.opentelemetry.io/collector/confmap" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" + "go.opentelemetry.io/collector/receiver" ) // MetricSettings provides common settings for a particular metric. @@ -1776,7 +1777,7 @@ func WithStartTime(startTime pcommon.Timestamp) metricBuilderOption { } } -func NewMetricsBuilder(ms MetricsSettings, settings component.ReceiverCreateSettings, options ...metricBuilderOption) *MetricsBuilder { +func NewMetricsBuilder(ms MetricsSettings, settings receiver.CreateSettings, options ...metricBuilderOption) *MetricsBuilder { mb := &MetricsBuilder{ startTime: pcommon.NewTimestampFromTime(time.Now()), metricsBuffer: pmetric.NewMetrics(), diff --git a/receiver/mongodbreceiver/internal/metadata/generated_metrics_test.go b/receiver/mongodbreceiver/internal/metadata/generated_metrics_test.go index 39f0bf30f097d..6ce28bd59fe29 100644 --- a/receiver/mongodbreceiver/internal/metadata/generated_metrics_test.go +++ b/receiver/mongodbreceiver/internal/metadata/generated_metrics_test.go @@ -7,9 +7,9 @@ import ( "testing" "github.com/stretchr/testify/assert" - "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" + "go.opentelemetry.io/collector/receiver/receivertest" "go.uber.org/zap" "go.uber.org/zap/zaptest/observer" ) @@ -17,7 +17,7 @@ import ( func TestDefaultMetrics(t *testing.T) { start := pcommon.Timestamp(1_000_000_000) ts := pcommon.Timestamp(1_000_001_000) - mb := NewMetricsBuilder(DefaultMetricsSettings(), componenttest.NewNopReceiverCreateSettings(), WithStartTime(start)) + mb := NewMetricsBuilder(DefaultMetricsSettings(), receivertest.NewNopCreateSettings(), WithStartTime(start)) enabledMetrics := make(map[string]bool) enabledMetrics["mongodb.cache.operations"] = true @@ -141,7 +141,7 @@ func TestAllMetrics(t *testing.T) { MongodbStorageSize: MetricSettings{Enabled: true}, } observedZapCore, observedLogs := observer.New(zap.WarnLevel) - settings := componenttest.NewNopReceiverCreateSettings() + settings := receivertest.NewNopCreateSettings() settings.Logger = zap.New(observedZapCore) mb := NewMetricsBuilder(metricsSettings, settings, WithStartTime(start)) @@ -657,7 +657,7 @@ func TestNoMetrics(t *testing.T) { MongodbStorageSize: MetricSettings{Enabled: false}, } observedZapCore, observedLogs := observer.New(zap.WarnLevel) - settings := componenttest.NewNopReceiverCreateSettings() + settings := receivertest.NewNopCreateSettings() settings.Logger = zap.New(observedZapCore) mb := NewMetricsBuilder(metricsSettings, settings, WithStartTime(start)) diff --git a/receiver/mongodbreceiver/scraper.go b/receiver/mongodbreceiver/scraper.go index 4dfc6b1e9255b..543cbd4027847 100644 --- a/receiver/mongodbreceiver/scraper.go +++ b/receiver/mongodbreceiver/scraper.go @@ -25,6 +25,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" + "go.opentelemetry.io/collector/receiver" "go.opentelemetry.io/collector/receiver/scrapererror" "go.uber.org/zap" @@ -39,7 +40,7 @@ type mongodbScraper struct { mb *metadata.MetricsBuilder } -func newMongodbScraper(settings component.ReceiverCreateSettings, config *Config) *mongodbScraper { +func newMongodbScraper(settings receiver.CreateSettings, config *Config) *mongodbScraper { return &mongodbScraper{ logger: settings.Logger, config: config, diff --git a/receiver/mongodbreceiver/scraper_test.go b/receiver/mongodbreceiver/scraper_test.go index 14eee515107d3..db13c93c52bf4 100644 --- a/receiver/mongodbreceiver/scraper_test.go +++ b/receiver/mongodbreceiver/scraper_test.go @@ -30,6 +30,7 @@ import ( "go.mongodb.org/mongo-driver/mongo/integration/mtest" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/pdata/pmetric" + "go.opentelemetry.io/collector/receiver/receivertest" "go.opentelemetry.io/collector/receiver/scrapererror" "go.uber.org/zap" @@ -41,7 +42,7 @@ func TestNewMongodbScraper(t *testing.T) { f := NewFactory() cfg := f.CreateDefaultConfig().(*Config) - scraper := newMongodbScraper(componenttest.NewNopReceiverCreateSettings(), cfg) + scraper := newMongodbScraper(receivertest.NewNopCreateSettings(), cfg) require.NotEmpty(t, scraper.config.hostlist()) } @@ -50,7 +51,7 @@ func TestScraperLifecycle(t *testing.T) { f := NewFactory() cfg := f.CreateDefaultConfig().(*Config) - scraper := newMongodbScraper(componenttest.NewNopReceiverCreateSettings(), cfg) + scraper := newMongodbScraper(receivertest.NewNopCreateSettings(), cfg) require.NoError(t, scraper.start(context.Background(), componenttest.NewNopHost())) require.NoError(t, scraper.shutdown(context.Background())) @@ -279,7 +280,7 @@ func TestScraperScrape(t *testing.T) { for _, tc := range testCases { t.Run(tc.desc, func(t *testing.T) { - scraper := newMongodbScraper(componenttest.NewNopReceiverCreateSettings(), createDefaultConfig().(*Config)) + scraper := newMongodbScraper(receivertest.NewNopCreateSettings(), createDefaultConfig().(*Config)) scraper.client = tc.setupMockClient(t) actualMetrics, err := scraper.scrape(context.Background()) if tc.expectedErr == nil { diff --git a/receiver/mysqlreceiver/factory.go b/receiver/mysqlreceiver/factory.go index 356f41d6d3454..e5ed425b26f10 100644 --- a/receiver/mysqlreceiver/factory.go +++ b/receiver/mysqlreceiver/factory.go @@ -22,6 +22,7 @@ import ( "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confignet" "go.opentelemetry.io/collector/consumer" + "go.opentelemetry.io/collector/receiver" "go.opentelemetry.io/collector/receiver/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/mysqlreceiver/internal/metadata" @@ -32,11 +33,11 @@ const ( stability = component.StabilityLevelBeta ) -func NewFactory() component.ReceiverFactory { - return component.NewReceiverFactory( +func NewFactory() receiver.Factory { + return receiver.NewFactory( typeStr, createDefaultConfig, - component.WithMetricsReceiver(createMetricsReceiver, stability)) + receiver.WithMetrics(createMetricsReceiver, stability)) } func createDefaultConfig() component.Config { @@ -62,10 +63,10 @@ func createDefaultConfig() component.Config { func createMetricsReceiver( _ context.Context, - params component.ReceiverCreateSettings, + params receiver.CreateSettings, rConf component.Config, consumer consumer.Metrics, -) (component.MetricsReceiver, error) { +) (receiver.Metrics, error) { cfg := rConf.(*Config) ns := newMySQLScraper(params, cfg) diff --git a/receiver/mysqlreceiver/factory_test.go b/receiver/mysqlreceiver/factory_test.go index 8e0e357acc01b..4299b5c233cf6 100644 --- a/receiver/mysqlreceiver/factory_test.go +++ b/receiver/mysqlreceiver/factory_test.go @@ -21,10 +21,10 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confignet" "go.opentelemetry.io/collector/consumer/consumertest" + "go.opentelemetry.io/collector/receiver/receivertest" "go.opentelemetry.io/collector/receiver/scraperhelper" ) @@ -47,7 +47,7 @@ func TestCreateMetricsReceiver(t *testing.T) { factory := NewFactory() metricsReceiver, err := factory.CreateMetricsReceiver( context.Background(), - componenttest.NewNopReceiverCreateSettings(), + receivertest.NewNopCreateSettings(), &Config{ ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ ReceiverSettings: config.NewReceiverSettings(component.NewID("mysql")), diff --git a/receiver/mysqlreceiver/go.mod b/receiver/mysqlreceiver/go.mod index 0472b3ad42fe3..5410c57372a06 100644 --- a/receiver/mysqlreceiver/go.mod +++ b/receiver/mysqlreceiver/go.mod @@ -4,15 +4,15 @@ go 1.18 require ( github.com/go-sql-driver/mysql v1.7.0 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest v0.66.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest v0.67.0 github.com/stretchr/testify v1.8.1 github.com/testcontainers/testcontainers-go v0.15.0 - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector v0.67.0 + go.opentelemetry.io/collector/component v0.67.0 + go.opentelemetry.io/collector/confmap v0.67.0 + go.opentelemetry.io/collector/consumer v0.67.0 + go.opentelemetry.io/collector/featuregate v0.67.0 + go.opentelemetry.io/collector/pdata v1.0.0-rc1 go.uber.org/zap v1.24.0 ) diff --git a/receiver/mysqlreceiver/go.sum b/receiver/mysqlreceiver/go.sum index 03f5ecda240d5..be2563bf22e42 100644 --- a/receiver/mysqlreceiver/go.sum +++ b/receiver/mysqlreceiver/go.sum @@ -818,18 +818,18 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/component v0.67.0 h1:GCBRZAqk4yNaT4L1uwlbbwophFHrxYccLZ4Uj1Ifs/M= +go.opentelemetry.io/collector/component v0.67.0/go.mod h1:Txa2lm9oe7xsGQN8u7GdUIrRpAHFIKsTO4Qi3/CSmKk= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/receiver/mysqlreceiver/integration_test.go b/receiver/mysqlreceiver/integration_test.go index f101b29658e51..05533129d353b 100644 --- a/receiver/mysqlreceiver/integration_test.go +++ b/receiver/mysqlreceiver/integration_test.go @@ -29,6 +29,7 @@ import ( "github.com/testcontainers/testcontainers-go/wait" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/consumer/consumertest" + "go.opentelemetry.io/collector/receiver/receivertest" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest/golden" @@ -51,7 +52,7 @@ func TestMySqlIntegration(t *testing.T) { cfg.Password = "otel" consumer := new(consumertest.MetricsSink) - settings := componenttest.NewNopReceiverCreateSettings() + settings := receivertest.NewNopCreateSettings() rcvr, err := f.CreateMetricsReceiver(context.Background(), settings, cfg, consumer) require.NoError(t, err, "failed creating metrics receiver") require.NoError(t, rcvr.Start(context.Background(), componenttest.NewNopHost())) diff --git a/receiver/mysqlreceiver/internal/metadata/generated_metrics.go b/receiver/mysqlreceiver/internal/metadata/generated_metrics.go index 6fad2edfe4233..ecd28c87924d2 100644 --- a/receiver/mysqlreceiver/internal/metadata/generated_metrics.go +++ b/receiver/mysqlreceiver/internal/metadata/generated_metrics.go @@ -11,6 +11,7 @@ import ( "go.opentelemetry.io/collector/confmap" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" + "go.opentelemetry.io/collector/receiver" ) // MetricSettings provides common settings for a particular metric. @@ -3377,7 +3378,7 @@ func WithStartTime(startTime pcommon.Timestamp) metricBuilderOption { } } -func NewMetricsBuilder(ms MetricsSettings, settings component.ReceiverCreateSettings, options ...metricBuilderOption) *MetricsBuilder { +func NewMetricsBuilder(ms MetricsSettings, settings receiver.CreateSettings, options ...metricBuilderOption) *MetricsBuilder { mb := &MetricsBuilder{ startTime: pcommon.NewTimestampFromTime(time.Now()), metricsBuffer: pmetric.NewMetrics(), diff --git a/receiver/mysqlreceiver/internal/metadata/generated_metrics_test.go b/receiver/mysqlreceiver/internal/metadata/generated_metrics_test.go index 642f0f67b528b..428601bafb607 100644 --- a/receiver/mysqlreceiver/internal/metadata/generated_metrics_test.go +++ b/receiver/mysqlreceiver/internal/metadata/generated_metrics_test.go @@ -7,9 +7,9 @@ import ( "testing" "github.com/stretchr/testify/assert" - "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" + "go.opentelemetry.io/collector/receiver/receivertest" "go.uber.org/zap" "go.uber.org/zap/zaptest/observer" ) @@ -17,7 +17,7 @@ import ( func TestDefaultMetrics(t *testing.T) { start := pcommon.Timestamp(1_000_000_000) ts := pcommon.Timestamp(1_000_001_000) - mb := NewMetricsBuilder(DefaultMetricsSettings(), componenttest.NewNopReceiverCreateSettings(), WithStartTime(start)) + mb := NewMetricsBuilder(DefaultMetricsSettings(), receivertest.NewNopCreateSettings(), WithStartTime(start)) enabledMetrics := make(map[string]bool) enabledMetrics["mysql.buffer_pool.data_pages"] = true @@ -190,7 +190,7 @@ func TestAllMetrics(t *testing.T) { MysqlTmpResources: MetricSettings{Enabled: true}, } observedZapCore, observedLogs := observer.New(zap.WarnLevel) - settings := componenttest.NewNopReceiverCreateSettings() + settings := receivertest.NewNopCreateSettings() settings.Logger = zap.New(observedZapCore) mb := NewMetricsBuilder(metricsSettings, settings, WithStartTime(start)) @@ -1012,7 +1012,7 @@ func TestNoMetrics(t *testing.T) { MysqlTmpResources: MetricSettings{Enabled: false}, } observedZapCore, observedLogs := observer.New(zap.WarnLevel) - settings := componenttest.NewNopReceiverCreateSettings() + settings := receivertest.NewNopCreateSettings() settings.Logger = zap.New(observedZapCore) mb := NewMetricsBuilder(metricsSettings, settings, WithStartTime(start)) diff --git a/receiver/mysqlreceiver/scraper.go b/receiver/mysqlreceiver/scraper.go index f6afcd7ff239a..48f38728b93fa 100644 --- a/receiver/mysqlreceiver/scraper.go +++ b/receiver/mysqlreceiver/scraper.go @@ -25,6 +25,7 @@ import ( "go.opentelemetry.io/collector/featuregate" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" + "go.opentelemetry.io/collector/receiver" "go.opentelemetry.io/collector/receiver/scrapererror" "go.uber.org/zap" @@ -57,7 +58,7 @@ type mySQLScraper struct { } func newMySQLScraper( - settings component.ReceiverCreateSettings, + settings receiver.CreateSettings, config *Config, ) *mySQLScraper { ms := &mySQLScraper{ diff --git a/receiver/mysqlreceiver/scraper_test.go b/receiver/mysqlreceiver/scraper_test.go index d56453a091246..3ce1b4b380b44 100644 --- a/receiver/mysqlreceiver/scraper_test.go +++ b/receiver/mysqlreceiver/scraper_test.go @@ -25,9 +25,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config/confignet" "go.opentelemetry.io/collector/featuregate" + "go.opentelemetry.io/collector/receiver/receivertest" "go.opentelemetry.io/collector/receiver/scrapererror" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest" @@ -66,7 +66,7 @@ func TestScrape(t *testing.T) { cfg.Metrics.MysqlConnectionCount.Enabled = true - scraper := newMySQLScraper(componenttest.NewNopReceiverCreateSettings(), cfg) + scraper := newMySQLScraper(receivertest.NewNopCreateSettings(), cfg) scraper.sqlclient = &mockClient{ globalStatsFile: "global_stats", innodbStatsFile: "innodb_stats", @@ -99,7 +99,7 @@ func TestScrape(t *testing.T) { cfg.Metrics.MysqlTableLockWaitWriteCount.Enabled = true cfg.Metrics.MysqlTableLockWaitWriteTime.Enabled = true - scraper := newMySQLScraper(componenttest.NewNopReceiverCreateSettings(), cfg) + scraper := newMySQLScraper(receivertest.NewNopCreateSettings(), cfg) scraper.sqlclient = &mockClient{ globalStatsFile: "global_stats_partial", innodbStatsFile: "innodb_stats_empty", diff --git a/receiver/nginxreceiver/factory.go b/receiver/nginxreceiver/factory.go index ffe2528c449cc..274282f5d263b 100644 --- a/receiver/nginxreceiver/factory.go +++ b/receiver/nginxreceiver/factory.go @@ -22,6 +22,7 @@ import ( "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/consumer" + "go.opentelemetry.io/collector/receiver" "go.opentelemetry.io/collector/receiver/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/nginxreceiver/internal/metadata" @@ -33,11 +34,11 @@ const ( ) // NewFactory creates a factory for nginx receiver. -func NewFactory() component.ReceiverFactory { - return component.NewReceiverFactory( +func NewFactory() receiver.Factory { + return receiver.NewFactory( typeStr, createDefaultConfig, - component.WithMetricsReceiver(createMetricsReceiver, stability)) + receiver.WithMetrics(createMetricsReceiver, stability)) } func createDefaultConfig() component.Config { @@ -56,10 +57,10 @@ func createDefaultConfig() component.Config { func createMetricsReceiver( _ context.Context, - params component.ReceiverCreateSettings, + params receiver.CreateSettings, rConf component.Config, consumer consumer.Metrics, -) (component.MetricsReceiver, error) { +) (receiver.Metrics, error) { cfg := rConf.(*Config) ns := newNginxScraper(params, cfg) diff --git a/receiver/nginxreceiver/factory_test.go b/receiver/nginxreceiver/factory_test.go index eff4e8aebeb3d..9467aa3f3fea2 100644 --- a/receiver/nginxreceiver/factory_test.go +++ b/receiver/nginxreceiver/factory_test.go @@ -22,6 +22,7 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/consumer/consumertest" + "go.opentelemetry.io/collector/receiver/receivertest" "go.opentelemetry.io/collector/receiver/scraperhelper" ) @@ -41,7 +42,7 @@ func TestCreateMetricsReceiver(t *testing.T) { factory := NewFactory() metricsReceiver, err := factory.CreateMetricsReceiver( context.Background(), - componenttest.NewNopReceiverCreateSettings(), + receivertest.NewNopCreateSettings(), &Config{ ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ CollectionInterval: 10 * time.Second, diff --git a/receiver/nginxreceiver/go.mod b/receiver/nginxreceiver/go.mod index dba2799d64545..c94fac7eda3eb 100644 --- a/receiver/nginxreceiver/go.mod +++ b/receiver/nginxreceiver/go.mod @@ -4,14 +4,14 @@ go 1.18 require ( github.com/nginxinc/nginx-prometheus-exporter v0.8.1-0.20201110005315-f5a5f8086c19 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest v0.66.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest v0.67.0 github.com/stretchr/testify v1.8.1 github.com/testcontainers/testcontainers-go v0.15.0 - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector v0.67.0 + go.opentelemetry.io/collector/component v0.67.0 + go.opentelemetry.io/collector/confmap v0.67.0 + go.opentelemetry.io/collector/consumer v0.67.0 + go.opentelemetry.io/collector/pdata v1.0.0-rc1 go.uber.org/zap v1.24.0 ) @@ -57,7 +57,7 @@ require ( github.com/rs/cors v1.8.2 // indirect github.com/sirupsen/logrus v1.8.1 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/featuregate v0.67.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect diff --git a/receiver/nginxreceiver/go.sum b/receiver/nginxreceiver/go.sum index b02aa243a565b..046fe5268ba6e 100644 --- a/receiver/nginxreceiver/go.sum +++ b/receiver/nginxreceiver/go.sum @@ -835,18 +835,18 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/component v0.67.0 h1:GCBRZAqk4yNaT4L1uwlbbwophFHrxYccLZ4Uj1Ifs/M= +go.opentelemetry.io/collector/component v0.67.0/go.mod h1:Txa2lm9oe7xsGQN8u7GdUIrRpAHFIKsTO4Qi3/CSmKk= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 h1:aUEBEdCa6iamGzg6fuYxDA8ThxvOG240mAvWDU+XLio= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4/go.mod h1:l2MdsbKTocpPS5nQZscqTR9jd8u96VYZdcpF8Sye7mA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= diff --git a/receiver/nginxreceiver/integration_test.go b/receiver/nginxreceiver/integration_test.go index 9d33132825893..75ca8aa11e05e 100644 --- a/receiver/nginxreceiver/integration_test.go +++ b/receiver/nginxreceiver/integration_test.go @@ -29,6 +29,7 @@ import ( "github.com/testcontainers/testcontainers-go/wait" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/consumer/consumertest" + "go.opentelemetry.io/collector/receiver/receivertest" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest/golden" @@ -75,7 +76,7 @@ func TestNginxIntegration(t *testing.T) { cfg.Endpoint = fmt.Sprintf("http://%s:8080/status", hostname) consumer := new(consumertest.MetricsSink) - settings := componenttest.NewNopReceiverCreateSettings() + settings := receivertest.NewNopCreateSettings() rcvr, err := f.CreateMetricsReceiver(context.Background(), settings, cfg, consumer) require.NoError(t, err, "failed creating metrics receiver") diff --git a/receiver/nginxreceiver/internal/metadata/generated_metrics.go b/receiver/nginxreceiver/internal/metadata/generated_metrics.go index bb9c3c865daba..b0abafb302fb0 100644 --- a/receiver/nginxreceiver/internal/metadata/generated_metrics.go +++ b/receiver/nginxreceiver/internal/metadata/generated_metrics.go @@ -9,6 +9,7 @@ import ( "go.opentelemetry.io/collector/confmap" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" + "go.opentelemetry.io/collector/receiver" ) // MetricSettings provides common settings for a particular metric. @@ -322,7 +323,7 @@ func WithStartTime(startTime pcommon.Timestamp) metricBuilderOption { } } -func NewMetricsBuilder(ms MetricsSettings, settings component.ReceiverCreateSettings, options ...metricBuilderOption) *MetricsBuilder { +func NewMetricsBuilder(ms MetricsSettings, settings receiver.CreateSettings, options ...metricBuilderOption) *MetricsBuilder { mb := &MetricsBuilder{ startTime: pcommon.NewTimestampFromTime(time.Now()), metricsBuffer: pmetric.NewMetrics(), diff --git a/receiver/nginxreceiver/internal/metadata/generated_metrics_test.go b/receiver/nginxreceiver/internal/metadata/generated_metrics_test.go index a4c1e85867461..eaa6f9ef3e5f7 100644 --- a/receiver/nginxreceiver/internal/metadata/generated_metrics_test.go +++ b/receiver/nginxreceiver/internal/metadata/generated_metrics_test.go @@ -7,9 +7,9 @@ import ( "testing" "github.com/stretchr/testify/assert" - "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" + "go.opentelemetry.io/collector/receiver/receivertest" "go.uber.org/zap" "go.uber.org/zap/zaptest/observer" ) @@ -17,7 +17,7 @@ import ( func TestDefaultMetrics(t *testing.T) { start := pcommon.Timestamp(1_000_000_000) ts := pcommon.Timestamp(1_000_001_000) - mb := NewMetricsBuilder(DefaultMetricsSettings(), componenttest.NewNopReceiverCreateSettings(), WithStartTime(start)) + mb := NewMetricsBuilder(DefaultMetricsSettings(), receivertest.NewNopCreateSettings(), WithStartTime(start)) enabledMetrics := make(map[string]bool) enabledMetrics["nginx.connections_accepted"] = true @@ -57,7 +57,7 @@ func TestAllMetrics(t *testing.T) { NginxRequests: MetricSettings{Enabled: true}, } observedZapCore, observedLogs := observer.New(zap.WarnLevel) - settings := componenttest.NewNopReceiverCreateSettings() + settings := receivertest.NewNopCreateSettings() settings.Logger = zap.New(observedZapCore) mb := NewMetricsBuilder(metricsSettings, settings, WithStartTime(start)) @@ -150,7 +150,7 @@ func TestNoMetrics(t *testing.T) { NginxRequests: MetricSettings{Enabled: false}, } observedZapCore, observedLogs := observer.New(zap.WarnLevel) - settings := componenttest.NewNopReceiverCreateSettings() + settings := receivertest.NewNopCreateSettings() settings.Logger = zap.New(observedZapCore) mb := NewMetricsBuilder(metricsSettings, settings, WithStartTime(start)) diff --git a/receiver/nginxreceiver/scraper.go b/receiver/nginxreceiver/scraper.go index 5612240c533fb..8d30eb615c33c 100644 --- a/receiver/nginxreceiver/scraper.go +++ b/receiver/nginxreceiver/scraper.go @@ -23,6 +23,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" + "go.opentelemetry.io/collector/receiver" "go.uber.org/zap" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/nginxreceiver/internal/metadata" @@ -38,7 +39,7 @@ type nginxScraper struct { } func newNginxScraper( - settings component.ReceiverCreateSettings, + settings receiver.CreateSettings, cfg *Config, ) *nginxScraper { return &nginxScraper{ diff --git a/receiver/nginxreceiver/scraper_test.go b/receiver/nginxreceiver/scraper_test.go index 531ee6d6b7c8f..293973ca47943 100644 --- a/receiver/nginxreceiver/scraper_test.go +++ b/receiver/nginxreceiver/scraper_test.go @@ -27,6 +27,7 @@ import ( "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/config/configtls" + "go.opentelemetry.io/collector/receiver/receivertest" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest/golden" @@ -38,7 +39,7 @@ func TestScraper(t *testing.T) { cfg.Endpoint = nginxMock.URL + "/status" require.NoError(t, component.ValidateConfig(cfg)) - scraper := newNginxScraper(componenttest.NewNopReceiverCreateSettings(), cfg) + scraper := newNginxScraper(receivertest.NewNopCreateSettings(), cfg) err := scraper.start(context.Background(), componenttest.NewNopHost()) require.NoError(t, err) @@ -63,7 +64,7 @@ func TestScraperError(t *testing.T) { rw.WriteHeader(404) })) t.Run("404", func(t *testing.T) { - sc := newNginxScraper(componenttest.NewNopReceiverCreateSettings(), &Config{ + sc := newNginxScraper(receivertest.NewNopCreateSettings(), &Config{ HTTPClientSettings: confighttp.HTTPClientSettings{ Endpoint: nginxMock.URL + "/badpath", }, @@ -75,7 +76,7 @@ func TestScraperError(t *testing.T) { }) t.Run("parse error", func(t *testing.T) { - sc := newNginxScraper(componenttest.NewNopReceiverCreateSettings(), &Config{ + sc := newNginxScraper(receivertest.NewNopCreateSettings(), &Config{ HTTPClientSettings: confighttp.HTTPClientSettings{ Endpoint: nginxMock.URL + "/status", }, @@ -88,7 +89,7 @@ func TestScraperError(t *testing.T) { } func TestScraperFailedStart(t *testing.T) { - sc := newNginxScraper(componenttest.NewNopReceiverCreateSettings(), &Config{ + sc := newNginxScraper(receivertest.NewNopCreateSettings(), &Config{ HTTPClientSettings: confighttp.HTTPClientSettings{ Endpoint: "localhost:8080", TLSSetting: configtls.TLSClientSetting{ diff --git a/receiver/nsxtreceiver/factory.go b/receiver/nsxtreceiver/factory.go index e8b84fbed5818..0957a86997651 100644 --- a/receiver/nsxtreceiver/factory.go +++ b/receiver/nsxtreceiver/factory.go @@ -22,6 +22,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer" + "go.opentelemetry.io/collector/receiver" "go.opentelemetry.io/collector/receiver/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/nsxtreceiver/internal/metadata" @@ -35,11 +36,11 @@ const ( var errConfigNotNSX = errors.New("config was not a NSX receiver config") // NewFactory creates a new receiver factory -func NewFactory() component.ReceiverFactory { - return component.NewReceiverFactory( +func NewFactory() receiver.Factory { + return receiver.NewFactory( typeStr, createDefaultConfig, - component.WithMetricsReceiver(createMetricsReceiver, stability), + receiver.WithMetrics(createMetricsReceiver, stability), ) } @@ -53,7 +54,7 @@ func createDefaultConfig() component.Config { } } -func createMetricsReceiver(ctx context.Context, params component.ReceiverCreateSettings, rConf component.Config, consumer consumer.Metrics) (component.MetricsReceiver, error) { +func createMetricsReceiver(ctx context.Context, params receiver.CreateSettings, rConf component.Config, consumer consumer.Metrics) (receiver.Metrics, error) { cfg, ok := rConf.(*Config) if !ok { return nil, errConfigNotNSX diff --git a/receiver/nsxtreceiver/factory_test.go b/receiver/nsxtreceiver/factory_test.go index 9930db0db4087..6183e06f81724 100644 --- a/receiver/nsxtreceiver/factory_test.go +++ b/receiver/nsxtreceiver/factory_test.go @@ -21,8 +21,8 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/consumer/consumertest" + "go.opentelemetry.io/collector/receiver/receivertest" "go.opentelemetry.io/collector/receiver/scraperhelper" ) @@ -43,7 +43,7 @@ func TestCreateMetricsReceiver(t *testing.T) { factory := NewFactory() _, err := factory.CreateMetricsReceiver( context.Background(), - componenttest.NewNopReceiverCreateSettings(), + receivertest.NewNopCreateSettings(), &Config{ ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ CollectionInterval: 10 * time.Second, @@ -58,8 +58,8 @@ func TestCreateMetricsReceiverNotNSX(t *testing.T) { factory := NewFactory() _, err := factory.CreateMetricsReceiver( context.Background(), - componenttest.NewNopReceiverCreateSettings(), - componenttest.NewNopReceiverFactory().CreateDefaultConfig(), + receivertest.NewNopCreateSettings(), + receivertest.NewNopFactory().CreateDefaultConfig(), consumertest.NewNop(), ) require.Error(t, err) diff --git a/receiver/nsxtreceiver/go.mod b/receiver/nsxtreceiver/go.mod index 5d45a213e98de..e9372542b01a1 100644 --- a/receiver/nsxtreceiver/go.mod +++ b/receiver/nsxtreceiver/go.mod @@ -3,14 +3,14 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/receiver/nsxtre go 1.18 require ( - github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest v0.66.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest v0.67.0 github.com/stretchr/testify v1.8.1 github.com/vmware/go-vmware-nsxt v0.0.0-20220328155605-f49a14c1ef5f - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector v0.67.0 + go.opentelemetry.io/collector/component v0.67.0 + go.opentelemetry.io/collector/confmap v0.67.0 + go.opentelemetry.io/collector/consumer v0.67.0 + go.opentelemetry.io/collector/pdata v1.0.0-rc1 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.24.0 ) @@ -36,7 +36,7 @@ require ( github.com/rs/cors v1.8.2 // indirect github.com/stretchr/objx v0.5.0 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/featuregate v0.67.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect diff --git a/receiver/nsxtreceiver/go.sum b/receiver/nsxtreceiver/go.sum index d8f7564cd8f5b..14345666cf1cb 100644 --- a/receiver/nsxtreceiver/go.sum +++ b/receiver/nsxtreceiver/go.sum @@ -293,18 +293,18 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/component v0.67.0 h1:GCBRZAqk4yNaT4L1uwlbbwophFHrxYccLZ4Uj1Ifs/M= +go.opentelemetry.io/collector/component v0.67.0/go.mod h1:Txa2lm9oe7xsGQN8u7GdUIrRpAHFIKsTO4Qi3/CSmKk= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 h1:aUEBEdCa6iamGzg6fuYxDA8ThxvOG240mAvWDU+XLio= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4/go.mod h1:l2MdsbKTocpPS5nQZscqTR9jd8u96VYZdcpF8Sye7mA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= diff --git a/receiver/nsxtreceiver/internal/metadata/generated_metrics.go b/receiver/nsxtreceiver/internal/metadata/generated_metrics.go index bbf17d2669d94..6e9a2f89a8c6d 100644 --- a/receiver/nsxtreceiver/internal/metadata/generated_metrics.go +++ b/receiver/nsxtreceiver/internal/metadata/generated_metrics.go @@ -9,6 +9,7 @@ import ( "go.opentelemetry.io/collector/confmap" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" + "go.opentelemetry.io/collector/receiver" ) // MetricSettings provides common settings for a particular metric. @@ -569,7 +570,7 @@ func WithStartTime(startTime pcommon.Timestamp) metricBuilderOption { } } -func NewMetricsBuilder(ms MetricsSettings, settings component.ReceiverCreateSettings, options ...metricBuilderOption) *MetricsBuilder { +func NewMetricsBuilder(ms MetricsSettings, settings receiver.CreateSettings, options ...metricBuilderOption) *MetricsBuilder { mb := &MetricsBuilder{ startTime: pcommon.NewTimestampFromTime(time.Now()), metricsBuffer: pmetric.NewMetrics(), diff --git a/receiver/nsxtreceiver/internal/metadata/generated_metrics_test.go b/receiver/nsxtreceiver/internal/metadata/generated_metrics_test.go index ba2993159b8d7..d0be4fed36a78 100644 --- a/receiver/nsxtreceiver/internal/metadata/generated_metrics_test.go +++ b/receiver/nsxtreceiver/internal/metadata/generated_metrics_test.go @@ -7,9 +7,9 @@ import ( "testing" "github.com/stretchr/testify/assert" - "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" + "go.opentelemetry.io/collector/receiver/receivertest" "go.uber.org/zap" "go.uber.org/zap/zaptest/observer" ) @@ -17,7 +17,7 @@ import ( func TestDefaultMetrics(t *testing.T) { start := pcommon.Timestamp(1_000_000_000) ts := pcommon.Timestamp(1_000_001_000) - mb := NewMetricsBuilder(DefaultMetricsSettings(), componenttest.NewNopReceiverCreateSettings(), WithStartTime(start)) + mb := NewMetricsBuilder(DefaultMetricsSettings(), receivertest.NewNopCreateSettings(), WithStartTime(start)) enabledMetrics := make(map[string]bool) enabledMetrics["nsxt.node.cpu.utilization"] = true @@ -69,7 +69,7 @@ func TestAllMetrics(t *testing.T) { NsxtNodeNetworkPacketCount: MetricSettings{Enabled: true}, } observedZapCore, observedLogs := observer.New(zap.WarnLevel) - settings := componenttest.NewNopReceiverCreateSettings() + settings := receivertest.NewNopCreateSettings() settings.Logger = zap.New(observedZapCore) mb := NewMetricsBuilder(metricsSettings, settings, WithStartTime(start)) @@ -233,7 +233,7 @@ func TestNoMetrics(t *testing.T) { NsxtNodeNetworkPacketCount: MetricSettings{Enabled: false}, } observedZapCore, observedLogs := observer.New(zap.WarnLevel) - settings := componenttest.NewNopReceiverCreateSettings() + settings := receivertest.NewNopCreateSettings() settings.Logger = zap.New(observedZapCore) mb := NewMetricsBuilder(metricsSettings, settings, WithStartTime(start)) diff --git a/receiver/nsxtreceiver/scraper.go b/receiver/nsxtreceiver/scraper.go index 723268df4c6f4..669574dac6322 100644 --- a/receiver/nsxtreceiver/scraper.go +++ b/receiver/nsxtreceiver/scraper.go @@ -24,6 +24,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" + "go.opentelemetry.io/collector/receiver" "go.opentelemetry.io/collector/receiver/scrapererror" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/nsxtreceiver/internal/metadata" @@ -38,7 +39,7 @@ type scraper struct { mb *metadata.MetricsBuilder } -func newScraper(cfg *Config, settings component.ReceiverCreateSettings) *scraper { +func newScraper(cfg *Config, settings receiver.CreateSettings) *scraper { return &scraper{ config: cfg, settings: settings.TelemetrySettings, diff --git a/receiver/nsxtreceiver/scraper_test.go b/receiver/nsxtreceiver/scraper_test.go index 67c854e8882e2..5bc7c6c4b8691 100644 --- a/receiver/nsxtreceiver/scraper_test.go +++ b/receiver/nsxtreceiver/scraper_test.go @@ -27,6 +27,7 @@ import ( "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/pdata/pcommon" + "go.opentelemetry.io/collector/receiver/receivertest" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest/golden" @@ -60,7 +61,7 @@ func TestScrape(t *testing.T) { &Config{ Metrics: metadata.DefaultMetricsSettings(), }, - componenttest.NewNopReceiverCreateSettings(), + receivertest.NewNopCreateSettings(), ) scraper.client = mockClient @@ -81,7 +82,7 @@ func TestScrapeTransportNodeErrors(t *testing.T) { &Config{ Metrics: metadata.DefaultMetricsSettings(), }, - componenttest.NewNopReceiverCreateSettings(), + receivertest.NewNopCreateSettings(), ) scraper.client = mockClient @@ -99,7 +100,7 @@ func TestScrapeClusterNodeErrors(t *testing.T) { &Config{ Metrics: metadata.DefaultMetricsSettings(), }, - componenttest.NewNopReceiverCreateSettings(), + receivertest.NewNopCreateSettings(), ) scraper.client = mockClient @@ -117,7 +118,7 @@ func TestStartClientAlreadySet(t *testing.T) { Endpoint: mockClient.URL, }, }, - componenttest.NewNopReceiverCreateSettings(), + receivertest.NewNopCreateSettings(), ) _ = scraper.start(context.Background(), componenttest.NewNopHost()) require.NotNil(t, scraper.client) @@ -131,7 +132,7 @@ func TestStartBadUrl(t *testing.T) { Endpoint: "\x00", }, }, - componenttest.NewNopReceiverCreateSettings(), + receivertest.NewNopCreateSettings(), ) _ = scraper.start(context.Background(), componenttest.NewNopHost()) @@ -146,7 +147,7 @@ func TestScraperRecordNoStat(t *testing.T) { }, Metrics: metadata.DefaultMetricsSettings(), }, - componenttest.NewNopReceiverCreateSettings(), + receivertest.NewNopCreateSettings(), ) scraper.host = componenttest.NewNopHost() scraper.recordNode(pcommon.NewTimestampFromTime(time.Now()), &nodeInfo{stats: nil}) diff --git a/receiver/opencensusreceiver/factory.go b/receiver/opencensusreceiver/factory.go index 8866d7e1e7617..c71e021d7271b 100644 --- a/receiver/opencensusreceiver/factory.go +++ b/receiver/opencensusreceiver/factory.go @@ -22,6 +22,7 @@ import ( "go.opentelemetry.io/collector/config/configgrpc" "go.opentelemetry.io/collector/config/confignet" "go.opentelemetry.io/collector/consumer" + "go.opentelemetry.io/collector/receiver" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent" ) @@ -32,12 +33,12 @@ const ( ) // NewFactory creates a new OpenCensus receiver factory. -func NewFactory() component.ReceiverFactory { - return component.NewReceiverFactory( +func NewFactory() receiver.Factory { + return receiver.NewFactory( typeStr, createDefaultConfig, - component.WithTracesReceiver(createTracesReceiver, stability), - component.WithMetricsReceiver(createMetricsReceiver, stability)) + receiver.WithTraces(createTracesReceiver, stability), + receiver.WithMetrics(createMetricsReceiver, stability)) } func createDefaultConfig() component.Config { @@ -56,10 +57,10 @@ func createDefaultConfig() component.Config { func createTracesReceiver( _ context.Context, - set component.ReceiverCreateSettings, + set receiver.CreateSettings, cfg component.Config, nextConsumer consumer.Traces, -) (component.TracesReceiver, error) { +) (receiver.Traces, error) { var err error r := receivers.GetOrAdd(cfg, func() component.Component { rCfg := cfg.(*Config) @@ -77,10 +78,10 @@ func createTracesReceiver( func createMetricsReceiver( _ context.Context, - set component.ReceiverCreateSettings, + set receiver.CreateSettings, cfg component.Config, nextConsumer consumer.Metrics, -) (component.MetricsReceiver, error) { +) (receiver.Metrics, error) { var err error r := receivers.GetOrAdd(cfg, func() component.Component { rCfg := cfg.(*Config) diff --git a/receiver/opencensusreceiver/factory_test.go b/receiver/opencensusreceiver/factory_test.go index 296d3c0f6730e..dddd2ae6db718 100644 --- a/receiver/opencensusreceiver/factory_test.go +++ b/receiver/opencensusreceiver/factory_test.go @@ -27,6 +27,7 @@ import ( "go.opentelemetry.io/collector/config/configgrpc" "go.opentelemetry.io/collector/config/confignet" "go.opentelemetry.io/collector/consumer/consumertest" + "go.opentelemetry.io/collector/receiver/receivertest" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/common/testutil" ) @@ -41,7 +42,7 @@ func TestCreateReceiver(t *testing.T) { cfg := createDefaultConfig().(*Config) cfg.NetAddr.Endpoint = testutil.GetAvailableLocalAddress(t) - set := componenttest.NewNopReceiverCreateSettings() + set := receivertest.NewNopCreateSettings() tReceiver, err := createTracesReceiver(context.Background(), set, cfg, nil) assert.NotNil(t, tReceiver) assert.NoError(t, err) @@ -97,7 +98,7 @@ func TestCreateTracesReceiver(t *testing.T) { }, } ctx := context.Background() - set := componenttest.NewNopReceiverCreateSettings() + set := receivertest.NewNopCreateSettings() for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { tr, err := createTracesReceiver(ctx, set, tt.cfg, consumertest.NewNop()) @@ -166,7 +167,7 @@ func TestCreateMetricsReceiver(t *testing.T) { }, }, } - set := componenttest.NewNopReceiverCreateSettings() + set := receivertest.NewNopCreateSettings() for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { tc, err := createMetricsReceiver(context.Background(), set, tt.cfg, consumertest.NewNop()) diff --git a/receiver/opencensusreceiver/go.mod b/receiver/opencensusreceiver/go.mod index a6b4de646a55a..9ac165611bf45 100644 --- a/receiver/opencensusreceiver/go.mod +++ b/receiver/opencensusreceiver/go.mod @@ -5,18 +5,18 @@ go 1.18 require ( github.com/census-instrumentation/opencensus-proto v0.4.1 github.com/grpc-ecosystem/grpc-gateway/v2 v2.14.0 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.66.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.67.0 github.com/rs/cors v1.8.2 github.com/soheilhy/cmux v0.1.5 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector v0.67.0 + go.opentelemetry.io/collector/component v0.67.0 + go.opentelemetry.io/collector/confmap v0.67.0 + go.opentelemetry.io/collector/consumer v0.67.0 + go.opentelemetry.io/collector/pdata v1.0.0-rc1 go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4 go.opentelemetry.io/otel v1.11.1 go.opentelemetry.io/otel/sdk v1.11.1 @@ -57,8 +57,8 @@ require ( github.com/prometheus/procfs v0.8.0 // indirect github.com/prometheus/statsd_exporter v0.22.7 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect - go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/featuregate v0.67.0 // indirect + go.opentelemetry.io/collector/semconv v0.67.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.33.0 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/sdk/metric v0.33.0 // indirect diff --git a/receiver/opencensusreceiver/go.sum b/receiver/opencensusreceiver/go.sum index 8b34833a3be4f..b83d5bc4ae149 100644 --- a/receiver/opencensusreceiver/go.sum +++ b/receiver/opencensusreceiver/go.sum @@ -402,20 +402,20 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 h1:Q5L9Urod3c8as6ZYaoaqBjarx/HXxsxy34DFZIU2fO4= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/component v0.67.0 h1:GCBRZAqk4yNaT4L1uwlbbwophFHrxYccLZ4Uj1Ifs/M= +go.opentelemetry.io/collector/component v0.67.0/go.mod h1:Txa2lm9oe7xsGQN8u7GdUIrRpAHFIKsTO4Qi3/CSmKk= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= +go.opentelemetry.io/collector/semconv v0.67.0 h1:zLAvcQa6Kgow52FFLrmk7/9ZVtEYyA73+xDtCcFG78Q= +go.opentelemetry.io/collector/semconv v0.67.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4 h1:PRXhsszxTt5bbPriTjmaweWUsAnJYeWBhUMLRetUgBU= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4/go.mod h1:05eWWy6ZWzmpeImD3UowLTB3VjDMU1yxQ+ENuVWDM3c= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= diff --git a/receiver/opencensusreceiver/internal/ocmetrics/opencensus.go b/receiver/opencensusreceiver/internal/ocmetrics/opencensus.go index 4082403eb1559..7fbdc5a52700b 100644 --- a/receiver/opencensusreceiver/internal/ocmetrics/opencensus.go +++ b/receiver/opencensusreceiver/internal/ocmetrics/opencensus.go @@ -26,6 +26,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/obsreport" + "go.opentelemetry.io/collector/receiver" internaldata "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus" ) @@ -38,7 +39,7 @@ type Receiver struct { } // New creates a new ocmetrics.Receiver reference. -func New(nextConsumer consumer.Metrics, set component.ReceiverCreateSettings) (*Receiver, error) { +func New(nextConsumer consumer.Metrics, set receiver.CreateSettings) (*Receiver, error) { if nextConsumer == nil { return nil, component.ErrNilNextConsumer } diff --git a/receiver/opencensusreceiver/internal/ocmetrics/opencensus_test.go b/receiver/opencensusreceiver/internal/ocmetrics/opencensus_test.go index 6388410bbf598..5ce78d111ecf5 100644 --- a/receiver/opencensusreceiver/internal/ocmetrics/opencensus_test.go +++ b/receiver/opencensusreceiver/internal/ocmetrics/opencensus_test.go @@ -36,6 +36,7 @@ import ( "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/consumer/consumertest" "go.opentelemetry.io/collector/obsreport/obsreporttest" + "go.opentelemetry.io/collector/receiver" "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" "google.golang.org/protobuf/proto" @@ -361,7 +362,7 @@ func nodeToKey(n *commonpb.Node) string { return string(blob) } -func ocReceiverOnGRPCServer(t *testing.T, sr consumer.Metrics, set component.ReceiverCreateSettings) (net.Addr, func()) { +func ocReceiverOnGRPCServer(t *testing.T, sr consumer.Metrics, set receiver.CreateSettings) (net.Addr, func()) { ln, err := net.Listen("tcp", "localhost:") require.NoError(t, err, "Failed to find an available address to run the gRPC server: %v", err) diff --git a/receiver/opencensusreceiver/internal/octrace/observability_test.go b/receiver/opencensusreceiver/internal/octrace/observability_test.go index 1c95ff6376391..738cfe6342915 100644 --- a/receiver/opencensusreceiver/internal/octrace/observability_test.go +++ b/receiver/opencensusreceiver/internal/octrace/observability_test.go @@ -60,7 +60,7 @@ func TestEnsureRecordedMetrics(t *testing.T) { } flush(traceSvcDoneFn) - require.NoError(t, obsreporttest.CheckReceiverTraces(tt, component.NewID("opencensus"), "grpc", int64(n), 0)) + require.NoError(t, tt.CheckReceiverTraces("grpc", int64(n), 0)) } func TestEnsureRecordedMetrics_zeroLengthSpansSender(t *testing.T) { @@ -83,7 +83,7 @@ func TestEnsureRecordedMetrics_zeroLengthSpansSender(t *testing.T) { } flush(traceSvcDoneFn) - require.NoError(t, obsreporttest.CheckReceiverTraces(tt, component.NewID("opencensus"), "grpc", 0, 0)) + require.NoError(t, tt.CheckReceiverTraces("grpc", 0, 0)) } func TestExportSpanLinkingMaintainsParentLink(t *testing.T) { diff --git a/receiver/opencensusreceiver/internal/octrace/opencensus.go b/receiver/opencensusreceiver/internal/octrace/opencensus.go index 96f3e4aa757d6..811d3883b7dc0 100644 --- a/receiver/opencensusreceiver/internal/octrace/opencensus.go +++ b/receiver/opencensusreceiver/internal/octrace/opencensus.go @@ -26,6 +26,7 @@ import ( "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/obsreport" "go.opentelemetry.io/collector/pdata/ptrace" + "go.opentelemetry.io/collector/receiver" internaldata "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus" ) @@ -43,7 +44,7 @@ type Receiver struct { } // New creates a new opencensus.Receiver reference. -func New(nextConsumer consumer.Traces, set component.ReceiverCreateSettings) (*Receiver, error) { +func New(nextConsumer consumer.Traces, set receiver.CreateSettings) (*Receiver, error) { if nextConsumer == nil { return nil, component.ErrNilNextConsumer } diff --git a/receiver/opencensusreceiver/internal/octrace/opencensus_test.go b/receiver/opencensusreceiver/internal/octrace/opencensus_test.go index c9c8d37cca123..f0dc5369b68a8 100644 --- a/receiver/opencensusreceiver/internal/octrace/opencensus_test.go +++ b/receiver/opencensusreceiver/internal/octrace/opencensus_test.go @@ -34,6 +34,7 @@ import ( "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/consumer/consumertest" "go.opentelemetry.io/collector/obsreport/obsreporttest" + "go.opentelemetry.io/collector/receiver" "go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc" "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" @@ -376,7 +377,7 @@ func nodeToKey(n *commonpb.Node) string { return string(blob) } -func ocReceiverOnGRPCServer(t *testing.T, sr consumer.Traces, set component.ReceiverCreateSettings) (net.Addr, func()) { +func ocReceiverOnGRPCServer(t *testing.T, sr consumer.Traces, set receiver.CreateSettings) (net.Addr, func()) { ln, err := net.Listen("tcp", "localhost:0") require.NoError(t, err, "Failed to find an available address to run the gRPC server: %v", err) diff --git a/receiver/opencensusreceiver/opencensus.go b/receiver/opencensusreceiver/opencensus.go index dc6485739e98a..5e4a24927e62d 100644 --- a/receiver/opencensusreceiver/opencensus.go +++ b/receiver/opencensusreceiver/opencensus.go @@ -30,6 +30,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config/configgrpc" "go.opentelemetry.io/collector/consumer" + "go.opentelemetry.io/collector/receiver" "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" @@ -56,7 +57,7 @@ type ocReceiver struct { startTracesReceiverOnce sync.Once startMetricsReceiverOnce sync.Once - settings component.ReceiverCreateSettings + settings receiver.CreateSettings } // newOpenCensusReceiver just creates the OpenCensus receiver services. It is the caller's @@ -67,7 +68,7 @@ func newOpenCensusReceiver( addr string, tc consumer.Traces, mc consumer.Metrics, - settings component.ReceiverCreateSettings, + settings receiver.CreateSettings, opts ...ocOption, ) (*ocReceiver, error) { // TODO: (@odeke-em) use options to enable address binding changes. diff --git a/receiver/opencensusreceiver/opencensus_test.go b/receiver/opencensusreceiver/opencensus_test.go index c1202348ae465..89d892f71f04b 100644 --- a/receiver/opencensusreceiver/opencensus_test.go +++ b/receiver/opencensusreceiver/opencensus_test.go @@ -48,6 +48,7 @@ import ( "go.opentelemetry.io/collector/obsreport/obsreporttest" "go.opentelemetry.io/collector/pdata/pmetric" "go.opentelemetry.io/collector/pdata/ptrace" + "go.opentelemetry.io/collector/receiver/receivertest" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/credentials/insecure" @@ -66,7 +67,7 @@ func TestGrpcGateway_endToEnd(t *testing.T) { // Set the buffer count to 1 to make it flush the test span immediately. sink := new(consumertest.TracesSink) - ocr, err := newOpenCensusReceiver("tcp", addr, sink, nil, componenttest.NewNopReceiverCreateSettings()) + ocr, err := newOpenCensusReceiver("tcp", addr, sink, nil, receivertest.NewNopCreateSettings()) require.NoError(t, err, "Failed to create trace receiver: %v", err) err = ocr.Start(context.Background(), componenttest.NewNopHost()) @@ -152,7 +153,7 @@ func TestTraceGrpcGatewayCors_endToEnd(t *testing.T) { addr := testutil.GetAvailableLocalAddress(t) corsOrigins := []string{"allowed-*.com"} - ocr, err := newOpenCensusReceiver("tcp", addr, consumertest.NewNop(), nil, componenttest.NewNopReceiverCreateSettings(), withCorsOrigins(corsOrigins)) + ocr, err := newOpenCensusReceiver("tcp", addr, consumertest.NewNop(), nil, receivertest.NewNopCreateSettings(), withCorsOrigins(corsOrigins)) require.NoError(t, err, "Failed to create trace receiver: %v", err) t.Cleanup(func() { require.NoError(t, ocr.Shutdown(context.Background())) }) @@ -176,7 +177,7 @@ func TestMetricsGrpcGatewayCors_endToEnd(t *testing.T) { addr := testutil.GetAvailableLocalAddress(t) corsOrigins := []string{"allowed-*.com"} - ocr, err := newOpenCensusReceiver("tcp", addr, nil, consumertest.NewNop(), componenttest.NewNopReceiverCreateSettings(), withCorsOrigins(corsOrigins)) + ocr, err := newOpenCensusReceiver("tcp", addr, nil, consumertest.NewNop(), receivertest.NewNopCreateSettings(), withCorsOrigins(corsOrigins)) require.NoError(t, err, "Failed to create metrics receiver: %v", err) t.Cleanup(func() { require.NoError(t, ocr.Shutdown(context.Background())) }) @@ -229,7 +230,7 @@ func verifyCorsResp(t *testing.T, url string, origin string, wantStatus int, wan func TestStopWithoutStartNeverCrashes(t *testing.T) { addr := testutil.GetAvailableLocalAddress(t) - ocr, err := newOpenCensusReceiver("tcp", addr, nil, nil, componenttest.NewNopReceiverCreateSettings()) + ocr, err := newOpenCensusReceiver("tcp", addr, nil, nil, receivertest.NewNopCreateSettings()) require.NoError(t, err, "Failed to create an OpenCensus receiver: %v", err) // Stop it before ever invoking Start*. require.NoError(t, ocr.Shutdown(context.Background())) @@ -241,14 +242,14 @@ func TestNewPortAlreadyUsed(t *testing.T) { require.NoError(t, err, "failed to listen on %q: %v", addr, err) defer ln.Close() - r, err := newOpenCensusReceiver("tcp", addr, nil, nil, componenttest.NewNopReceiverCreateSettings()) + r, err := newOpenCensusReceiver("tcp", addr, nil, nil, receivertest.NewNopCreateSettings()) require.Error(t, err) require.Nil(t, r) } func TestMultipleStopReceptionShouldNotError(t *testing.T) { addr := testutil.GetAvailableLocalAddress(t) - r, err := newOpenCensusReceiver("tcp", addr, consumertest.NewNop(), consumertest.NewNop(), componenttest.NewNopReceiverCreateSettings()) + r, err := newOpenCensusReceiver("tcp", addr, consumertest.NewNop(), consumertest.NewNop(), receivertest.NewNopCreateSettings()) require.NoError(t, err) require.NotNil(t, r) @@ -258,7 +259,7 @@ func TestMultipleStopReceptionShouldNotError(t *testing.T) { func TestStartWithoutConsumersShouldFail(t *testing.T) { addr := testutil.GetAvailableLocalAddress(t) - r, err := newOpenCensusReceiver("tcp", addr, nil, nil, componenttest.NewNopReceiverCreateSettings()) + r, err := newOpenCensusReceiver("tcp", addr, nil, nil, receivertest.NewNopCreateSettings()) require.NoError(t, err) require.NotNil(t, r) @@ -277,7 +278,7 @@ func tempSocketName(t *testing.T) string { func TestReceiveOnUnixDomainSocket_endToEnd(t *testing.T) { socketName := tempSocketName(t) cbts := consumertest.NewNop() - r, err := newOpenCensusReceiver("unix", socketName, cbts, nil, componenttest.NewNopReceiverCreateSettings()) + r, err := newOpenCensusReceiver("unix", socketName, cbts, nil, receivertest.NewNopCreateSettings()) require.NoError(t, err) require.NotNil(t, r) require.NoError(t, r.Start(context.Background(), componenttest.NewNopHost())) @@ -452,7 +453,7 @@ func TestOCReceiverTrace_HandleNextConsumerResponse(t *testing.T) { } require.Equal(t, tt.expectedReceivedBatches, len(sink.AllTraces())) - require.NoError(t, obsreporttest.CheckReceiverTraces(testTel, exporter.receiverID, "grpc", int64(tt.expectedReceivedBatches), int64(tt.expectedIngestionBlockedRPCs))) + require.NoError(t, testTel.CheckReceiverTraces("grpc", int64(tt.expectedReceivedBatches), int64(tt.expectedIngestionBlockedRPCs))) }) } } @@ -603,7 +604,7 @@ func TestOCReceiverMetrics_HandleNextConsumerResponse(t *testing.T) { } require.Equal(t, tt.expectedReceivedBatches, len(sink.AllMetrics())) - require.NoError(t, obsreporttest.CheckReceiverMetrics(testTel, exporter.receiverID, "grpc", int64(tt.expectedReceivedBatches), int64(tt.expectedIngestionBlockedRPCs))) + require.NoError(t, testTel.CheckReceiverMetrics("grpc", int64(tt.expectedReceivedBatches), int64(tt.expectedIngestionBlockedRPCs))) }) } } @@ -624,7 +625,7 @@ func TestInvalidTLSCredentials(t *testing.T) { assert.NotNil(t, opt) addr := testutil.GetAvailableLocalAddress(t) - ocr, err := newOpenCensusReceiver("tcp", addr, nil, nil, componenttest.NewNopReceiverCreateSettings(), opt...) + ocr, err := newOpenCensusReceiver("tcp", addr, nil, nil, receivertest.NewNopCreateSettings(), opt...) assert.NoError(t, err) assert.NotNil(t, ocr) diff --git a/receiver/oracledbreceiver/factory.go b/receiver/oracledbreceiver/factory.go index a29eb11a5502b..4c803df3f7ad4 100644 --- a/receiver/oracledbreceiver/factory.go +++ b/receiver/oracledbreceiver/factory.go @@ -23,6 +23,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer" + "go.opentelemetry.io/collector/receiver" "go.opentelemetry.io/collector/receiver/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/oracledbreceiver/internal/metadata" @@ -34,11 +35,11 @@ const ( ) // NewFactory creates a new Oracle receiver factory. -func NewFactory() component.ReceiverFactory { - return component.NewReceiverFactory( +func NewFactory() receiver.Factory { + return receiver.NewFactory( typeStr, createDefaultConfig, - component.WithMetricsReceiver(createReceiverFunc(func(dataSourceName string) (*sql.DB, error) { + receiver.WithMetrics(createReceiverFunc(func(dataSourceName string) (*sql.DB, error) { return sql.Open("oracle", dataSourceName) }, newDbClient), stability)) } @@ -56,13 +57,13 @@ func createDefaultConfig() component.Config { type sqlOpenerFunc func(dataSourceName string) (*sql.DB, error) -func createReceiverFunc(sqlOpenerFunc sqlOpenerFunc, clientProviderFunc clientProviderFunc) component.CreateMetricsReceiverFunc { +func createReceiverFunc(sqlOpenerFunc sqlOpenerFunc, clientProviderFunc clientProviderFunc) receiver.CreateMetricsFunc { return func( ctx context.Context, - settings component.ReceiverCreateSettings, + settings receiver.CreateSettings, cfg component.Config, consumer consumer.Metrics, - ) (component.MetricsReceiver, error) { + ) (receiver.Metrics, error) { sqlCfg := cfg.(*Config) metricsBuilder := metadata.NewMetricsBuilder(sqlCfg.MetricsSettings, settings) datasourceURL, _ := url.Parse(sqlCfg.DataSource) diff --git a/receiver/oracledbreceiver/factory_test.go b/receiver/oracledbreceiver/factory_test.go index cd337f7795bfd..2dc8d8448fdd7 100644 --- a/receiver/oracledbreceiver/factory_test.go +++ b/receiver/oracledbreceiver/factory_test.go @@ -21,6 +21,7 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/consumer/consumertest" + "go.opentelemetry.io/collector/receiver" "go.opentelemetry.io/otel/metric" "go.opentelemetry.io/otel/trace" ) @@ -29,7 +30,7 @@ func TestNewFactory(t *testing.T) { factory := NewFactory() _, err := factory.CreateMetricsReceiver( context.Background(), - component.ReceiverCreateSettings{ + receiver.CreateSettings{ TelemetrySettings: component.TelemetrySettings{ TracerProvider: trace.NewNoopTracerProvider(), MeterProvider: metric.NewNoopMeterProvider(), diff --git a/receiver/oracledbreceiver/go.mod b/receiver/oracledbreceiver/go.mod index cec2f15aa9ce0..90cc3820eb618 100644 --- a/receiver/oracledbreceiver/go.mod +++ b/receiver/oracledbreceiver/go.mod @@ -5,11 +5,11 @@ go 1.18 require ( github.com/sijms/go-ora/v2 v2.5.3 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector v0.67.0 + go.opentelemetry.io/collector/component v0.67.0 + go.opentelemetry.io/collector/confmap v0.67.0 + go.opentelemetry.io/collector/consumer v0.67.0 + go.opentelemetry.io/collector/pdata v1.0.0-rc1 go.opentelemetry.io/otel/metric v0.33.0 go.opentelemetry.io/otel/trace v1.11.1 go.uber.org/multierr v1.8.0 @@ -29,7 +29,7 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/featuregate v0.67.0 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.uber.org/atomic v1.10.0 // indirect golang.org/x/net v0.3.0 // indirect diff --git a/receiver/oracledbreceiver/go.sum b/receiver/oracledbreceiver/go.sum index 3aff3e47d0d1e..5cef6bf69bfca 100644 --- a/receiver/oracledbreceiver/go.sum +++ b/receiver/oracledbreceiver/go.sum @@ -278,18 +278,18 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/component v0.67.0 h1:GCBRZAqk4yNaT4L1uwlbbwophFHrxYccLZ4Uj1Ifs/M= +go.opentelemetry.io/collector/component v0.67.0/go.mod h1:Txa2lm9oe7xsGQN8u7GdUIrRpAHFIKsTO4Qi3/CSmKk= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/receiver/oracledbreceiver/internal/metadata/generated_metrics.go b/receiver/oracledbreceiver/internal/metadata/generated_metrics.go index 9ca5392369fb7..9cd1b534db286 100644 --- a/receiver/oracledbreceiver/internal/metadata/generated_metrics.go +++ b/receiver/oracledbreceiver/internal/metadata/generated_metrics.go @@ -11,6 +11,7 @@ import ( "go.opentelemetry.io/collector/confmap" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" + "go.opentelemetry.io/collector/receiver" ) // MetricSettings provides common settings for a particular metric. @@ -1445,7 +1446,7 @@ func WithStartTime(startTime pcommon.Timestamp) metricBuilderOption { } } -func NewMetricsBuilder(ms MetricsSettings, settings component.ReceiverCreateSettings, options ...metricBuilderOption) *MetricsBuilder { +func NewMetricsBuilder(ms MetricsSettings, settings receiver.CreateSettings, options ...metricBuilderOption) *MetricsBuilder { mb := &MetricsBuilder{ startTime: pcommon.NewTimestampFromTime(time.Now()), metricsBuffer: pmetric.NewMetrics(), diff --git a/receiver/oracledbreceiver/internal/metadata/generated_metrics_test.go b/receiver/oracledbreceiver/internal/metadata/generated_metrics_test.go index 791df4b0ac7ab..2cd3dba657a8f 100644 --- a/receiver/oracledbreceiver/internal/metadata/generated_metrics_test.go +++ b/receiver/oracledbreceiver/internal/metadata/generated_metrics_test.go @@ -7,9 +7,9 @@ import ( "testing" "github.com/stretchr/testify/assert" - "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" + "go.opentelemetry.io/collector/receiver/receivertest" "go.uber.org/zap" "go.uber.org/zap/zaptest/observer" ) @@ -17,7 +17,7 @@ import ( func TestDefaultMetrics(t *testing.T) { start := pcommon.Timestamp(1_000_000_000) ts := pcommon.Timestamp(1_000_001_000) - mb := NewMetricsBuilder(DefaultMetricsSettings(), componenttest.NewNopReceiverCreateSettings(), WithStartTime(start)) + mb := NewMetricsBuilder(DefaultMetricsSettings(), receivertest.NewNopCreateSettings(), WithStartTime(start)) enabledMetrics := make(map[string]bool) enabledMetrics["oracledb.cpu_time"] = true @@ -141,7 +141,7 @@ func TestAllMetrics(t *testing.T) { OracledbUserRollbacks: MetricSettings{Enabled: true}, } observedZapCore, observedLogs := observer.New(zap.WarnLevel) - settings := componenttest.NewNopReceiverCreateSettings() + settings := receivertest.NewNopCreateSettings() settings.Logger = zap.New(observedZapCore) mb := NewMetricsBuilder(metricsSettings, settings, WithStartTime(start)) @@ -536,7 +536,7 @@ func TestNoMetrics(t *testing.T) { OracledbUserRollbacks: MetricSettings{Enabled: false}, } observedZapCore, observedLogs := observer.New(zap.WarnLevel) - settings := componenttest.NewNopReceiverCreateSettings() + settings := receivertest.NewNopCreateSettings() settings.Logger = zap.New(observedZapCore) mb := NewMetricsBuilder(metricsSettings, settings, WithStartTime(start)) diff --git a/receiver/oracledbreceiver/scraper_test.go b/receiver/oracledbreceiver/scraper_test.go index 18560dfaf7a88..98294c6abbc57 100644 --- a/receiver/oracledbreceiver/scraper_test.go +++ b/receiver/oracledbreceiver/scraper_test.go @@ -24,6 +24,7 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" + "go.opentelemetry.io/collector/receiver/receivertest" "go.opentelemetry.io/collector/receiver/scrapererror" "go.uber.org/zap" @@ -50,7 +51,7 @@ var queryResponses = map[string][]metricRow{ } func TestScraper_Scrape(t *testing.T) { - metricsBuilder := metadata.NewMetricsBuilder(metadata.DefaultMetricsSettings(), componenttest.NewNopReceiverCreateSettings()) + metricsBuilder := metadata.NewMetricsBuilder(metadata.DefaultMetricsSettings(), receivertest.NewNopCreateSettings()) scrpr := scraper{ logger: zap.NewNop(), @@ -79,7 +80,7 @@ func TestScraper_Scrape(t *testing.T) { } func TestPartial_InvalidScrape(t *testing.T) { - metricsBuilder := metadata.NewMetricsBuilder(metadata.DefaultMetricsSettings(), componenttest.NewNopReceiverCreateSettings()) + metricsBuilder := metadata.NewMetricsBuilder(metadata.DefaultMetricsSettings(), receivertest.NewNopCreateSettings()) scrpr := scraper{ logger: zap.NewNop(), diff --git a/receiver/otlpjsonfilereceiver/file.go b/receiver/otlpjsonfilereceiver/file.go index 960c12ee9b85d..8c890f78a48fa 100644 --- a/receiver/otlpjsonfilereceiver/file.go +++ b/receiver/otlpjsonfilereceiver/file.go @@ -24,6 +24,7 @@ import ( "go.opentelemetry.io/collector/pdata/plog" "go.opentelemetry.io/collector/pdata/pmetric" "go.opentelemetry.io/collector/pdata/ptrace" + rcvr "go.opentelemetry.io/collector/receiver" "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/adapter" "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/fileconsumer" @@ -36,13 +37,13 @@ const ( ) // NewFactory creates a factory for file receiver -func NewFactory() component.ReceiverFactory { - return component.NewReceiverFactory( +func NewFactory() rcvr.Factory { + return rcvr.NewFactory( typeStr, createDefaultConfig, - component.WithMetricsReceiver(createMetricsReceiver, stability), - component.WithLogsReceiver(createLogsReceiver, stability), - component.WithTracesReceiver(createTracesReceiver, stability)) + rcvr.WithMetrics(createMetricsReceiver, stability), + rcvr.WithLogs(createLogsReceiver, stability), + rcvr.WithTraces(createTracesReceiver, stability)) } type Config struct { @@ -76,7 +77,7 @@ func (f *receiver) Shutdown(ctx context.Context) error { return f.input.Stop() } -func createLogsReceiver(_ context.Context, settings component.ReceiverCreateSettings, configuration component.Config, logs consumer.Logs) (component.LogsReceiver, error) { +func createLogsReceiver(_ context.Context, settings rcvr.CreateSettings, configuration component.Config, logs consumer.Logs) (rcvr.Logs, error) { logsUnmarshaler := &plog.JSONUnmarshaler{} obsrecv, err := obsreport.NewReceiver(obsreport.ReceiverSettings{ ReceiverID: settings.ID, @@ -105,7 +106,7 @@ func createLogsReceiver(_ context.Context, settings component.ReceiverCreateSett return &receiver{input: input, id: settings.ID, storageID: cfg.StorageID}, nil } -func createMetricsReceiver(_ context.Context, settings component.ReceiverCreateSettings, configuration component.Config, metrics consumer.Metrics) (component.MetricsReceiver, error) { +func createMetricsReceiver(_ context.Context, settings rcvr.CreateSettings, configuration component.Config, metrics consumer.Metrics) (rcvr.Metrics, error) { metricsUnmarshaler := &pmetric.JSONUnmarshaler{} obsrecv, err := obsreport.NewReceiver(obsreport.ReceiverSettings{ ReceiverID: settings.ID, @@ -134,7 +135,7 @@ func createMetricsReceiver(_ context.Context, settings component.ReceiverCreateS return &receiver{input: input, id: settings.ID, storageID: cfg.StorageID}, nil } -func createTracesReceiver(ctx context.Context, settings component.ReceiverCreateSettings, configuration component.Config, traces consumer.Traces) (component.TracesReceiver, error) { +func createTracesReceiver(ctx context.Context, settings rcvr.CreateSettings, configuration component.Config, traces consumer.Traces) (rcvr.Traces, error) { tracesUnmarshaler := &ptrace.JSONUnmarshaler{} obsrecv, err := obsreport.NewReceiver(obsreport.ReceiverSettings{ ReceiverID: settings.ID, diff --git a/receiver/otlpjsonfilereceiver/file_test.go b/receiver/otlpjsonfilereceiver/file_test.go index 48420ef1c2070..140666186eeb7 100644 --- a/receiver/otlpjsonfilereceiver/file_test.go +++ b/receiver/otlpjsonfilereceiver/file_test.go @@ -31,6 +31,7 @@ import ( "go.opentelemetry.io/collector/pdata/plog" "go.opentelemetry.io/collector/pdata/pmetric" "go.opentelemetry.io/collector/pdata/ptrace" + "go.opentelemetry.io/collector/receiver/receivertest" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal/testdata" "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/fileconsumer" @@ -51,7 +52,7 @@ func TestFileTracesReceiver(t *testing.T) { cfg.Config.Include = []string{filepath.Join(tempFolder, "*")} cfg.Config.StartAt = "beginning" sink := new(consumertest.TracesSink) - receiver, err := factory.CreateTracesReceiver(context.Background(), componenttest.NewNopReceiverCreateSettings(), cfg, sink) + receiver, err := factory.CreateTracesReceiver(context.Background(), receivertest.NewNopCreateSettings(), cfg, sink) assert.NoError(t, err) err = receiver.Start(context.Background(), nil) require.NoError(t, err) @@ -77,7 +78,7 @@ func TestFileMetricsReceiver(t *testing.T) { cfg.Config.Include = []string{filepath.Join(tempFolder, "*")} cfg.Config.StartAt = "beginning" sink := new(consumertest.MetricsSink) - receiver, err := factory.CreateMetricsReceiver(context.Background(), componenttest.NewNopReceiverCreateSettings(), cfg, sink) + receiver, err := factory.CreateMetricsReceiver(context.Background(), receivertest.NewNopCreateSettings(), cfg, sink) assert.NoError(t, err) err = receiver.Start(context.Background(), nil) assert.NoError(t, err) @@ -103,7 +104,7 @@ func TestFileLogsReceiver(t *testing.T) { cfg.Config.Include = []string{filepath.Join(tempFolder, "*")} cfg.Config.StartAt = "beginning" sink := new(consumertest.LogsSink) - receiver, err := factory.CreateLogsReceiver(context.Background(), componenttest.NewNopReceiverCreateSettings(), cfg, sink) + receiver, err := factory.CreateLogsReceiver(context.Background(), receivertest.NewNopCreateSettings(), cfg, sink) assert.NoError(t, err) err = receiver.Start(context.Background(), nil) assert.NoError(t, err) diff --git a/receiver/otlpjsonfilereceiver/go.mod b/receiver/otlpjsonfilereceiver/go.mod index 3f9190a5cbfc9..82b9bcb02c115 100644 --- a/receiver/otlpjsonfilereceiver/go.mod +++ b/receiver/otlpjsonfilereceiver/go.mod @@ -3,14 +3,14 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/receiver/otlpjs go 1.18 require ( - github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.66.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.67.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector v0.67.0 + go.opentelemetry.io/collector/component v0.67.0 + go.opentelemetry.io/collector/confmap v0.67.0 + go.opentelemetry.io/collector/consumer v0.67.0 + go.opentelemetry.io/collector/pdata v1.0.0-rc1 ) require ( @@ -30,7 +30,7 @@ require ( github.com/observiq/ctimefmt v1.0.0 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/featuregate v0.67.0 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/receiver/otlpjsonfilereceiver/go.sum b/receiver/otlpjsonfilereceiver/go.sum index 7309fd1519e34..1ae4d8fcb3221 100644 --- a/receiver/otlpjsonfilereceiver/go.sum +++ b/receiver/otlpjsonfilereceiver/go.sum @@ -294,18 +294,18 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/component v0.67.0 h1:GCBRZAqk4yNaT4L1uwlbbwophFHrxYccLZ4Uj1Ifs/M= +go.opentelemetry.io/collector/component v0.67.0/go.mod h1:Txa2lm9oe7xsGQN8u7GdUIrRpAHFIKsTO4Qi3/CSmKk= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/receiver/podmanreceiver/factory.go b/receiver/podmanreceiver/factory.go index 4d2f7b4bcf481..78f81ea5e71c7 100644 --- a/receiver/podmanreceiver/factory.go +++ b/receiver/podmanreceiver/factory.go @@ -21,6 +21,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer" + rcvr "go.opentelemetry.io/collector/receiver" "go.opentelemetry.io/collector/receiver/scraperhelper" ) @@ -30,11 +31,11 @@ const ( defaultAPIVersion = "3.3.1" ) -func NewFactory() component.ReceiverFactory { - return component.NewReceiverFactory( +func NewFactory() rcvr.Factory { + return rcvr.NewFactory( typeStr, createDefaultReceiverConfig, - component.WithMetricsReceiver(createMetricsReceiver, stability)) + rcvr.WithMetrics(createMetricsReceiver, stability)) } func createDefaultConfig() *Config { @@ -55,10 +56,10 @@ func createDefaultReceiverConfig() component.Config { func createMetricsReceiver( ctx context.Context, - params component.ReceiverCreateSettings, + params rcvr.CreateSettings, config component.Config, consumer consumer.Metrics, -) (component.MetricsReceiver, error) { +) (rcvr.Metrics, error) { podmanConfig := config.(*Config) dsr, err := newReceiver(ctx, params, podmanConfig, consumer, nil) if err != nil { diff --git a/receiver/podmanreceiver/factory_test.go b/receiver/podmanreceiver/factory_test.go index 9349bf9fc92af..a029fbe721413 100644 --- a/receiver/podmanreceiver/factory_test.go +++ b/receiver/podmanreceiver/factory_test.go @@ -25,6 +25,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/consumer/consumertest" + "go.opentelemetry.io/collector/receiver/receivertest" ) func TestCreateDefaultConfig(t *testing.T) { @@ -40,7 +41,7 @@ func TestCreateReceiver(t *testing.T) { factory := NewFactory() config := factory.CreateDefaultConfig() - params := componenttest.NewNopReceiverCreateSettings() + params := receivertest.NewNopCreateSettings() traceReceiver, err := factory.CreateTracesReceiver(context.Background(), params, config, consumertest.NewNop()) assert.ErrorIs(t, err, component.ErrDataTypeIsNotSupported) assert.Nil(t, traceReceiver) @@ -57,7 +58,7 @@ func TestCreateInvalidEndpoint(t *testing.T) { receiverCfg.Endpoint = "" - params := componenttest.NewNopReceiverCreateSettings() + params := receivertest.NewNopCreateSettings() recv, err := factory.CreateMetricsReceiver(context.Background(), params, receiverCfg, consumertest.NewNop()) assert.Nil(t, recv) assert.Error(t, err) diff --git a/receiver/podmanreceiver/go.mod b/receiver/podmanreceiver/go.mod index 3053e0a968cbf..d2b308fa8225a 100644 --- a/receiver/podmanreceiver/go.mod +++ b/receiver/podmanreceiver/go.mod @@ -4,12 +4,12 @@ go 1.18 require ( github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector v0.67.0 + go.opentelemetry.io/collector/component v0.67.0 + go.opentelemetry.io/collector/confmap v0.67.0 + go.opentelemetry.io/collector/consumer v0.67.0 + go.opentelemetry.io/collector/pdata v1.0.0-rc1 + go.opentelemetry.io/collector/semconv v0.67.0 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.24.0 golang.org/x/crypto v0.0.0-20220507011949-2cf3adece122 @@ -31,7 +31,7 @@ require ( github.com/pelletier/go-toml v1.9.4 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/featuregate v0.67.0 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/receiver/podmanreceiver/go.sum b/receiver/podmanreceiver/go.sum index 4dc1ea219aa99..2218c277409e3 100644 --- a/receiver/podmanreceiver/go.sum +++ b/receiver/podmanreceiver/go.sum @@ -284,20 +284,20 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 h1:Q5L9Urod3c8as6ZYaoaqBjarx/HXxsxy34DFZIU2fO4= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/component v0.67.0 h1:GCBRZAqk4yNaT4L1uwlbbwophFHrxYccLZ4Uj1Ifs/M= +go.opentelemetry.io/collector/component v0.67.0/go.mod h1:Txa2lm9oe7xsGQN8u7GdUIrRpAHFIKsTO4Qi3/CSmKk= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= +go.opentelemetry.io/collector/semconv v0.67.0 h1:zLAvcQa6Kgow52FFLrmk7/9ZVtEYyA73+xDtCcFG78Q= +go.opentelemetry.io/collector/semconv v0.67.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/receiver/podmanreceiver/receiver.go b/receiver/podmanreceiver/receiver.go index 790a99b67f2aa..213218ad619d0 100644 --- a/receiver/podmanreceiver/receiver.go +++ b/receiver/podmanreceiver/receiver.go @@ -26,6 +26,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/pdata/pmetric" + rcvr "go.opentelemetry.io/collector/receiver" "go.opentelemetry.io/collector/receiver/scrapererror" "go.opentelemetry.io/collector/receiver/scraperhelper" "go.uber.org/multierr" @@ -33,18 +34,18 @@ import ( type receiver struct { config *Config - set component.ReceiverCreateSettings + set rcvr.CreateSettings clientFactory clientFactory scraper *ContainerScraper } func newReceiver( _ context.Context, - set component.ReceiverCreateSettings, + set rcvr.CreateSettings, config *Config, nextConsumer consumer.Metrics, clientFactory clientFactory, -) (component.MetricsReceiver, error) { +) (rcvr.Metrics, error) { err := config.Validate() if err != nil { return nil, err diff --git a/receiver/podmanreceiver/receiver_test.go b/receiver/podmanreceiver/receiver_test.go index f24c7924996b9..9e0f66621f154 100644 --- a/receiver/podmanreceiver/receiver_test.go +++ b/receiver/podmanreceiver/receiver_test.go @@ -30,6 +30,7 @@ import ( "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/consumer/consumertest" "go.opentelemetry.io/collector/pdata/pmetric" + "go.opentelemetry.io/collector/receiver/receivertest" "go.opentelemetry.io/collector/receiver/scraperhelper" "go.uber.org/zap" ) @@ -42,19 +43,19 @@ func TestNewReceiver(t *testing.T) { }, } nextConsumer := consumertest.NewNop() - mr, err := newReceiver(context.Background(), componenttest.NewNopReceiverCreateSettings(), config, nextConsumer, nil) + mr, err := newReceiver(context.Background(), receivertest.NewNopCreateSettings(), config, nextConsumer, nil) assert.NotNil(t, mr) assert.Nil(t, err) } func TestNewReceiverErrors(t *testing.T) { - r, err := newReceiver(context.Background(), componenttest.NewNopReceiverCreateSettings(), &Config{}, consumertest.NewNop(), nil) + r, err := newReceiver(context.Background(), receivertest.NewNopCreateSettings(), &Config{}, consumertest.NewNop(), nil) assert.Nil(t, r) require.Error(t, err) assert.Equal(t, "config.Endpoint must be specified", err.Error()) - r, err = newReceiver(context.Background(), componenttest.NewNopReceiverCreateSettings(), &Config{Endpoint: "someEndpoint"}, consumertest.NewNop(), nil) + r, err = newReceiver(context.Background(), receivertest.NewNopCreateSettings(), &Config{Endpoint: "someEndpoint"}, consumertest.NewNop(), nil) assert.Nil(t, r) require.Error(t, err) assert.Equal(t, "config.CollectionInterval must be specified", err.Error()) @@ -67,7 +68,7 @@ func TestScraperLoop(t *testing.T) { client := make(mockClient) consumer := make(mockConsumer) - r, err := newReceiver(context.Background(), componenttest.NewNopReceiverCreateSettings(), cfg, consumer, client.factory) + r, err := newReceiver(context.Background(), receivertest.NewNopCreateSettings(), cfg, consumer, client.factory) require.NoError(t, err) assert.NotNil(t, r) diff --git a/receiver/podmanreceiver/receiver_windows.go b/receiver/podmanreceiver/receiver_windows.go index b431b105328fa..c6f41d058af4b 100644 --- a/receiver/podmanreceiver/receiver_windows.go +++ b/receiver/podmanreceiver/receiver_windows.go @@ -18,16 +18,16 @@ import ( "context" "fmt" - "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/consumer" + "go.opentelemetry.io/collector/receiver" ) func newReceiver( _ context.Context, - settings component.ReceiverCreateSettings, + settings receiver.CreateSettings, config *Config, nextConsumer consumer.Metrics, clientFactory interface{}, -) (component.MetricsReceiver, error) { +) (receiver.Metrics, error) { return nil, fmt.Errorf("podman receiver is not supported on windows") } diff --git a/receiver/podmanreceiver/receiver_windows_test.go b/receiver/podmanreceiver/receiver_windows_test.go index 8198c362ae037..377ebcb3ce560 100644 --- a/receiver/podmanreceiver/receiver_windows_test.go +++ b/receiver/podmanreceiver/receiver_windows_test.go @@ -19,12 +19,12 @@ import ( "testing" "github.com/stretchr/testify/assert" - "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/consumer/consumertest" + "go.opentelemetry.io/collector/receiver/receivertest" ) func TestNewReceiver(t *testing.T) { - mr, err := newReceiver(context.Background(), componenttest.NewNopReceiverCreateSettings(), &Config{}, consumertest.NewNop(), nil) + mr, err := newReceiver(context.Background(), receivertest.NewNopCreateSettings(), &Config{}, consumertest.NewNop(), nil) assert.Nil(t, mr) assert.Error(t, err) assert.Equal(t, "podman receiver is not supported on windows", err.Error()) diff --git a/receiver/postgresqlreceiver/factory.go b/receiver/postgresqlreceiver/factory.go index 273f47077464b..55604e06dfb63 100644 --- a/receiver/postgresqlreceiver/factory.go +++ b/receiver/postgresqlreceiver/factory.go @@ -23,6 +23,7 @@ import ( "go.opentelemetry.io/collector/config/confignet" "go.opentelemetry.io/collector/config/configtls" "go.opentelemetry.io/collector/consumer" + "go.opentelemetry.io/collector/receiver" "go.opentelemetry.io/collector/receiver/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/postgresqlreceiver/internal/metadata" @@ -33,11 +34,11 @@ const ( stability = component.StabilityLevelBeta ) -func NewFactory() component.ReceiverFactory { - return component.NewReceiverFactory( +func NewFactory() receiver.Factory { + return receiver.NewFactory( typeStr, createDefaultConfig, - component.WithMetricsReceiver(createMetricsReceiver, stability)) + receiver.WithMetrics(createMetricsReceiver, stability)) } func createDefaultConfig() component.Config { @@ -60,10 +61,10 @@ func createDefaultConfig() component.Config { func createMetricsReceiver( _ context.Context, - params component.ReceiverCreateSettings, + params receiver.CreateSettings, rConf component.Config, consumer consumer.Metrics, -) (component.MetricsReceiver, error) { +) (receiver.Metrics, error) { cfg := rConf.(*Config) ns := newPostgreSQLScraper(params, cfg, &defaultClientFactory{}) diff --git a/receiver/postgresqlreceiver/factory_test.go b/receiver/postgresqlreceiver/factory_test.go index c766e8fde75d9..6d9ce00c41e67 100644 --- a/receiver/postgresqlreceiver/factory_test.go +++ b/receiver/postgresqlreceiver/factory_test.go @@ -21,9 +21,9 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer/consumertest" + "go.opentelemetry.io/collector/receiver/receivertest" "go.opentelemetry.io/collector/receiver/scraperhelper" ) @@ -45,7 +45,7 @@ func TestCreateMetricsReceiver(t *testing.T) { factory := NewFactory() metricsReceiver, err := factory.CreateMetricsReceiver( context.Background(), - componenttest.NewNopReceiverCreateSettings(), + receivertest.NewNopCreateSettings(), &Config{ ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ ReceiverSettings: config.NewReceiverSettings(component.NewID("postgresql")), diff --git a/receiver/postgresqlreceiver/go.mod b/receiver/postgresqlreceiver/go.mod index 6c57404ed9a3f..e9ea65e66418d 100644 --- a/receiver/postgresqlreceiver/go.mod +++ b/receiver/postgresqlreceiver/go.mod @@ -4,15 +4,15 @@ go 1.18 require ( github.com/lib/pq v1.10.7 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest v0.66.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest v0.67.0 github.com/stretchr/testify v1.8.1 github.com/testcontainers/testcontainers-go v0.15.0 - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector v0.67.0 + go.opentelemetry.io/collector/component v0.67.0 + go.opentelemetry.io/collector/confmap v0.67.0 + go.opentelemetry.io/collector/consumer v0.67.0 + go.opentelemetry.io/collector/featuregate v0.67.0 + go.opentelemetry.io/collector/pdata v1.0.0-rc1 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.24.0 ) diff --git a/receiver/postgresqlreceiver/go.sum b/receiver/postgresqlreceiver/go.sum index 0bf54d98a9f2d..e791538a8e34a 100644 --- a/receiver/postgresqlreceiver/go.sum +++ b/receiver/postgresqlreceiver/go.sum @@ -820,18 +820,18 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/component v0.67.0 h1:GCBRZAqk4yNaT4L1uwlbbwophFHrxYccLZ4Uj1Ifs/M= +go.opentelemetry.io/collector/component v0.67.0/go.mod h1:Txa2lm9oe7xsGQN8u7GdUIrRpAHFIKsTO4Qi3/CSmKk= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/receiver/postgresqlreceiver/integration_test.go b/receiver/postgresqlreceiver/integration_test.go index b11d4f9adaa83..9eabe162075c2 100644 --- a/receiver/postgresqlreceiver/integration_test.go +++ b/receiver/postgresqlreceiver/integration_test.go @@ -30,6 +30,7 @@ import ( "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/consumer/consumertest" "go.opentelemetry.io/collector/featuregate" + "go.opentelemetry.io/collector/receiver/receivertest" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest/golden" @@ -143,7 +144,7 @@ func TestPostgreSQLIntegration(t *testing.T) { f := NewFactory() consumer := new(consumertest.MetricsSink) - settings := componenttest.NewNopReceiverCreateSettings() + settings := receivertest.NewNopCreateSettings() rcvr, err := f.CreateMetricsReceiver(context.Background(), settings, tc.cfg(hostname), consumer) require.NoError(t, err, "failed creating metrics receiver") require.NoError(t, rcvr.Start(context.Background(), componenttest.NewNopHost())) diff --git a/receiver/postgresqlreceiver/internal/metadata/generated_metrics.go b/receiver/postgresqlreceiver/internal/metadata/generated_metrics.go index 2b53551efcf33..591567011f3c8 100644 --- a/receiver/postgresqlreceiver/internal/metadata/generated_metrics.go +++ b/receiver/postgresqlreceiver/internal/metadata/generated_metrics.go @@ -9,6 +9,7 @@ import ( "go.opentelemetry.io/collector/confmap" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" + "go.opentelemetry.io/collector/receiver" ) // MetricSettings provides common settings for a particular metric. @@ -1543,7 +1544,7 @@ func WithStartTime(startTime pcommon.Timestamp) metricBuilderOption { } } -func NewMetricsBuilder(ms MetricsSettings, settings component.ReceiverCreateSettings, options ...metricBuilderOption) *MetricsBuilder { +func NewMetricsBuilder(ms MetricsSettings, settings receiver.CreateSettings, options ...metricBuilderOption) *MetricsBuilder { mb := &MetricsBuilder{ startTime: pcommon.NewTimestampFromTime(time.Now()), metricsBuffer: pmetric.NewMetrics(), diff --git a/receiver/postgresqlreceiver/internal/metadata/generated_metrics_test.go b/receiver/postgresqlreceiver/internal/metadata/generated_metrics_test.go index 89dc11d8239c9..9ff3d9c17d137 100644 --- a/receiver/postgresqlreceiver/internal/metadata/generated_metrics_test.go +++ b/receiver/postgresqlreceiver/internal/metadata/generated_metrics_test.go @@ -7,9 +7,9 @@ import ( "testing" "github.com/stretchr/testify/assert" - "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" + "go.opentelemetry.io/collector/receiver/receivertest" "go.uber.org/zap" "go.uber.org/zap/zaptest/observer" ) @@ -17,7 +17,7 @@ import ( func TestDefaultMetrics(t *testing.T) { start := pcommon.Timestamp(1_000_000_000) ts := pcommon.Timestamp(1_000_001_000) - mb := NewMetricsBuilder(DefaultMetricsSettings(), componenttest.NewNopReceiverCreateSettings(), WithStartTime(start)) + mb := NewMetricsBuilder(DefaultMetricsSettings(), receivertest.NewNopCreateSettings(), WithStartTime(start)) enabledMetrics := make(map[string]bool) enabledMetrics["postgresql.backends"] = true @@ -129,7 +129,7 @@ func TestAllMetrics(t *testing.T) { PostgresqlWalLag: MetricSettings{Enabled: true}, } observedZapCore, observedLogs := observer.New(zap.WarnLevel) - settings := componenttest.NewNopReceiverCreateSettings() + settings := receivertest.NewNopCreateSettings() settings.Logger = zap.New(observedZapCore) mb := NewMetricsBuilder(metricsSettings, settings, WithStartTime(start)) @@ -550,7 +550,7 @@ func TestNoMetrics(t *testing.T) { PostgresqlWalLag: MetricSettings{Enabled: false}, } observedZapCore, observedLogs := observer.New(zap.WarnLevel) - settings := componenttest.NewNopReceiverCreateSettings() + settings := receivertest.NewNopCreateSettings() settings.Logger = zap.New(observedZapCore) mb := NewMetricsBuilder(metricsSettings, settings, WithStartTime(start)) diff --git a/receiver/postgresqlreceiver/scraper.go b/receiver/postgresqlreceiver/scraper.go index 346d2068fc47d..5a3146b1a0716 100644 --- a/receiver/postgresqlreceiver/scraper.go +++ b/receiver/postgresqlreceiver/scraper.go @@ -21,10 +21,10 @@ import ( "sync" "time" - "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/featuregate" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" + "go.opentelemetry.io/collector/receiver" "go.opentelemetry.io/collector/receiver/scrapererror" "go.uber.org/zap" @@ -85,7 +85,7 @@ func (d *defaultClientFactory) getClient(c *Config, database string) (client, er } func newPostgreSQLScraper( - settings component.ReceiverCreateSettings, + settings receiver.CreateSettings, config *Config, clientFactory postgreSQLClientFactory, ) *postgreSQLScraper { diff --git a/receiver/postgresqlreceiver/scraper_test.go b/receiver/postgresqlreceiver/scraper_test.go index 88ae36a0b75ff..6b9386dbd8204 100644 --- a/receiver/postgresqlreceiver/scraper_test.go +++ b/receiver/postgresqlreceiver/scraper_test.go @@ -22,8 +22,8 @@ import ( "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/pdata/pmetric" + "go.opentelemetry.io/collector/receiver/receivertest" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest/golden" @@ -34,7 +34,7 @@ func TestUnsuccessfulScrape(t *testing.T) { cfg := factory.CreateDefaultConfig().(*Config) cfg.Endpoint = "fake:11111" - scraper := newPostgreSQLScraper(componenttest.NewNopReceiverCreateSettings(), cfg, &defaultClientFactory{}) + scraper := newPostgreSQLScraper(receivertest.NewNopCreateSettings(), cfg, &defaultClientFactory{}) scraper.emitMetricsWithResourceAttributes = false scraper.emitMetricsWithoutResourceAttributes = true @@ -50,7 +50,7 @@ func TestScraper(t *testing.T) { cfg := createDefaultConfig().(*Config) cfg.Databases = []string{"otel"} - scraper := newPostgreSQLScraper(componenttest.NewNopReceiverCreateSettings(), cfg, factory) + scraper := newPostgreSQLScraper(receivertest.NewNopCreateSettings(), cfg, factory) scraper.emitMetricsWithResourceAttributes = false scraper.emitMetricsWithoutResourceAttributes = true @@ -69,7 +69,7 @@ func TestScraperNoDatabaseSingle(t *testing.T) { factory.initMocks([]string{"otel"}) cfg := createDefaultConfig().(*Config) - scraper := newPostgreSQLScraper(componenttest.NewNopReceiverCreateSettings(), cfg, factory) + scraper := newPostgreSQLScraper(receivertest.NewNopCreateSettings(), cfg, factory) scraper.emitMetricsWithResourceAttributes = false scraper.emitMetricsWithoutResourceAttributes = true @@ -88,7 +88,7 @@ func TestScraperNoDatabaseMultiple(t *testing.T) { factory.initMocks([]string{"otel", "open", "telemetry"}) cfg := createDefaultConfig().(*Config) - scraper := newPostgreSQLScraper(componenttest.NewNopReceiverCreateSettings(), cfg, &factory) + scraper := newPostgreSQLScraper(receivertest.NewNopCreateSettings(), cfg, &factory) scraper.emitMetricsWithResourceAttributes = false scraper.emitMetricsWithoutResourceAttributes = true @@ -107,7 +107,7 @@ func TestScraperWithResourceAttributeFeatureGate(t *testing.T) { factory.initMocks([]string{"otel", "open", "telemetry"}) cfg := createDefaultConfig().(*Config) - scraper := newPostgreSQLScraper(componenttest.NewNopReceiverCreateSettings(), cfg, &factory) + scraper := newPostgreSQLScraper(receivertest.NewNopCreateSettings(), cfg, &factory) actualMetrics, err := scraper.scrape(context.Background()) require.NoError(t, err) @@ -124,7 +124,7 @@ func TestScraperWithResourceAttributeFeatureGateSingle(t *testing.T) { factory.initMocks([]string{"otel"}) cfg := createDefaultConfig().(*Config) - scraper := newPostgreSQLScraper(componenttest.NewNopReceiverCreateSettings(), cfg, &factory) + scraper := newPostgreSQLScraper(receivertest.NewNopCreateSettings(), cfg, &factory) actualMetrics, err := scraper.scrape(context.Background()) require.NoError(t, err) diff --git a/receiver/prometheusexecreceiver/factory.go b/receiver/prometheusexecreceiver/factory.go index 56307bb739bce..ee4a622ecea74 100644 --- a/receiver/prometheusexecreceiver/factory.go +++ b/receiver/prometheusexecreceiver/factory.go @@ -22,6 +22,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer" + "go.opentelemetry.io/collector/receiver" "go.uber.org/zap" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusexecreceiver/subprocessmanager" @@ -40,11 +41,11 @@ const ( var once sync.Once // NewFactory creates a factory for the prometheusexec receiver -func NewFactory() component.ReceiverFactory { - return component.NewReceiverFactory( +func NewFactory() receiver.Factory { + return receiver.NewFactory( typeStr, createDefaultConfig, - component.WithMetricsReceiver(createMetricsReceiver, stability)) + receiver.WithMetrics(createMetricsReceiver, stability)) } func logDeprecation(logger *zap.Logger) { @@ -68,10 +69,10 @@ func createDefaultConfig() component.Config { // createMetricsReceiver creates a metrics receiver based on provided Config. func createMetricsReceiver( ctx context.Context, - params component.ReceiverCreateSettings, + params receiver.CreateSettings, cfg component.Config, nextConsumer consumer.Metrics, -) (component.MetricsReceiver, error) { +) (receiver.Metrics, error) { logDeprecation(params.Logger) rCfg := cfg.(*Config) return newPromExecReceiver(params, rCfg, nextConsumer), nil diff --git a/receiver/prometheusexecreceiver/factory_test.go b/receiver/prometheusexecreceiver/factory_test.go index 3d93413e29b7d..9a9a113117eec 100644 --- a/receiver/prometheusexecreceiver/factory_test.go +++ b/receiver/prometheusexecreceiver/factory_test.go @@ -25,9 +25,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/confmap/confmaptest" + "go.opentelemetry.io/collector/receiver" + "go.opentelemetry.io/collector/receiver/receivertest" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusexecreceiver/subprocessmanager" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver" @@ -35,8 +36,8 @@ import ( func TestCreateTraceAndMetricsReceiver(t *testing.T) { var ( - traceReceiver component.TracesReceiver - metricReceiver component.MetricsReceiver + traceReceiver receiver.Traces + metricReceiver receiver.Metrics ) cm, err := confmaptest.LoadConf(filepath.Join("testdata", "config.yaml")) @@ -52,7 +53,7 @@ func TestCreateTraceAndMetricsReceiver(t *testing.T) { assert.NotNil(t, cfg) // Test CreateTracesReceiver - traceReceiver, err = factory.CreateTracesReceiver(context.Background(), componenttest.NewNopReceiverCreateSettings(), cfg, nil) + traceReceiver, err = factory.CreateTracesReceiver(context.Background(), receivertest.NewNopCreateSettings(), cfg, nil) assert.Equal(t, nil, traceReceiver) assert.ErrorIs(t, err, component.ErrDataTypeIsNotSupported) @@ -64,7 +65,7 @@ func TestCreateTraceAndMetricsReceiver(t *testing.T) { sub, err = cm.Sub(component.NewIDWithName(typeStr, "test").String()) require.NoError(t, err) require.NoError(t, component.UnmarshalConfig(sub, cfg)) - set := componenttest.NewNopReceiverCreateSettings() + set := receivertest.NewNopCreateSettings() set.ID = component.NewID(typeStr) metricReceiver, err = factory.CreateMetricsReceiver(context.Background(), set, cfg, nil) assert.Equal(t, nil, err) diff --git a/receiver/prometheusexecreceiver/go.mod b/receiver/prometheusexecreceiver/go.mod index 2e2aa425981e8..2c7dac20c989b 100644 --- a/receiver/prometheusexecreceiver/go.mod +++ b/receiver/prometheusexecreceiver/go.mod @@ -5,15 +5,15 @@ go 1.18 require ( github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.66.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.67.0 github.com/prometheus/common v0.37.0 github.com/prometheus/prometheus v0.40.5 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector v0.67.0 + go.opentelemetry.io/collector/component v0.67.0 + go.opentelemetry.io/collector/confmap v0.67.0 + go.opentelemetry.io/collector/consumer v0.67.0 + go.opentelemetry.io/collector/pdata v1.0.0-rc1 go.uber.org/zap v1.24.0 ) @@ -106,7 +106,7 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheus v0.66.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheus v0.67.0 // indirect github.com/opencontainers/go-digest v1.0.0 // indirect github.com/opencontainers/image-spec v1.0.2 // indirect github.com/ovh/go-ovh v1.1.0 // indirect @@ -121,8 +121,8 @@ require ( github.com/spf13/pflag v1.0.5 // indirect github.com/vultr/govultr/v2 v2.17.2 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect - go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/featuregate v0.67.0 // indirect + go.opentelemetry.io/collector/semconv v0.67.0 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/receiver/prometheusexecreceiver/go.sum b/receiver/prometheusexecreceiver/go.sum index bcfbd5e29ca40..27e314cffaa2b 100644 --- a/receiver/prometheusexecreceiver/go.sum +++ b/receiver/prometheusexecreceiver/go.sum @@ -640,21 +640,21 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221202005155-1c54042beb70 h1:Y4e8NnVevonnAgmjX9Z7QIMA32yMqHAOnAlh8SzTS8c= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 h1:Q5L9Urod3c8as6ZYaoaqBjarx/HXxsxy34DFZIU2fO4= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/component v0.67.0 h1:GCBRZAqk4yNaT4L1uwlbbwophFHrxYccLZ4Uj1Ifs/M= +go.opentelemetry.io/collector/component v0.67.0/go.mod h1:Txa2lm9oe7xsGQN8u7GdUIrRpAHFIKsTO4Qi3/CSmKk= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= +go.opentelemetry.io/collector/processor/batchprocessor v0.67.0 h1:Qn4Ytth3q1trwTSAYYTzIRs4SBh9rz0xBou1nZB+Dko= +go.opentelemetry.io/collector/semconv v0.67.0 h1:zLAvcQa6Kgow52FFLrmk7/9ZVtEYyA73+xDtCcFG78Q= +go.opentelemetry.io/collector/semconv v0.67.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 h1:aUEBEdCa6iamGzg6fuYxDA8ThxvOG240mAvWDU+XLio= go.opentelemetry.io/contrib/propagators/b3 v1.11.1 h1:icQ6ttRV+r/2fnU46BIo/g/mPu6Rs5Ug8Rtohe3KqzI= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= diff --git a/receiver/prometheusexecreceiver/receiver.go b/receiver/prometheusexecreceiver/receiver.go index 0a1e55cd8ca00..768e5e733d552 100644 --- a/receiver/prometheusexecreceiver/receiver.go +++ b/receiver/prometheusexecreceiver/receiver.go @@ -30,6 +30,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer" + "go.opentelemetry.io/collector/receiver" "go.uber.org/zap" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusexecreceiver/subprocessmanager" @@ -52,7 +53,7 @@ const ( ) type prometheusExecReceiver struct { - params component.ReceiverCreateSettings + params receiver.CreateSettings config *Config consumer consumer.Metrics @@ -64,7 +65,7 @@ type prometheusExecReceiver struct { port int // Underlying receiver data - prometheusReceiver component.MetricsReceiver + prometheusReceiver receiver.Metrics // Shutdown channel shutdownCh chan struct{} @@ -76,7 +77,7 @@ type runResult struct { } // newPromExecReceiver returns a prometheusExecReceiver -func newPromExecReceiver(params component.ReceiverCreateSettings, config *Config, consumer consumer.Metrics) *prometheusExecReceiver { +func newPromExecReceiver(params receiver.CreateSettings, config *Config, consumer consumer.Metrics) *prometheusExecReceiver { subprocessConfig := getSubprocessConfig(config) promReceiverConfig := getPromReceiverConfig(params.ID, config) @@ -179,7 +180,7 @@ func (per *prometheusExecReceiver) manageProcess(ctx context.Context, host compo } // createAndStartReceiver will create the underlying Prometheus receiver and generate a random port if one is needed, then start it -func (per *prometheusExecReceiver) createAndStartReceiver(ctx context.Context, host component.Host) (component.MetricsReceiver, error) { +func (per *prometheusExecReceiver) createAndStartReceiver(ctx context.Context, host component.Host) (receiver.Metrics, error) { currentPort := per.port // Generate a port if none was specified diff --git a/receiver/prometheusexecreceiver/receiver_test.go b/receiver/prometheusexecreceiver/receiver_test.go index ad015b0456136..fe3298f6c9a27 100644 --- a/receiver/prometheusexecreceiver/receiver_test.go +++ b/receiver/prometheusexecreceiver/receiver_test.go @@ -32,6 +32,7 @@ import ( "go.opentelemetry.io/collector/confmap/confmaptest" "go.opentelemetry.io/collector/consumer/consumertest" "go.opentelemetry.io/collector/pdata/pmetric" + "go.opentelemetry.io/collector/receiver/receivertest" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusexecreceiver/subprocessmanager" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver" @@ -57,7 +58,7 @@ func TestEndToEnd(t *testing.T) { // endToEndScrapeTest creates a receiver that invokes `go run test_prometheus_exporter.go` and waits until it has scraped the /metrics endpoint twice - the application will crash between each scrape func endToEndScrapeTest(t *testing.T, receiverConfig component.Config, testName string) { //nolint sink := new(consumertest.MetricsSink) - wrapper := newPromExecReceiver(componenttest.NewNopReceiverCreateSettings(), receiverConfig.(*Config), sink) + wrapper := newPromExecReceiver(receivertest.NewNopCreateSettings(), receiverConfig.(*Config), sink) ctx := context.Background() err := wrapper.Start(ctx, componenttest.NewNopHost()) diff --git a/receiver/prometheusreceiver/factory.go b/receiver/prometheusreceiver/factory.go index edc80f168ce9a..4944d5d66b553 100644 --- a/receiver/prometheusreceiver/factory.go +++ b/receiver/prometheusreceiver/factory.go @@ -23,6 +23,7 @@ import ( "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/featuregate" + "go.opentelemetry.io/collector/receiver" ) // This file implements config for Prometheus receiver. @@ -35,11 +36,11 @@ const ( var errRenamingDisallowed = errors.New("metric renaming using metric_relabel_configs is disallowed") // NewFactory creates a new Prometheus receiver factory. -func NewFactory() component.ReceiverFactory { - return component.NewReceiverFactory( +func NewFactory() receiver.Factory { + return receiver.NewFactory( typeStr, createDefaultConfig, - component.WithMetricsReceiver(createMetricsReceiver, stability)) + receiver.WithMetrics(createMetricsReceiver, stability)) } func createDefaultConfig() component.Config { @@ -50,9 +51,9 @@ func createDefaultConfig() component.Config { func createMetricsReceiver( _ context.Context, - set component.ReceiverCreateSettings, + set receiver.CreateSettings, cfg component.Config, nextConsumer consumer.Metrics, -) (component.MetricsReceiver, error) { +) (receiver.Metrics, error) { return newPrometheusReceiver(set, cfg.(*Config), nextConsumer, featuregate.GetRegistry()), nil } diff --git a/receiver/prometheusreceiver/factory_test.go b/receiver/prometheusreceiver/factory_test.go index 28757542cb7ef..5d63d48c715fe 100644 --- a/receiver/prometheusreceiver/factory_test.go +++ b/receiver/prometheusreceiver/factory_test.go @@ -24,6 +24,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/confmap/confmaptest" + "go.opentelemetry.io/collector/receiver/receivertest" ) func TestCreateDefaultConfig(t *testing.T) { @@ -37,7 +38,7 @@ func TestCreateReceiver(t *testing.T) { // The default config does not provide scrape_config so we expect that metrics receiver // creation must also fail. - creationSet := componenttest.NewNopReceiverCreateSettings() + creationSet := receivertest.NewNopCreateSettings() mReceiver, _ := createMetricsReceiver(context.Background(), creationSet, cfg, nil) assert.NotNil(t, mReceiver) } diff --git a/receiver/prometheusreceiver/go.mod b/receiver/prometheusreceiver/go.mod index 4e446fd504918..a0ed47c2b9dae 100644 --- a/receiver/prometheusreceiver/go.mod +++ b/receiver/prometheusreceiver/go.mod @@ -7,19 +7,19 @@ require ( github.com/gogo/protobuf v1.3.2 github.com/golang/snappy v0.0.4 github.com/mitchellh/hashstructure/v2 v2.0.2 - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusremotewriteexporter v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheus v0.66.0 + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusremotewriteexporter v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheus v0.67.0 github.com/prometheus/common v0.37.0 github.com/prometheus/prometheus v0.40.5 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector v0.67.0 + go.opentelemetry.io/collector/component v0.67.0 + go.opentelemetry.io/collector/confmap v0.67.0 + go.opentelemetry.io/collector/consumer v0.67.0 + go.opentelemetry.io/collector/featuregate v0.67.0 + go.opentelemetry.io/collector/pdata v1.0.0-rc1 + go.opentelemetry.io/collector/processor/batchprocessor v0.67.0 + go.opentelemetry.io/collector/semconv v0.67.0 go.uber.org/atomic v1.10.0 go.uber.org/zap v1.24.0 google.golang.org/protobuf v1.28.1 @@ -121,8 +121,8 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheusremotewrite v0.66.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheusremotewrite v0.67.0 // indirect github.com/opencontainers/go-digest v1.0.0 // indirect github.com/opencontainers/image-spec v1.0.2 // indirect github.com/ovh/go-ovh v1.1.0 // indirect diff --git a/receiver/prometheusreceiver/go.sum b/receiver/prometheusreceiver/go.sum index ad39db6b57434..e7a12932d83ad 100644 --- a/receiver/prometheusreceiver/go.sum +++ b/receiver/prometheusreceiver/go.sum @@ -673,23 +673,23 @@ go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/extension/zpagesextension v0.66.0 h1:tPqSKH5K3VhTT0XXVoWL3woWBSTJqnXZQRt0ZLSCoCc= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221202005155-1c54042beb70 h1:Y4e8NnVevonnAgmjX9Z7QIMA32yMqHAOnAlh8SzTS8c= -go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:Pi1CsKDQFoDrUP1i3+VdE6s2Xuji7bOGFBgqHK0J32E= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 h1:Q5L9Urod3c8as6ZYaoaqBjarx/HXxsxy34DFZIU2fO4= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/component v0.67.0 h1:GCBRZAqk4yNaT4L1uwlbbwophFHrxYccLZ4Uj1Ifs/M= +go.opentelemetry.io/collector/component v0.67.0/go.mod h1:Txa2lm9oe7xsGQN8u7GdUIrRpAHFIKsTO4Qi3/CSmKk= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/extension/zpagesextension v0.67.0 h1:TRW8vZwE+/h2vJqqMDmyQO9X0sxcYCSXf5MyXozSLas= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= +go.opentelemetry.io/collector/processor/batchprocessor v0.67.0 h1:Qn4Ytth3q1trwTSAYYTzIRs4SBh9rz0xBou1nZB+Dko= +go.opentelemetry.io/collector/processor/batchprocessor v0.67.0/go.mod h1:+ZXCkUG9tlwbbVLi+PT9DjQ7vz+lfFSQqvW45snLYno= +go.opentelemetry.io/collector/semconv v0.67.0 h1:zLAvcQa6Kgow52FFLrmk7/9ZVtEYyA73+xDtCcFG78Q= +go.opentelemetry.io/collector/semconv v0.67.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 h1:aUEBEdCa6iamGzg6fuYxDA8ThxvOG240mAvWDU+XLio= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4/go.mod h1:l2MdsbKTocpPS5nQZscqTR9jd8u96VYZdcpF8Sye7mA= go.opentelemetry.io/contrib/propagators/b3 v1.11.1 h1:icQ6ttRV+r/2fnU46BIo/g/mPu6Rs5Ug8Rtohe3KqzI= diff --git a/receiver/prometheusreceiver/internal/appendable.go b/receiver/prometheusreceiver/internal/appendable.go index 8976bc0978b24..1a87d8bbc4356 100644 --- a/receiver/prometheusreceiver/internal/appendable.go +++ b/receiver/prometheusreceiver/internal/appendable.go @@ -21,10 +21,10 @@ import ( "github.com/prometheus/prometheus/model/labels" "github.com/prometheus/prometheus/storage" - "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/featuregate" "go.opentelemetry.io/collector/obsreport" + "go.opentelemetry.io/collector/receiver" ) // appendable translates Prometheus scraping diffs into OpenTelemetry format. @@ -35,7 +35,7 @@ type appendable struct { startTimeMetricRegex *regexp.Regexp externalLabels labels.Labels - settings component.ReceiverCreateSettings + settings receiver.CreateSettings obsrecv *obsreport.Receiver registry *featuregate.Registry } @@ -43,7 +43,7 @@ type appendable struct { // NewAppendable returns a storage.Appendable instance that emits metrics to the sink. func NewAppendable( sink consumer.Metrics, - set component.ReceiverCreateSettings, + set receiver.CreateSettings, gcInterval time.Duration, useStartTimeMetric bool, startTimeMetricRegex *regexp.Regexp, diff --git a/receiver/prometheusreceiver/internal/staleness_end_to_end_test.go b/receiver/prometheusreceiver/internal/staleness_end_to_end_test.go index 5bdb5d508325f..2ee0c16efa80c 100644 --- a/receiver/prometheusreceiver/internal/staleness_end_to_end_test.go +++ b/receiver/prometheusreceiver/internal/staleness_end_to_end_test.go @@ -35,7 +35,10 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/confmap" "go.opentelemetry.io/collector/confmap/provider/fileprovider" + "go.opentelemetry.io/collector/exporter" + "go.opentelemetry.io/collector/otelcol" "go.opentelemetry.io/collector/processor/batchprocessor" + "go.opentelemetry.io/collector/receiver" "go.opentelemetry.io/collector/service" "go.uber.org/atomic" "go.uber.org/zap" @@ -141,9 +144,9 @@ service: _, err = confFile.Write([]byte(cfg)) require.Nil(t, err) // 4. Run the OpenTelemetry Collector. - receivers, err := component.MakeReceiverFactoryMap(prometheusreceiver.NewFactory()) + receivers, err := receiver.MakeFactoryMap(prometheusreceiver.NewFactory()) require.Nil(t, err) - exporters, err := component.MakeExporterFactoryMap(prometheusremotewriteexporter.NewFactory()) + exporters, err := exporter.MakeFactoryMap(prometheusremotewriteexporter.NewFactory()) require.Nil(t, err) processors, err := component.MakeProcessorFactoryMap(batchprocessor.NewFactory()) require.Nil(t, err) @@ -192,7 +195,7 @@ service: for notYetStarted := true; notYetStarted; { state := app.GetState() switch state { - case service.StateRunning, service.StateClosed, service.StateClosing: + case otelcol.StateRunning, otelcol.StateClosed, otelcol.StateClosing: notYetStarted = false } time.Sleep(10 * time.Millisecond) diff --git a/receiver/prometheusreceiver/internal/transaction.go b/receiver/prometheusreceiver/internal/transaction.go index 489aadb734d74..6c6461e9ed248 100644 --- a/receiver/prometheusreceiver/internal/transaction.go +++ b/receiver/prometheusreceiver/internal/transaction.go @@ -28,12 +28,12 @@ import ( "github.com/prometheus/prometheus/model/value" "github.com/prometheus/prometheus/scrape" "github.com/prometheus/prometheus/storage" - "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/featuregate" "go.opentelemetry.io/collector/obsreport" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" + "go.opentelemetry.io/collector/receiver" "go.uber.org/zap" prometheustranslator "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheus" @@ -64,7 +64,7 @@ func newTransaction( metricAdjuster MetricsAdjuster, sink consumer.Metrics, externalLabels labels.Labels, - settings component.ReceiverCreateSettings, + settings receiver.CreateSettings, obsrecv *obsreport.Receiver, registry *featuregate.Registry) *transaction { return &transaction{ diff --git a/receiver/prometheusreceiver/internal/transaction_test.go b/receiver/prometheusreceiver/internal/transaction_test.go index fa9faf14ff8d0..56d31055dbdd4 100644 --- a/receiver/prometheusreceiver/internal/transaction_test.go +++ b/receiver/prometheusreceiver/internal/transaction_test.go @@ -28,12 +28,12 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/consumer/consumertest" "go.opentelemetry.io/collector/featuregate" "go.opentelemetry.io/collector/obsreport" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" + "go.opentelemetry.io/collector/receiver/receivertest" ) const ( @@ -63,24 +63,24 @@ var ( ) func TestTransactionCommitWithoutAdding(t *testing.T) { - tr := newTransaction(scrapeCtx, &startTimeAdjuster{startTime: startTimestamp}, consumertest.NewNop(), nil, componenttest.NewNopReceiverCreateSettings(), nopObsRecv(t), featuregate.GetRegistry()) + tr := newTransaction(scrapeCtx, &startTimeAdjuster{startTime: startTimestamp}, consumertest.NewNop(), nil, receivertest.NewNopCreateSettings(), nopObsRecv(t), featuregate.GetRegistry()) assert.NoError(t, tr.Commit()) } func TestTransactionRollbackDoesNothing(t *testing.T) { - tr := newTransaction(scrapeCtx, &startTimeAdjuster{startTime: startTimestamp}, consumertest.NewNop(), nil, componenttest.NewNopReceiverCreateSettings(), nopObsRecv(t), featuregate.GetRegistry()) + tr := newTransaction(scrapeCtx, &startTimeAdjuster{startTime: startTimestamp}, consumertest.NewNop(), nil, receivertest.NewNopCreateSettings(), nopObsRecv(t), featuregate.GetRegistry()) assert.NoError(t, tr.Rollback()) } func TestTransactionUpdateMetadataDoesNothing(t *testing.T) { - tr := newTransaction(scrapeCtx, &startTimeAdjuster{startTime: startTimestamp}, consumertest.NewNop(), nil, componenttest.NewNopReceiverCreateSettings(), nopObsRecv(t), featuregate.GetRegistry()) + tr := newTransaction(scrapeCtx, &startTimeAdjuster{startTime: startTimestamp}, consumertest.NewNop(), nil, receivertest.NewNopCreateSettings(), nopObsRecv(t), featuregate.GetRegistry()) _, err := tr.UpdateMetadata(0, labels.New(), metadata.Metadata{}) assert.NoError(t, err) } func TestTransactionAppendNoTarget(t *testing.T) { badLabels := labels.FromStrings(model.MetricNameLabel, "counter_test") - tr := newTransaction(scrapeCtx, &startTimeAdjuster{startTime: startTimestamp}, consumertest.NewNop(), nil, componenttest.NewNopReceiverCreateSettings(), nopObsRecv(t), featuregate.GetRegistry()) + tr := newTransaction(scrapeCtx, &startTimeAdjuster{startTime: startTimestamp}, consumertest.NewNop(), nil, receivertest.NewNopCreateSettings(), nopObsRecv(t), featuregate.GetRegistry()) _, err := tr.Append(0, badLabels, time.Now().Unix()*1000, 1.0) assert.Error(t, err) } @@ -90,7 +90,7 @@ func TestTransactionAppendNoMetricName(t *testing.T) { model.InstanceLabel: "localhost:8080", model.JobLabel: "test2", }) - tr := newTransaction(scrapeCtx, &startTimeAdjuster{startTime: startTimestamp}, consumertest.NewNop(), nil, componenttest.NewNopReceiverCreateSettings(), nopObsRecv(t), featuregate.GetRegistry()) + tr := newTransaction(scrapeCtx, &startTimeAdjuster{startTime: startTimestamp}, consumertest.NewNop(), nil, receivertest.NewNopCreateSettings(), nopObsRecv(t), featuregate.GetRegistry()) _, err := tr.Append(0, jobNotFoundLb, time.Now().Unix()*1000, 1.0) assert.ErrorIs(t, err, errMetricNameNotFound) @@ -98,7 +98,7 @@ func TestTransactionAppendNoMetricName(t *testing.T) { } func TestTransactionAppendEmptyMetricName(t *testing.T) { - tr := newTransaction(scrapeCtx, &startTimeAdjuster{startTime: startTimestamp}, consumertest.NewNop(), nil, componenttest.NewNopReceiverCreateSettings(), nopObsRecv(t), featuregate.GetRegistry()) + tr := newTransaction(scrapeCtx, &startTimeAdjuster{startTime: startTimestamp}, consumertest.NewNop(), nil, receivertest.NewNopCreateSettings(), nopObsRecv(t), featuregate.GetRegistry()) _, err := tr.Append(0, labels.FromMap(map[string]string{ model.InstanceLabel: "localhost:8080", model.JobLabel: "test2", @@ -109,7 +109,7 @@ func TestTransactionAppendEmptyMetricName(t *testing.T) { func TestTransactionAppendResource(t *testing.T) { sink := new(consumertest.MetricsSink) - tr := newTransaction(scrapeCtx, &startTimeAdjuster{startTime: startTimestamp}, sink, nil, componenttest.NewNopReceiverCreateSettings(), nopObsRecv(t), featuregate.GetRegistry()) + tr := newTransaction(scrapeCtx, &startTimeAdjuster{startTime: startTimestamp}, sink, nil, receivertest.NewNopCreateSettings(), nopObsRecv(t), featuregate.GetRegistry()) _, err := tr.Append(0, labels.FromMap(map[string]string{ model.InstanceLabel: "localhost:8080", model.JobLabel: "test", @@ -138,7 +138,7 @@ func TestTransactionCommitErrorWhenAdjusterError(t *testing.T) { }) sink := new(consumertest.MetricsSink) adjusterErr := errors.New("adjuster error") - tr := newTransaction(scrapeCtx, &errorAdjuster{err: adjusterErr}, sink, nil, componenttest.NewNopReceiverCreateSettings(), nopObsRecv(t), featuregate.GetRegistry()) + tr := newTransaction(scrapeCtx, &errorAdjuster{err: adjusterErr}, sink, nil, receivertest.NewNopCreateSettings(), nopObsRecv(t), featuregate.GetRegistry()) _, err := tr.Append(0, goodLabels, time.Now().Unix()*1000, 1.0) assert.NoError(t, err) assert.ErrorIs(t, tr.Commit(), adjusterErr) @@ -147,7 +147,7 @@ func TestTransactionCommitErrorWhenAdjusterError(t *testing.T) { // Ensure that we reject duplicate label keys. See https://github.com/open-telemetry/wg-prometheus/issues/44. func TestTransactionAppendDuplicateLabels(t *testing.T) { sink := new(consumertest.MetricsSink) - tr := newTransaction(scrapeCtx, &startTimeAdjuster{startTime: startTimestamp}, sink, nil, componenttest.NewNopReceiverCreateSettings(), nopObsRecv(t), featuregate.GetRegistry()) + tr := newTransaction(scrapeCtx, &startTimeAdjuster{startTime: startTimestamp}, sink, nil, receivertest.NewNopCreateSettings(), nopObsRecv(t), featuregate.GetRegistry()) dupLabels := labels.FromStrings( model.InstanceLabel, "0.0.0.0:8855", @@ -165,7 +165,7 @@ func TestTransactionAppendDuplicateLabels(t *testing.T) { func TestTransactionAppendHistogramNoLe(t *testing.T) { sink := new(consumertest.MetricsSink) - tr := newTransaction(scrapeCtx, &startTimeAdjuster{startTime: startTimestamp}, sink, nil, componenttest.NewNopReceiverCreateSettings(), nopObsRecv(t), featuregate.GetRegistry()) + tr := newTransaction(scrapeCtx, &startTimeAdjuster{startTime: startTimestamp}, sink, nil, receivertest.NewNopCreateSettings(), nopObsRecv(t), featuregate.GetRegistry()) goodLabels := labels.FromStrings( model.InstanceLabel, "0.0.0.0:8855", @@ -179,7 +179,7 @@ func TestTransactionAppendHistogramNoLe(t *testing.T) { func TestTransactionAppendSummaryNoQuantile(t *testing.T) { sink := new(consumertest.MetricsSink) - tr := newTransaction(scrapeCtx, &startTimeAdjuster{startTime: startTimestamp}, sink, nil, componenttest.NewNopReceiverCreateSettings(), nopObsRecv(t), featuregate.GetRegistry()) + tr := newTransaction(scrapeCtx, &startTimeAdjuster{startTime: startTimestamp}, sink, nil, receivertest.NewNopCreateSettings(), nopObsRecv(t), featuregate.GetRegistry()) goodLabels := labels.FromStrings( model.InstanceLabel, "0.0.0.0:8855", @@ -193,7 +193,7 @@ func TestTransactionAppendSummaryNoQuantile(t *testing.T) { func TestAppendExemplarWithNoMetricName(t *testing.T) { sink := new(consumertest.MetricsSink) - tr := newTransaction(scrapeCtx, &startTimeAdjuster{startTime: startTimestamp}, sink, nil, componenttest.NewNopReceiverCreateSettings(), nopObsRecv(t), featuregate.GetRegistry()) + tr := newTransaction(scrapeCtx, &startTimeAdjuster{startTime: startTimestamp}, sink, nil, receivertest.NewNopCreateSettings(), nopObsRecv(t), featuregate.GetRegistry()) labels := labels.FromStrings( model.InstanceLabel, "0.0.0.0:8855", @@ -206,7 +206,7 @@ func TestAppendExemplarWithNoMetricName(t *testing.T) { func TestAppendExemplarWithEmptyMetricName(t *testing.T) { sink := new(consumertest.MetricsSink) - tr := newTransaction(scrapeCtx, &startTimeAdjuster{startTime: startTimestamp}, sink, nil, componenttest.NewNopReceiverCreateSettings(), nopObsRecv(t), featuregate.GetRegistry()) + tr := newTransaction(scrapeCtx, &startTimeAdjuster{startTime: startTimestamp}, sink, nil, receivertest.NewNopCreateSettings(), nopObsRecv(t), featuregate.GetRegistry()) labels := labels.FromStrings( model.InstanceLabel, "0.0.0.0:8855", @@ -219,7 +219,7 @@ func TestAppendExemplarWithEmptyMetricName(t *testing.T) { func TestAppendExemplarWithDuplicateLabels(t *testing.T) { sink := new(consumertest.MetricsSink) - tr := newTransaction(scrapeCtx, &startTimeAdjuster{startTime: startTimestamp}, sink, nil, componenttest.NewNopReceiverCreateSettings(), nopObsRecv(t), featuregate.GetRegistry()) + tr := newTransaction(scrapeCtx, &startTimeAdjuster{startTime: startTimestamp}, sink, nil, receivertest.NewNopCreateSettings(), nopObsRecv(t), featuregate.GetRegistry()) labels := labels.FromStrings( model.InstanceLabel, "0.0.0.0:8855", @@ -235,7 +235,7 @@ func TestAppendExemplarWithDuplicateLabels(t *testing.T) { func TestAppendExemplarWithoutAddingMetric(t *testing.T) { sink := new(consumertest.MetricsSink) - tr := newTransaction(scrapeCtx, &startTimeAdjuster{startTime: startTimestamp}, sink, nil, componenttest.NewNopReceiverCreateSettings(), nopObsRecv(t), featuregate.GetRegistry()) + tr := newTransaction(scrapeCtx, &startTimeAdjuster{startTime: startTimestamp}, sink, nil, receivertest.NewNopCreateSettings(), nopObsRecv(t), featuregate.GetRegistry()) labels := labels.FromStrings( model.InstanceLabel, "0.0.0.0:8855", @@ -249,7 +249,7 @@ func TestAppendExemplarWithoutAddingMetric(t *testing.T) { func TestAppendExemplarWithNoLabels(t *testing.T) { sink := new(consumertest.MetricsSink) - tr := newTransaction(scrapeCtx, &startTimeAdjuster{startTime: startTimestamp}, sink, nil, componenttest.NewNopReceiverCreateSettings(), nopObsRecv(t), featuregate.GetRegistry()) + tr := newTransaction(scrapeCtx, &startTimeAdjuster{startTime: startTimestamp}, sink, nil, receivertest.NewNopCreateSettings(), nopObsRecv(t), featuregate.GetRegistry()) _, err := tr.AppendExemplar(0, nil, exemplar.Exemplar{Value: 0}) assert.Equal(t, errNoJobInstance, err) @@ -257,7 +257,7 @@ func TestAppendExemplarWithNoLabels(t *testing.T) { func TestAppendExemplarWithEmptyLabelArray(t *testing.T) { sink := new(consumertest.MetricsSink) - tr := newTransaction(scrapeCtx, &startTimeAdjuster{startTime: startTimestamp}, sink, nil, componenttest.NewNopReceiverCreateSettings(), nopObsRecv(t), featuregate.GetRegistry()) + tr := newTransaction(scrapeCtx, &startTimeAdjuster{startTime: startTimestamp}, sink, nil, receivertest.NewNopCreateSettings(), nopObsRecv(t), featuregate.GetRegistry()) _, err := tr.AppendExemplar(0, []labels.Label{}, exemplar.Exemplar{Value: 0}) assert.Equal(t, errNoJobInstance, err) @@ -267,7 +267,7 @@ func nopObsRecv(t *testing.T) *obsreport.Receiver { obsrecv, err := obsreport.NewReceiver(obsreport.ReceiverSettings{ ReceiverID: component.NewID("prometheus"), Transport: transport, - ReceiverCreateSettings: componenttest.NewNopReceiverCreateSettings(), + ReceiverCreateSettings: receivertest.NewNopCreateSettings(), }) require.NoError(t, err) return obsrecv @@ -1369,7 +1369,7 @@ func (tt buildTestData) run(t *testing.T) { st := ts for i, page := range tt.inputs { sink := new(consumertest.MetricsSink) - tr := newTransaction(scrapeCtx, &startTimeAdjuster{startTime: startTimestamp}, sink, nil, componenttest.NewNopReceiverCreateSettings(), nopObsRecv(t), featuregate.GetRegistry()) + tr := newTransaction(scrapeCtx, &startTimeAdjuster{startTime: startTimestamp}, sink, nil, receivertest.NewNopCreateSettings(), nopObsRecv(t), featuregate.GetRegistry()) for _, pt := range page.pts { // set ts for testing pt.t = st diff --git a/receiver/prometheusreceiver/metrics_receiver.go b/receiver/prometheusreceiver/metrics_receiver.go index 2b567989d8d9e..495d08822f5a2 100644 --- a/receiver/prometheusreceiver/metrics_receiver.go +++ b/receiver/prometheusreceiver/metrics_receiver.go @@ -36,6 +36,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/featuregate" + "go.opentelemetry.io/collector/receiver" "go.uber.org/zap" "gopkg.in/yaml.v2" @@ -56,14 +57,14 @@ type pReceiver struct { configLoaded chan struct{} loadConfigOnce sync.Once - settings component.ReceiverCreateSettings + settings receiver.CreateSettings registry *featuregate.Registry scrapeManager *scrape.Manager discoveryManager *discovery.Manager } // New creates a new prometheus.Receiver reference. -func newPrometheusReceiver(set component.ReceiverCreateSettings, cfg *Config, next consumer.Metrics, registry *featuregate.Registry) *pReceiver { +func newPrometheusReceiver(set receiver.CreateSettings, cfg *Config, next consumer.Metrics, registry *featuregate.Registry) *pReceiver { pr := &pReceiver{ cfg: cfg, consumer: next, diff --git a/receiver/prometheusreceiver/metrics_receiver_helper_test.go b/receiver/prometheusreceiver/metrics_receiver_helper_test.go index e8849b37e19a9..fd3c6f71d5bbe 100644 --- a/receiver/prometheusreceiver/metrics_receiver_helper_test.go +++ b/receiver/prometheusreceiver/metrics_receiver_helper_test.go @@ -40,6 +40,7 @@ import ( "go.opentelemetry.io/collector/featuregate" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" + "go.opentelemetry.io/collector/receiver/receivertest" "go.uber.org/atomic" "gopkg.in/yaml.v2" @@ -606,7 +607,7 @@ func testComponent(t *testing.T, targets []*testData, useStartTimeMetric bool, s defer mp.Close() cms := new(consumertest.MetricsSink) - receiver := newPrometheusReceiver(componenttest.NewNopReceiverCreateSettings(), &Config{ + receiver := newPrometheusReceiver(receivertest.NewNopCreateSettings(), &Config{ ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), PrometheusConfig: cfg, UseStartTimeMetric: useStartTimeMetric, diff --git a/receiver/prometheusreceiver/metrics_receiver_target_allocator_test.go b/receiver/prometheusreceiver/metrics_receiver_target_allocator_test.go index 75eb4cce53b1f..22887d7d6639d 100644 --- a/receiver/prometheusreceiver/metrics_receiver_target_allocator_test.go +++ b/receiver/prometheusreceiver/metrics_receiver_target_allocator_test.go @@ -36,6 +36,7 @@ import ( "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer/consumertest" "go.opentelemetry.io/collector/featuregate" + "go.opentelemetry.io/collector/receiver/receivertest" "go.uber.org/atomic" ) @@ -510,7 +511,7 @@ func TestTargetAllocatorJobRetrieval(t *testing.T) { defer allocator.Stop() tc.cfg.TargetAllocator.Endpoint = allocator.srv.URL // set service URL with the automatic generated one - receiver := newPrometheusReceiver(componenttest.NewNopReceiverCreateSettings(), tc.cfg, cms, featuregate.GetRegistry()) + receiver := newPrometheusReceiver(receivertest.NewNopCreateSettings(), tc.cfg, cms, featuregate.GetRegistry()) require.NoError(t, receiver.Start(ctx, componenttest.NewNopHost())) diff --git a/receiver/promtailreceiver/factory.go b/receiver/promtailreceiver/factory.go index 05f9b7900ad52..a0e40ab8c790b 100644 --- a/receiver/promtailreceiver/factory.go +++ b/receiver/promtailreceiver/factory.go @@ -17,6 +17,7 @@ package promtailreceiver // import "github.com/open-telemetry/opentelemetry-coll import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" + "go.opentelemetry.io/collector/receiver" "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/adapter" "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/operator" @@ -28,7 +29,7 @@ const ( ) // NewFactory creates a factory for promtail receiver -func NewFactory() component.ReceiverFactory { +func NewFactory() receiver.Factory { return adapter.NewFactory(receiverType{}, stability) } diff --git a/receiver/promtailreceiver/go.mod b/receiver/promtailreceiver/go.mod index afc05e0328817..aae7c971d2a68 100644 --- a/receiver/promtailreceiver/go.mod +++ b/receiver/promtailreceiver/go.mod @@ -5,15 +5,15 @@ go 1.18 require ( github.com/go-kit/log v0.2.1 github.com/grafana/loki v1.6.2-0.20221206154352-fee23745328c - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.64.0 + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.67.0 github.com/prometheus/client_golang v1.14.0 github.com/prometheus/common v0.37.0 github.com/prometheus/prometheus v0.40.5 github.com/stretchr/testify v1.8.1 github.com/weaveworks/common v0.0.0-20221201103051-7c2720a9024d - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a + go.opentelemetry.io/collector v0.67.0 + go.opentelemetry.io/collector/component v0.67.0 + go.opentelemetry.io/collector/confmap v0.67.0 go.uber.org/zap v1.24.0 gopkg.in/yaml.v2 v2.4.0 ) @@ -192,9 +192,9 @@ require ( go.etcd.io/etcd/client/v3 v3.5.4 // indirect go.mongodb.org/mongo-driver v1.10.2 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/consumer v0.67.0 // indirect + go.opentelemetry.io/collector/featuregate v0.67.0 // indirect + go.opentelemetry.io/collector/pdata v1.0.0-rc1 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect diff --git a/receiver/promtailreceiver/go.sum b/receiver/promtailreceiver/go.sum index aa86596727ed2..5e19b74fbdec4 100644 --- a/receiver/promtailreceiver/go.sum +++ b/receiver/promtailreceiver/go.sum @@ -1191,18 +1191,18 @@ go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/component v0.67.0 h1:GCBRZAqk4yNaT4L1uwlbbwophFHrxYccLZ4Uj1Ifs/M= +go.opentelemetry.io/collector/component v0.67.0/go.mod h1:Txa2lm9oe7xsGQN8u7GdUIrRpAHFIKsTO4Qi3/CSmKk= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 h1:aUEBEdCa6iamGzg6fuYxDA8ThxvOG240mAvWDU+XLio= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4/go.mod h1:l2MdsbKTocpPS5nQZscqTR9jd8u96VYZdcpF8Sye7mA= go.opentelemetry.io/otel v1.0.0-RC1/go.mod h1:x9tRa9HK4hSSq7jf2TKbqFbtt58/TGk0f9XiEYISI1I= diff --git a/receiver/pulsarreceiver/factory.go b/receiver/pulsarreceiver/factory.go index dcd9411f87855..694894059d9fc 100644 --- a/receiver/pulsarreceiver/factory.go +++ b/receiver/pulsarreceiver/factory.go @@ -20,6 +20,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer" + "go.opentelemetry.io/collector/receiver" ) const ( @@ -65,7 +66,7 @@ func WithLogsUnmarshalers(logsUnmarshalers ...LogsUnmarshaler) FactoryOption { } // NewFactory creates Pulsar receiver factory. -func NewFactory(options ...FactoryOption) component.ReceiverFactory { +func NewFactory(options ...FactoryOption) receiver.Factory { f := &pulsarReceiverFactory{ tracesUnmarshalers: defaultTracesUnmarshalers(), @@ -75,12 +76,12 @@ func NewFactory(options ...FactoryOption) component.ReceiverFactory { for _, o := range options { o(f) } - return component.NewReceiverFactory( + return receiver.NewFactory( typeStr, createDefaultConfig, - component.WithTracesReceiver(f.createTracesReceiver, stability), - component.WithMetricsReceiver(f.createMetricsReceiver, stability), - component.WithLogsReceiver(f.createLogsReceiver, stability), + receiver.WithTraces(f.createTracesReceiver, stability), + receiver.WithMetrics(f.createMetricsReceiver, stability), + receiver.WithLogs(f.createLogsReceiver, stability), ) } @@ -92,10 +93,10 @@ type pulsarReceiverFactory struct { func (f *pulsarReceiverFactory) createTracesReceiver( _ context.Context, - set component.ReceiverCreateSettings, + set receiver.CreateSettings, cfg component.Config, nextConsumer consumer.Traces, -) (component.TracesReceiver, error) { +) (receiver.Traces, error) { c := *(cfg.(*Config)) if len(c.Topic) == 0 { c.Topic = defaultTraceTopic @@ -109,10 +110,10 @@ func (f *pulsarReceiverFactory) createTracesReceiver( func (f *pulsarReceiverFactory) createMetricsReceiver( _ context.Context, - set component.ReceiverCreateSettings, + set receiver.CreateSettings, cfg component.Config, nextConsumer consumer.Metrics, -) (component.MetricsReceiver, error) { +) (receiver.Metrics, error) { c := *(cfg.(*Config)) if len(c.Topic) == 0 { c.Topic = defaultMeticsTopic @@ -126,10 +127,10 @@ func (f *pulsarReceiverFactory) createMetricsReceiver( func (f *pulsarReceiverFactory) createLogsReceiver( _ context.Context, - set component.ReceiverCreateSettings, + set receiver.CreateSettings, cfg component.Config, nextConsumer consumer.Logs, -) (component.LogsReceiver, error) { +) (receiver.Logs, error) { c := *(cfg.(*Config)) if len(c.Topic) == 0 { c.Topic = defaultLogsTopic diff --git a/receiver/pulsarreceiver/factory_test.go b/receiver/pulsarreceiver/factory_test.go index 58b63923a65d4..412ed0c8daaef 100644 --- a/receiver/pulsarreceiver/factory_test.go +++ b/receiver/pulsarreceiver/factory_test.go @@ -21,8 +21,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" + "go.opentelemetry.io/collector/receiver/receivertest" ) func TestCreateDefaultConfig(t *testing.T) { @@ -44,7 +44,7 @@ func TestCreateTracesReceiver_err_addr(t *testing.T) { cfg.Endpoint = "invalid:6650" f := pulsarReceiverFactory{tracesUnmarshalers: defaultTracesUnmarshalers()} - r, err := f.createTracesReceiver(context.Background(), componenttest.NewNopReceiverCreateSettings(), cfg, nil) + r, err := f.createTracesReceiver(context.Background(), receivertest.NewNopCreateSettings(), cfg, nil) require.Error(t, err) assert.Nil(t, r) } @@ -54,7 +54,7 @@ func TestCreateTracesReceiver_err_marshallers(t *testing.T) { cfg.Endpoint = defaultServiceURL f := pulsarReceiverFactory{tracesUnmarshalers: make(map[string]TracesUnmarshaler)} - r, err := f.createTracesReceiver(context.Background(), componenttest.NewNopReceiverCreateSettings(), cfg, nil) + r, err := f.createTracesReceiver(context.Background(), receivertest.NewNopCreateSettings(), cfg, nil) require.Error(t, err) assert.Nil(t, r) } @@ -62,7 +62,7 @@ func TestCreateTracesReceiver_err_marshallers(t *testing.T) { func Test_CreateTraceReceiver(t *testing.T) { cfg := createDefaultConfig().(*Config) f := pulsarReceiverFactory{tracesUnmarshalers: defaultTracesUnmarshalers()} - recv, err := f.createTracesReceiver(context.Background(), componenttest.NewNopReceiverCreateSettings(), cfg, nil) + recv, err := f.createTracesReceiver(context.Background(), receivertest.NewNopCreateSettings(), cfg, nil) require.NoError(t, err) assert.NotNil(t, recv) } @@ -73,7 +73,7 @@ func TestCreateMetricsReceiver_err_addr(t *testing.T) { cfg.Endpoint = "invalid:6650" f := pulsarReceiverFactory{metricsUnmarshalers: defaultMetricsUnmarshalers()} - r, err := f.createMetricsReceiver(context.Background(), componenttest.NewNopReceiverCreateSettings(), cfg, nil) + r, err := f.createMetricsReceiver(context.Background(), receivertest.NewNopCreateSettings(), cfg, nil) require.Error(t, err) assert.Nil(t, r) } @@ -83,7 +83,7 @@ func TestCreateMetricsReceiver_err_marshallers(t *testing.T) { cfg.Endpoint = defaultServiceURL f := pulsarReceiverFactory{metricsUnmarshalers: make(map[string]MetricsUnmarshaler)} - r, err := f.createMetricsReceiver(context.Background(), componenttest.NewNopReceiverCreateSettings(), cfg, nil) + r, err := f.createMetricsReceiver(context.Background(), receivertest.NewNopCreateSettings(), cfg, nil) require.Error(t, err) assert.Nil(t, r) } @@ -92,7 +92,7 @@ func Test_CreateMetricsReceiver(t *testing.T) { cfg := createDefaultConfig().(*Config) f := pulsarReceiverFactory{metricsUnmarshalers: defaultMetricsUnmarshalers()} - recv, err := f.createMetricsReceiver(context.Background(), componenttest.NewNopReceiverCreateSettings(), cfg, nil) + recv, err := f.createMetricsReceiver(context.Background(), receivertest.NewNopCreateSettings(), cfg, nil) require.NoError(t, err) assert.NotNil(t, recv) } @@ -103,7 +103,7 @@ func TestCreateLogsReceiver_err_addr(t *testing.T) { cfg.Endpoint = "invalid:6650" f := pulsarReceiverFactory{logsUnmarshalers: defaultLogsUnmarshalers()} - r, err := f.createLogsReceiver(context.Background(), componenttest.NewNopReceiverCreateSettings(), cfg, nil) + r, err := f.createLogsReceiver(context.Background(), receivertest.NewNopCreateSettings(), cfg, nil) require.Error(t, err) assert.Nil(t, r) } @@ -113,7 +113,7 @@ func TestCreateLogsReceiver_err_marshallers(t *testing.T) { cfg.Endpoint = defaultServiceURL f := pulsarReceiverFactory{logsUnmarshalers: make(map[string]LogsUnmarshaler)} - r, err := f.createLogsReceiver(context.Background(), componenttest.NewNopReceiverCreateSettings(), cfg, nil) + r, err := f.createLogsReceiver(context.Background(), receivertest.NewNopCreateSettings(), cfg, nil) require.Error(t, err) assert.Nil(t, r) } @@ -123,7 +123,7 @@ func Test_CreateLogsReceiver(t *testing.T) { cfg.Endpoint = defaultServiceURL f := pulsarReceiverFactory{logsUnmarshalers: defaultLogsUnmarshalers()} - recv, err := f.createLogsReceiver(context.Background(), componenttest.NewNopReceiverCreateSettings(), cfg, nil) + recv, err := f.createLogsReceiver(context.Background(), receivertest.NewNopCreateSettings(), cfg, nil) require.NoError(t, err) assert.NotNil(t, recv) } diff --git a/receiver/pulsarreceiver/go.mod b/receiver/pulsarreceiver/go.mod index ef953f5ac87b4..5258192fdceb2 100644 --- a/receiver/pulsarreceiver/go.mod +++ b/receiver/pulsarreceiver/go.mod @@ -7,16 +7,16 @@ require ( github.com/apache/thrift v0.17.0 github.com/gogo/protobuf v1.3.2 github.com/jaegertracing/jaeger v1.39.1-0.20221110195127-14c11365a856 - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/zipkin v0.66.0 + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/zipkin v0.67.0 github.com/openzipkin/zipkin-go v0.4.1 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector v0.67.0 + go.opentelemetry.io/collector/component v0.67.0 + go.opentelemetry.io/collector/confmap v0.67.0 + go.opentelemetry.io/collector/consumer v0.67.0 + go.opentelemetry.io/collector/pdata v1.0.0-rc1 + go.opentelemetry.io/collector/semconv v0.67.0 go.uber.org/zap v1.24.0 ) @@ -50,7 +50,7 @@ require ( github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/mtibben/percent v0.2.1 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.66.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.67.0 // indirect github.com/opentracing/opentracing-go v1.2.0 // indirect github.com/pierrec/lz4 v2.6.1+incompatible // indirect github.com/pkg/errors v0.9.1 // indirect @@ -63,7 +63,7 @@ require ( github.com/spaolacci/murmur3 v1.1.0 // indirect github.com/uber/jaeger-client-go v2.30.0+incompatible // indirect github.com/uber/jaeger-lib v2.4.1+incompatible // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/featuregate v0.67.0 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/receiver/pulsarreceiver/go.sum b/receiver/pulsarreceiver/go.sum index 923c094650043..fb46869fdbd3d 100644 --- a/receiver/pulsarreceiver/go.sum +++ b/receiver/pulsarreceiver/go.sum @@ -486,20 +486,20 @@ go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 h1:Q5L9Urod3c8as6ZYaoaqBjarx/HXxsxy34DFZIU2fO4= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/component v0.67.0 h1:GCBRZAqk4yNaT4L1uwlbbwophFHrxYccLZ4Uj1Ifs/M= +go.opentelemetry.io/collector/component v0.67.0/go.mod h1:Txa2lm9oe7xsGQN8u7GdUIrRpAHFIKsTO4Qi3/CSmKk= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= +go.opentelemetry.io/collector/semconv v0.67.0 h1:zLAvcQa6Kgow52FFLrmk7/9ZVtEYyA73+xDtCcFG78Q= +go.opentelemetry.io/collector/semconv v0.67.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/metric v0.33.0 h1:xQAyl7uGEYvrLAiV/09iTJlp1pZnQ9Wl793qbVvED1E= diff --git a/receiver/pulsarreceiver/pulsar_receiver.go b/receiver/pulsarreceiver/pulsar_receiver.go index 3299b5a47cea0..9301080a4ae85 100644 --- a/receiver/pulsarreceiver/pulsar_receiver.go +++ b/receiver/pulsarreceiver/pulsar_receiver.go @@ -23,6 +23,7 @@ import ( "github.com/apache/pulsar-client-go/pulsar" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/consumer" + "go.opentelemetry.io/collector/receiver" "go.uber.org/zap" ) @@ -37,11 +38,11 @@ type pulsarTracesConsumer struct { cancel context.CancelFunc consumer pulsar.Consumer unmarshaler TracesUnmarshaler - settings component.ReceiverCreateSettings + settings receiver.CreateSettings consumerOptions pulsar.ConsumerOptions } -func newTracesReceiver(config Config, set component.ReceiverCreateSettings, unmarshalers map[string]TracesUnmarshaler, nextConsumer consumer.Traces) (*pulsarTracesConsumer, error) { +func newTracesReceiver(config Config, set receiver.CreateSettings, unmarshalers map[string]TracesUnmarshaler, nextConsumer consumer.Traces) (*pulsarTracesConsumer, error) { unmarshaler := unmarshalers[config.Encoding] if nil == unmarshaler { return nil, errUnrecognizedEncoding @@ -132,11 +133,11 @@ type pulsarMetricsConsumer struct { client pulsar.Client consumer pulsar.Consumer cancel context.CancelFunc - settings component.ReceiverCreateSettings + settings receiver.CreateSettings consumerOptions pulsar.ConsumerOptions } -func newMetricsReceiver(config Config, set component.ReceiverCreateSettings, unmarshalers map[string]MetricsUnmarshaler, nextConsumer consumer.Metrics) (*pulsarMetricsConsumer, error) { +func newMetricsReceiver(config Config, set receiver.CreateSettings, unmarshalers map[string]MetricsUnmarshaler, nextConsumer consumer.Metrics) (*pulsarMetricsConsumer, error) { unmarshaler := unmarshalers[config.Encoding] if nil == unmarshaler { return nil, errUnrecognizedEncoding @@ -230,11 +231,11 @@ type pulsarLogsConsumer struct { client pulsar.Client consumer pulsar.Consumer cancel context.CancelFunc - settings component.ReceiverCreateSettings + settings receiver.CreateSettings consumerOptions pulsar.ConsumerOptions } -func newLogsReceiver(config Config, set component.ReceiverCreateSettings, unmarshalers map[string]LogsUnmarshaler, nextConsumer consumer.Logs) (*pulsarLogsConsumer, error) { +func newLogsReceiver(config Config, set receiver.CreateSettings, unmarshalers map[string]LogsUnmarshaler, nextConsumer consumer.Logs) (*pulsarLogsConsumer, error) { unmarshaler := unmarshalers[config.Encoding] if nil == unmarshaler { return nil, errUnrecognizedEncoding diff --git a/receiver/pulsarreceiver/pulsar_receiver_test.go b/receiver/pulsarreceiver/pulsar_receiver_test.go index 69bf04069e273..2b48f2e7d9bcf 100644 --- a/receiver/pulsarreceiver/pulsar_receiver_test.go +++ b/receiver/pulsarreceiver/pulsar_receiver_test.go @@ -18,14 +18,14 @@ import ( "testing" "github.com/stretchr/testify/assert" - "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/consumer/consumertest" + "go.opentelemetry.io/collector/receiver/receivertest" ) func Test_newTracesReceiver_err(t *testing.T) { c := Config{ Encoding: defaultEncoding, } - _, err := newTracesReceiver(c, componenttest.NewNopReceiverCreateSettings(), defaultTracesUnmarshalers(), consumertest.NewNop()) + _, err := newTracesReceiver(c, receivertest.NewNopCreateSettings(), defaultTracesUnmarshalers(), consumertest.NewNop()) assert.Error(t, err) } diff --git a/receiver/purefareceiver/factory.go b/receiver/purefareceiver/factory.go index b2fd3b0e1abb2..a6c572d9461ea 100644 --- a/receiver/purefareceiver/factory.go +++ b/receiver/purefareceiver/factory.go @@ -24,6 +24,7 @@ import ( "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/consumer" + "go.opentelemetry.io/collector/receiver" ) // NewFactory creates a factory for Pure Storage FlashArray receiver. @@ -32,11 +33,11 @@ const ( stability = component.StabilityLevelDevelopment ) -func NewFactory() component.ReceiverFactory { - return component.NewReceiverFactory( +func NewFactory() receiver.Factory { + return receiver.NewFactory( typeStr, createDefaultConfig, - component.WithMetricsReceiver(createMetricsReceiver, stability)) + receiver.WithMetrics(createMetricsReceiver, stability)) } func createDefaultConfig() component.Config { @@ -53,10 +54,10 @@ func createDefaultConfig() component.Config { func createMetricsReceiver( _ context.Context, - set component.ReceiverCreateSettings, + set receiver.CreateSettings, rCfg component.Config, next consumer.Metrics, -) (component.MetricsReceiver, error) { +) (receiver.Metrics, error) { cfg, ok := rCfg.(*Config) if !ok { return nil, fmt.Errorf("a purefa receiver config was expected by the receiver factory, but got %T", rCfg) diff --git a/receiver/purefareceiver/factory_test.go b/receiver/purefareceiver/factory_test.go index d52b2bf88de46..956f9ad4c9e79 100644 --- a/receiver/purefareceiver/factory_test.go +++ b/receiver/purefareceiver/factory_test.go @@ -21,6 +21,7 @@ import ( "github.com/stretchr/testify/assert" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" + "go.opentelemetry.io/collector/receiver/receivertest" ) func TestTypeStr(t *testing.T) { @@ -39,7 +40,7 @@ func TestCreateDefaultConfig(t *testing.T) { func TestCreateReceiver(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() - set := componenttest.NewNopReceiverCreateSettings() + set := receivertest.NewNopCreateSettings() mReceiver, err := factory.CreateMetricsReceiver(context.Background(), set, cfg, nil) assert.NoError(t, err, "receiver creation failed") assert.NotNil(t, mReceiver, "receiver creation failed") diff --git a/receiver/purefareceiver/go.mod b/receiver/purefareceiver/go.mod index d9130eb43dc36..661e8142b1f71 100644 --- a/receiver/purefareceiver/go.mod +++ b/receiver/purefareceiver/go.mod @@ -3,15 +3,15 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/receiver/purefa go 1.18 require ( - github.com/open-telemetry/opentelemetry-collector-contrib/extension/bearertokenauthextension v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.66.0 + github.com/open-telemetry/opentelemetry-collector-contrib/extension/bearertokenauthextension v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.67.0 github.com/prometheus/common v0.37.0 github.com/prometheus/prometheus v0.40.5 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector v0.67.0 + go.opentelemetry.io/collector/component v0.67.0 + go.opentelemetry.io/collector/confmap v0.67.0 + go.opentelemetry.io/collector/consumer v0.67.0 ) require ( @@ -107,7 +107,7 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheus v0.66.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheus v0.67.0 // indirect github.com/opencontainers/go-digest v1.0.0 // indirect github.com/opencontainers/image-spec v1.0.2 // indirect github.com/ovh/go-ovh v1.1.0 // indirect @@ -123,9 +123,9 @@ require ( github.com/spf13/pflag v1.0.5 // indirect github.com/vultr/govultr/v2 v2.17.2 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 // indirect - go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/featuregate v0.67.0 // indirect + go.opentelemetry.io/collector/pdata v1.0.0-rc1 // indirect + go.opentelemetry.io/collector/semconv v0.67.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect diff --git a/receiver/purefareceiver/go.sum b/receiver/purefareceiver/go.sum index 634ae0d325069..6b188b7472b7c 100644 --- a/receiver/purefareceiver/go.sum +++ b/receiver/purefareceiver/go.sum @@ -644,21 +644,21 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221202005155-1c54042beb70 h1:Y4e8NnVevonnAgmjX9Z7QIMA32yMqHAOnAlh8SzTS8c= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 h1:Q5L9Urod3c8as6ZYaoaqBjarx/HXxsxy34DFZIU2fO4= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/component v0.67.0 h1:GCBRZAqk4yNaT4L1uwlbbwophFHrxYccLZ4Uj1Ifs/M= +go.opentelemetry.io/collector/component v0.67.0/go.mod h1:Txa2lm9oe7xsGQN8u7GdUIrRpAHFIKsTO4Qi3/CSmKk= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= +go.opentelemetry.io/collector/processor/batchprocessor v0.67.0 h1:Qn4Ytth3q1trwTSAYYTzIRs4SBh9rz0xBou1nZB+Dko= +go.opentelemetry.io/collector/semconv v0.67.0 h1:zLAvcQa6Kgow52FFLrmk7/9ZVtEYyA73+xDtCcFG78Q= +go.opentelemetry.io/collector/semconv v0.67.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 h1:aUEBEdCa6iamGzg6fuYxDA8ThxvOG240mAvWDU+XLio= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4/go.mod h1:l2MdsbKTocpPS5nQZscqTR9jd8u96VYZdcpF8Sye7mA= go.opentelemetry.io/contrib/propagators/b3 v1.11.1 h1:icQ6ttRV+r/2fnU46BIo/g/mPu6Rs5Ug8Rtohe3KqzI= diff --git a/receiver/purefareceiver/internal/scraper.go b/receiver/purefareceiver/internal/scraper.go index b028150f1fdc9..87d3466ca7f31 100644 --- a/receiver/purefareceiver/internal/scraper.go +++ b/receiver/purefareceiver/internal/scraper.go @@ -25,10 +25,11 @@ import ( "github.com/prometheus/prometheus/config" "github.com/prometheus/prometheus/discovery" "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/receiver" ) type Scraper interface { - ToPrometheusReceiverConfig(host component.Host, fact component.ReceiverFactory) ([]*config.ScrapeConfig, error) + ToPrometheusReceiverConfig(host component.Host, fact receiver.Factory) ([]*config.ScrapeConfig, error) } type ScraperType string @@ -62,7 +63,7 @@ func NewScraper(ctx context.Context, } } -func (h *scraper) ToPrometheusReceiverConfig(host component.Host, fact component.ReceiverFactory) ([]*config.ScrapeConfig, error) { +func (h *scraper) ToPrometheusReceiverConfig(host component.Host, fact receiver.Factory) ([]*config.ScrapeConfig, error) { scrapeCfgs := []*config.ScrapeConfig{} for _, arr := range h.configs { diff --git a/receiver/purefareceiver/receiver.go b/receiver/purefareceiver/receiver.go index 0d9877000e939..42151cc5aa483 100644 --- a/receiver/purefareceiver/receiver.go +++ b/receiver/purefareceiver/receiver.go @@ -20,22 +20,23 @@ import ( "github.com/prometheus/prometheus/config" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/consumer" + "go.opentelemetry.io/collector/receiver" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/purefareceiver/internal" ) -var _ component.MetricsReceiver = (*purefaReceiver)(nil) +var _ receiver.Metrics = (*purefaReceiver)(nil) type purefaReceiver struct { cfg *Config - set component.ReceiverCreateSettings + set receiver.CreateSettings next consumer.Metrics - wrapped component.MetricsReceiver + wrapped receiver.Metrics } -func newReceiver(cfg *Config, set component.ReceiverCreateSettings, next consumer.Metrics) *purefaReceiver { +func newReceiver(cfg *Config, set receiver.CreateSettings, next consumer.Metrics) *purefaReceiver { return &purefaReceiver{ cfg: cfg, set: set, diff --git a/receiver/purefareceiver/receiver_test.go b/receiver/purefareceiver/receiver_test.go index d34e4b6ec32dd..7ad3d087d0911 100644 --- a/receiver/purefareceiver/receiver_test.go +++ b/receiver/purefareceiver/receiver_test.go @@ -22,6 +22,7 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/consumer/consumertest" + "go.opentelemetry.io/collector/receiver/receivertest" ) func TestStart(t *testing.T) { @@ -30,7 +31,7 @@ func TestStart(t *testing.T) { require.True(t, ok) sink := &consumertest.MetricsSink{} - recv := newReceiver(cfg, componenttest.NewNopReceiverCreateSettings(), sink) + recv := newReceiver(cfg, receivertest.NewNopCreateSettings(), sink) // test err := recv.Start(context.Background(), componenttest.NewNopHost()) @@ -45,7 +46,7 @@ func TestShutdown(t *testing.T) { require.True(t, ok) sink := &consumertest.MetricsSink{} - recv := newReceiver(cfg, componenttest.NewNopReceiverCreateSettings(), sink) + recv := newReceiver(cfg, receivertest.NewNopCreateSettings(), sink) err := recv.Start(context.Background(), componenttest.NewNopHost()) require.NoError(t, err) diff --git a/receiver/rabbitmqreceiver/factory.go b/receiver/rabbitmqreceiver/factory.go index b9523f59f9e97..be47078cb32f0 100644 --- a/receiver/rabbitmqreceiver/factory.go +++ b/receiver/rabbitmqreceiver/factory.go @@ -23,6 +23,7 @@ import ( "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/consumer" + "go.opentelemetry.io/collector/receiver" "go.opentelemetry.io/collector/receiver/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/rabbitmqreceiver/internal/metadata" @@ -36,11 +37,11 @@ const ( var errConfigNotRabbit = errors.New("config was not a RabbitMQ receiver config") // NewFactory creates a new receiver factory -func NewFactory() component.ReceiverFactory { - return component.NewReceiverFactory( +func NewFactory() receiver.Factory { + return receiver.NewFactory( typeStr, createDefaultConfig, - component.WithMetricsReceiver(createMetricsReceiver, stability)) + receiver.WithMetrics(createMetricsReceiver, stability)) } func createDefaultConfig() component.Config { @@ -57,7 +58,7 @@ func createDefaultConfig() component.Config { } } -func createMetricsReceiver(ctx context.Context, params component.ReceiverCreateSettings, rConf component.Config, consumer consumer.Metrics) (component.MetricsReceiver, error) { +func createMetricsReceiver(ctx context.Context, params receiver.CreateSettings, rConf component.Config, consumer consumer.Metrics) (receiver.Metrics, error) { cfg, ok := rConf.(*Config) if !ok { return nil, errConfigNotRabbit diff --git a/receiver/rabbitmqreceiver/factory_test.go b/receiver/rabbitmqreceiver/factory_test.go index ae15bbafa1a6f..4564214caab0a 100644 --- a/receiver/rabbitmqreceiver/factory_test.go +++ b/receiver/rabbitmqreceiver/factory_test.go @@ -21,10 +21,10 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/consumer/consumertest" + "go.opentelemetry.io/collector/receiver/receivertest" "go.opentelemetry.io/collector/receiver/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/rabbitmqreceiver/internal/metadata" @@ -69,7 +69,7 @@ func TestNewFactory(t *testing.T) { cfg := factory.CreateDefaultConfig() _, err := factory.CreateMetricsReceiver( context.Background(), - componenttest.NewNopReceiverCreateSettings(), + receivertest.NewNopCreateSettings(), cfg, consumertest.NewNop(), ) @@ -82,7 +82,7 @@ func TestNewFactory(t *testing.T) { factory := NewFactory() _, err := factory.CreateMetricsReceiver( context.Background(), - componenttest.NewNopReceiverCreateSettings(), + receivertest.NewNopCreateSettings(), nil, consumertest.NewNop(), ) diff --git a/receiver/rabbitmqreceiver/go.mod b/receiver/rabbitmqreceiver/go.mod index 02200b671ca26..0e244531cbebb 100644 --- a/receiver/rabbitmqreceiver/go.mod +++ b/receiver/rabbitmqreceiver/go.mod @@ -3,14 +3,14 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/receiver/rabbit go 1.18 require ( - github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest v0.66.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest v0.67.0 github.com/stretchr/testify v1.8.1 github.com/testcontainers/testcontainers-go v0.15.0 - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector v0.67.0 + go.opentelemetry.io/collector/component v0.67.0 + go.opentelemetry.io/collector/confmap v0.67.0 + go.opentelemetry.io/collector/consumer v0.67.0 + go.opentelemetry.io/collector/pdata v1.0.0-rc1 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.24.0 ) @@ -58,7 +58,7 @@ require ( github.com/sirupsen/logrus v1.8.1 // indirect github.com/stretchr/objx v0.5.0 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/featuregate v0.67.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect diff --git a/receiver/rabbitmqreceiver/go.sum b/receiver/rabbitmqreceiver/go.sum index b04f23101060a..59ebb1bc6013b 100644 --- a/receiver/rabbitmqreceiver/go.sum +++ b/receiver/rabbitmqreceiver/go.sum @@ -829,18 +829,18 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/component v0.67.0 h1:GCBRZAqk4yNaT4L1uwlbbwophFHrxYccLZ4Uj1Ifs/M= +go.opentelemetry.io/collector/component v0.67.0/go.mod h1:Txa2lm9oe7xsGQN8u7GdUIrRpAHFIKsTO4Qi3/CSmKk= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 h1:aUEBEdCa6iamGzg6fuYxDA8ThxvOG240mAvWDU+XLio= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4/go.mod h1:l2MdsbKTocpPS5nQZscqTR9jd8u96VYZdcpF8Sye7mA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= diff --git a/receiver/rabbitmqreceiver/integration_test.go b/receiver/rabbitmqreceiver/integration_test.go index 67f12b3f6701c..c8f2564f9bd4e 100644 --- a/receiver/rabbitmqreceiver/integration_test.go +++ b/receiver/rabbitmqreceiver/integration_test.go @@ -33,6 +33,7 @@ import ( "github.com/testcontainers/testcontainers-go/wait" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/consumer/consumertest" + "go.opentelemetry.io/collector/receiver/receivertest" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest/golden" @@ -69,7 +70,7 @@ func TestRabbitmqIntegration(t *testing.T) { cfg.Password = "otelp" consumer := new(consumertest.MetricsSink) - settings := componenttest.NewNopReceiverCreateSettings() + settings := receivertest.NewNopCreateSettings() rcvr, err := f.CreateMetricsReceiver(context.Background(), settings, cfg, consumer) require.NoError(t, err, "failed creating metrics receiver") diff --git a/receiver/rabbitmqreceiver/internal/metadata/generated_metrics.go b/receiver/rabbitmqreceiver/internal/metadata/generated_metrics.go index 703410d914db8..1e4d5f4c6e692 100644 --- a/receiver/rabbitmqreceiver/internal/metadata/generated_metrics.go +++ b/receiver/rabbitmqreceiver/internal/metadata/generated_metrics.go @@ -9,6 +9,7 @@ import ( "go.opentelemetry.io/collector/confmap" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" + "go.opentelemetry.io/collector/receiver" ) // MetricSettings provides common settings for a particular metric. @@ -428,7 +429,7 @@ func WithStartTime(startTime pcommon.Timestamp) metricBuilderOption { } } -func NewMetricsBuilder(ms MetricsSettings, settings component.ReceiverCreateSettings, options ...metricBuilderOption) *MetricsBuilder { +func NewMetricsBuilder(ms MetricsSettings, settings receiver.CreateSettings, options ...metricBuilderOption) *MetricsBuilder { mb := &MetricsBuilder{ startTime: pcommon.NewTimestampFromTime(time.Now()), metricsBuffer: pmetric.NewMetrics(), diff --git a/receiver/rabbitmqreceiver/internal/metadata/generated_metrics_test.go b/receiver/rabbitmqreceiver/internal/metadata/generated_metrics_test.go index 220266f23c4dd..972445b07771a 100644 --- a/receiver/rabbitmqreceiver/internal/metadata/generated_metrics_test.go +++ b/receiver/rabbitmqreceiver/internal/metadata/generated_metrics_test.go @@ -7,9 +7,9 @@ import ( "testing" "github.com/stretchr/testify/assert" - "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" + "go.opentelemetry.io/collector/receiver/receivertest" "go.uber.org/zap" "go.uber.org/zap/zaptest/observer" ) @@ -17,7 +17,7 @@ import ( func TestDefaultMetrics(t *testing.T) { start := pcommon.Timestamp(1_000_000_000) ts := pcommon.Timestamp(1_000_001_000) - mb := NewMetricsBuilder(DefaultMetricsSettings(), componenttest.NewNopReceiverCreateSettings(), WithStartTime(start)) + mb := NewMetricsBuilder(DefaultMetricsSettings(), receivertest.NewNopCreateSettings(), WithStartTime(start)) enabledMetrics := make(map[string]bool) enabledMetrics["rabbitmq.consumer.count"] = true @@ -65,7 +65,7 @@ func TestAllMetrics(t *testing.T) { RabbitmqMessagePublished: MetricSettings{Enabled: true}, } observedZapCore, observedLogs := observer.New(zap.WarnLevel) - settings := componenttest.NewNopReceiverCreateSettings() + settings := receivertest.NewNopCreateSettings() settings.Logger = zap.New(observedZapCore) mb := NewMetricsBuilder(metricsSettings, settings, WithStartTime(start)) @@ -202,7 +202,7 @@ func TestNoMetrics(t *testing.T) { RabbitmqMessagePublished: MetricSettings{Enabled: false}, } observedZapCore, observedLogs := observer.New(zap.WarnLevel) - settings := componenttest.NewNopReceiverCreateSettings() + settings := receivertest.NewNopCreateSettings() settings.Logger = zap.New(observedZapCore) mb := NewMetricsBuilder(metricsSettings, settings, WithStartTime(start)) diff --git a/receiver/rabbitmqreceiver/scraper.go b/receiver/rabbitmqreceiver/scraper.go index 8edde4fc758fe..ef34d0bb2715e 100644 --- a/receiver/rabbitmqreceiver/scraper.go +++ b/receiver/rabbitmqreceiver/scraper.go @@ -22,6 +22,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" + "go.opentelemetry.io/collector/receiver" "go.uber.org/zap" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/rabbitmqreceiver/internal/metadata" @@ -56,7 +57,7 @@ type rabbitmqScraper struct { } // newScraper creates a new scraper -func newScraper(logger *zap.Logger, cfg *Config, settings component.ReceiverCreateSettings) *rabbitmqScraper { +func newScraper(logger *zap.Logger, cfg *Config, settings receiver.CreateSettings) *rabbitmqScraper { return &rabbitmqScraper{ logger: logger, cfg: cfg, diff --git a/receiver/rabbitmqreceiver/scraper_test.go b/receiver/rabbitmqreceiver/scraper_test.go index 8cb050281fabd..ed64f647d4834 100644 --- a/receiver/rabbitmqreceiver/scraper_test.go +++ b/receiver/rabbitmqreceiver/scraper_test.go @@ -27,6 +27,7 @@ import ( "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/config/configtls" "go.opentelemetry.io/collector/pdata/pmetric" + "go.opentelemetry.io/collector/receiver/receivertest" "go.uber.org/zap" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest" @@ -140,7 +141,7 @@ func TestScaperScrape(t *testing.T) { for _, tc := range testCases { t.Run(tc.desc, func(t *testing.T) { - scraper := newScraper(zap.NewNop(), createDefaultConfig().(*Config), componenttest.NewNopReceiverCreateSettings()) + scraper := newScraper(zap.NewNop(), createDefaultConfig().(*Config), receivertest.NewNopCreateSettings()) scraper.client = tc.setupMockClient(t) actualMetrics, err := scraper.scrape(context.Background()) diff --git a/receiver/receivercreator/config_test.go b/receiver/receivercreator/config_test.go index 457dda7cdbe2a..ca5b531bbdd6b 100644 --- a/receiver/receivercreator/config_test.go +++ b/receiver/receivercreator/config_test.go @@ -26,7 +26,9 @@ import ( "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/confmap/confmaptest" "go.opentelemetry.io/collector/consumer" - "go.opentelemetry.io/collector/service/servicetest" + "go.opentelemetry.io/collector/otelcol/otelcoltest" + rcvr "go.opentelemetry.io/collector/receiver" + "go.opentelemetry.io/collector/receiver/receivertest" "github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer" ) @@ -134,11 +136,11 @@ func TestInvalidResourceAttributeEndpointType(t *testing.T) { factories, err := componenttest.NopFactories() require.Nil(t, err) - factories.Receivers[("nop")] = &nopWithEndpointFactory{ReceiverFactory: componenttest.NewNopReceiverFactory()} + factories.Receivers[("nop")] = &nopWithEndpointFactory{Factory: receivertest.NewNopFactory()} factory := NewFactory() factories.Receivers[typeStr] = factory - cfg, err := servicetest.LoadConfigAndValidate(filepath.Join("testdata", "invalid-resource-attributes.yaml"), factories) + cfg, err := otelcoltest.LoadConfigAndValidate(filepath.Join("testdata", "invalid-resource-attributes.yaml"), factories) require.Contains(t, err.Error(), "error reading receivers configuration for \"receiver_creator\": resource attributes for unsupported endpoint type \"not.a.real.type\"") require.Nil(t, cfg) } @@ -147,11 +149,11 @@ func TestInvalidReceiverResourceAttributeValueType(t *testing.T) { factories, err := componenttest.NopFactories() require.Nil(t, err) - factories.Receivers[("nop")] = &nopWithEndpointFactory{ReceiverFactory: componenttest.NewNopReceiverFactory()} + factories.Receivers[("nop")] = &nopWithEndpointFactory{Factory: receivertest.NewNopFactory()} factory := NewFactory() factories.Receivers[typeStr] = factory - cfg, err := servicetest.LoadConfigAndValidate(filepath.Join("testdata", "invalid-receiver-resource-attributes.yaml"), factories) + cfg, err := otelcoltest.LoadConfigAndValidate(filepath.Join("testdata", "invalid-receiver-resource-attributes.yaml"), factories) require.Contains(t, err.Error(), "error reading receivers configuration for \"receiver_creator\": unsupported `resource_attributes` \"one\" value in examplereceiver/1") require.Nil(t, cfg) } @@ -162,13 +164,13 @@ type nopWithEndpointConfig struct { } type nopWithEndpointFactory struct { - component.ReceiverFactory + rcvr.Factory } type nopWithEndpointReceiver struct { component.Component consumer.Metrics - component.ReceiverCreateSettings + rcvr.CreateSettings } func (*nopWithEndpointFactory) CreateDefaultConfig() component.Config { @@ -184,12 +186,12 @@ type mockComponent struct { func (*nopWithEndpointFactory) CreateMetricsReceiver( ctx context.Context, - rcs component.ReceiverCreateSettings, + rcs rcvr.CreateSettings, _ component.Config, - nextConsumer consumer.Metrics) (component.MetricsReceiver, error) { + nextConsumer consumer.Metrics) (rcvr.Metrics, error) { return &nopWithEndpointReceiver{ - Component: mockComponent{}, - Metrics: nextConsumer, - ReceiverCreateSettings: rcs, + Component: mockComponent{}, + Metrics: nextConsumer, + CreateSettings: rcs, }, nil } diff --git a/receiver/receivercreator/factory.go b/receiver/receivercreator/factory.go index c5105c2aae39b..37a2e173349bf 100644 --- a/receiver/receivercreator/factory.go +++ b/receiver/receivercreator/factory.go @@ -20,6 +20,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer" + "go.opentelemetry.io/collector/receiver" conventions "go.opentelemetry.io/collector/semconv/v1.6.1" "github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer" @@ -33,11 +34,11 @@ const ( ) // NewFactory creates a factory for receiver creator. -func NewFactory() component.ReceiverFactory { - return component.NewReceiverFactory( +func NewFactory() receiver.Factory { + return receiver.NewFactory( typeStr, createDefaultConfig, - component.WithMetricsReceiver(createMetricsReceiver, stability)) + receiver.WithMetrics(createMetricsReceiver, stability)) } func createDefaultConfig() component.Config { @@ -69,9 +70,9 @@ func createDefaultConfig() component.Config { func createMetricsReceiver( ctx context.Context, - params component.ReceiverCreateSettings, + params receiver.CreateSettings, cfg component.Config, consumer consumer.Metrics, -) (component.MetricsReceiver, error) { +) (receiver.Metrics, error) { return newReceiverCreator(params, cfg.(*Config), consumer) } diff --git a/receiver/receivercreator/factory_test.go b/receiver/receivercreator/factory_test.go index 61e66ae80202d..5eab43a545341 100644 --- a/receiver/receivercreator/factory_test.go +++ b/receiver/receivercreator/factory_test.go @@ -20,15 +20,15 @@ import ( "github.com/stretchr/testify/assert" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/consumer/consumertest" + "go.opentelemetry.io/collector/receiver/receivertest" ) func TestCreateReceiver(t *testing.T) { factory := NewFactory() cfg := createDefaultConfig() - params := componenttest.NewNopReceiverCreateSettings() + params := receivertest.NewNopCreateSettings() tReceiver, err := factory.CreateMetricsReceiver(context.Background(), params, cfg, consumertest.NewNop()) assert.NoError(t, err, "receiver creation failed") assert.NotNil(t, tReceiver, "receiver creation failed") diff --git a/receiver/receivercreator/go.mod b/receiver/receivercreator/go.mod index 919a5227e31bb..fc703ffa8dc10 100644 --- a/receiver/receivercreator/go.mod +++ b/receiver/receivercreator/go.mod @@ -5,16 +5,16 @@ go 1.18 require ( github.com/antonmedv/expr v1.9.0 github.com/census-instrumentation/opencensus-proto v0.4.1 - github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.66.0 + github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.67.0 github.com/spf13/cast v1.5.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector v0.67.0 + go.opentelemetry.io/collector/component v0.67.0 + go.opentelemetry.io/collector/confmap v0.67.0 + go.opentelemetry.io/collector/consumer v0.67.0 + go.opentelemetry.io/collector/pdata v1.0.0-rc1 + go.opentelemetry.io/collector/semconv v0.67.0 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.24.0 ) @@ -43,7 +43,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/internal/coreinternal v0.66.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.67.0 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect github.com/prometheus/client_golang v1.14.0 // indirect @@ -59,8 +59,8 @@ require ( github.com/tklauser/numcpus v0.6.0 // indirect github.com/yusufpapurcu/wmi v1.2.2 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect - go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/featuregate v0.67.0 // indirect + go.opentelemetry.io/collector/processor/batchprocessor v0.67.0 // indirect go.opentelemetry.io/contrib/propagators/b3 v1.11.1 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.33.0 // indirect diff --git a/receiver/receivercreator/go.sum b/receiver/receivercreator/go.sum index bd694a3c64eca..08372492f8071 100644 --- a/receiver/receivercreator/go.sum +++ b/receiver/receivercreator/go.sum @@ -418,23 +418,23 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/extension/zpagesextension v0.66.0 h1:tPqSKH5K3VhTT0XXVoWL3woWBSTJqnXZQRt0ZLSCoCc= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221202005155-1c54042beb70 h1:Y4e8NnVevonnAgmjX9Z7QIMA32yMqHAOnAlh8SzTS8c= -go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:Pi1CsKDQFoDrUP1i3+VdE6s2Xuji7bOGFBgqHK0J32E= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 h1:Q5L9Urod3c8as6ZYaoaqBjarx/HXxsxy34DFZIU2fO4= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/component v0.67.0 h1:GCBRZAqk4yNaT4L1uwlbbwophFHrxYccLZ4Uj1Ifs/M= +go.opentelemetry.io/collector/component v0.67.0/go.mod h1:Txa2lm9oe7xsGQN8u7GdUIrRpAHFIKsTO4Qi3/CSmKk= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/extension/zpagesextension v0.67.0 h1:TRW8vZwE+/h2vJqqMDmyQO9X0sxcYCSXf5MyXozSLas= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= +go.opentelemetry.io/collector/processor/batchprocessor v0.67.0 h1:Qn4Ytth3q1trwTSAYYTzIRs4SBh9rz0xBou1nZB+Dko= +go.opentelemetry.io/collector/processor/batchprocessor v0.67.0/go.mod h1:+ZXCkUG9tlwbbVLi+PT9DjQ7vz+lfFSQqvW45snLYno= +go.opentelemetry.io/collector/semconv v0.67.0 h1:zLAvcQa6Kgow52FFLrmk7/9ZVtEYyA73+xDtCcFG78Q= +go.opentelemetry.io/collector/semconv v0.67.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/contrib/propagators/b3 v1.11.1 h1:icQ6ttRV+r/2fnU46BIo/g/mPu6Rs5Ug8Rtohe3KqzI= go.opentelemetry.io/contrib/propagators/b3 v1.11.1/go.mod h1:ECIveyMXgnl4gorxFcA7RYjJY/Ql9n20ubhbfDc3QfA= go.opentelemetry.io/contrib/zpages v0.36.4 h1:Z2VK5WsDhWs9VwZ1p0TM5RyusTOgAQfdMMDDQPRnlmY= diff --git a/receiver/receivercreator/observerhandler.go b/receiver/receivercreator/observerhandler.go index be7fbe8144962..f4552f57e1c7c 100644 --- a/receiver/receivercreator/observerhandler.go +++ b/receiver/receivercreator/observerhandler.go @@ -18,8 +18,8 @@ import ( "fmt" "sync" - "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/consumer" + "go.opentelemetry.io/collector/receiver" "go.uber.org/multierr" "go.uber.org/zap" @@ -34,7 +34,7 @@ var ( type observerHandler struct { sync.Mutex config *Config - params component.ReceiverCreateSettings + params receiver.CreateSettings // receiversByEndpointID is a map of endpoint IDs to a receiver instance. receiversByEndpointID receiverMap // nextConsumer is the receiver_creator's own consumer diff --git a/receiver/receivercreator/observerhandler_test.go b/receiver/receivercreator/observerhandler_test.go index 5a2ada6b9247f..c60f72f717132 100644 --- a/receiver/receivercreator/observerhandler_test.go +++ b/receiver/receivercreator/observerhandler_test.go @@ -20,8 +20,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/consumer" + "go.opentelemetry.io/collector/receiver/receivertest" "github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer" ) @@ -49,7 +49,7 @@ var _ runner = (*mockRunner)(nil) func TestOnAdd(t *testing.T) { runner := &mockRunner{} - set := componenttest.NewNopReceiverCreateSettings() + set := receivertest.NewNopCreateSettings() set.ID = component.NewIDWithName("name", "1") rcvrCfg := receiverConfig{id: set.ID, config: userConfigMap{"foo": "bar"}, endpointID: portEndpoint.ID} cfg := createDefaultConfig().(*Config) @@ -82,7 +82,7 @@ func TestOnAdd(t *testing.T) { func TestOnRemove(t *testing.T) { runner := &mockRunner{} rcvr := &nopWithEndpointReceiver{} - set := componenttest.NewNopReceiverCreateSettings() + set := receivertest.NewNopCreateSettings() set.ID = component.NewID(typeStr) handler := &observerHandler{ params: set, @@ -103,7 +103,7 @@ func TestOnRemove(t *testing.T) { func TestOnChange(t *testing.T) { runner := &mockRunner{} - set := componenttest.NewNopReceiverCreateSettings() + set := receivertest.NewNopCreateSettings() set.ID = component.NewIDWithName("name", "1") rcvrCfg := receiverConfig{id: set.ID, config: userConfigMap{"foo": "bar"}, endpointID: portEndpoint.ID} oldRcvr := &nopWithEndpointReceiver{} @@ -138,7 +138,7 @@ func TestOnChange(t *testing.T) { func TestDynamicConfig(t *testing.T) { runner := &mockRunner{} - set := componenttest.NewNopReceiverCreateSettings() + set := receivertest.NewNopCreateSettings() set.ID = component.NewIDWithName("name", "1") cfg := createDefaultConfig().(*Config) cfg.receiverTemplates = map[string]receiverTemplate{ diff --git a/receiver/receivercreator/receiver.go b/receiver/receivercreator/receiver.go index 1e6b8017c1c50..e3a8010791bae 100644 --- a/receiver/receivercreator/receiver.go +++ b/receiver/receivercreator/receiver.go @@ -20,16 +20,17 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/consumer" + "go.opentelemetry.io/collector/receiver" "go.uber.org/zap" "github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer" ) -var _ component.MetricsReceiver = (*receiverCreator)(nil) +var _ receiver.Metrics = (*receiverCreator)(nil) // receiverCreator implements consumer.Metrics. type receiverCreator struct { - params component.ReceiverCreateSettings + params receiver.CreateSettings cfg *Config nextConsumer consumer.Metrics observerHandler *observerHandler @@ -37,7 +38,7 @@ type receiverCreator struct { } // newReceiverCreator creates the receiver_creator with the given parameters. -func newReceiverCreator(params component.ReceiverCreateSettings, cfg *Config, nextConsumer consumer.Metrics) (component.MetricsReceiver, error) { +func newReceiverCreator(params receiver.CreateSettings, cfg *Config, nextConsumer consumer.Metrics) (receiver.Metrics, error) { if nextConsumer == nil { return nil, component.ErrNilNextConsumer } diff --git a/receiver/receivercreator/receiver_test.go b/receiver/receivercreator/receiver_test.go index da9a61207c9fd..4b31a35414b7d 100644 --- a/receiver/receivercreator/receiver_test.go +++ b/receiver/receivercreator/receiver_test.go @@ -32,6 +32,7 @@ import ( "go.opentelemetry.io/collector/confmap/confmaptest" "go.opentelemetry.io/collector/consumer/consumertest" "go.opentelemetry.io/collector/extension" + "go.opentelemetry.io/collector/receiver/receivertest" "go.uber.org/zap" zapObserver "go.uber.org/zap/zaptest/observer" @@ -72,7 +73,7 @@ func TestMockedEndToEnd(t *testing.T) { require.NoError(t, err) factories, _ := componenttest.NopFactories() - factories.Receivers[("nop")] = &nopWithEndpointFactory{ReceiverFactory: componenttest.NewNopReceiverFactory()} + factories.Receivers[("nop")] = &nopWithEndpointFactory{Factory: receivertest.NewNopFactory()} factory := NewFactory() factories.Receivers[typeStr] = factory @@ -87,7 +88,7 @@ func TestMockedEndToEnd(t *testing.T) { require.NoError(t, err) require.NoError(t, component.UnmarshalConfig(sub, cfg)) - params := componenttest.NewNopReceiverCreateSettings() + params := receivertest.NewNopCreateSettings() mockConsumer := new(consumertest.MetricsSink) rcvr, err := factory.CreateMetricsReceiver(context.Background(), params, cfg, mockConsumer) diff --git a/receiver/receivercreator/runner.go b/receiver/receivercreator/runner.go index 82c0d1e3ecb05..199c97f1c53f5 100644 --- a/receiver/receivercreator/runner.go +++ b/receiver/receivercreator/runner.go @@ -22,6 +22,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/confmap" "go.opentelemetry.io/collector/consumer" + rcvr "go.opentelemetry.io/collector/receiver" "go.uber.org/zap" ) @@ -35,7 +36,7 @@ type runner interface { // receiverRunner handles starting/stopping of a concrete subreceiver instance. type receiverRunner struct { - params component.ReceiverCreateSettings + params rcvr.CreateSettings idNamespace component.ID host component.Host } @@ -54,7 +55,7 @@ func (run *receiverRunner) start( return nil, fmt.Errorf("unable to lookup factory for receiver %q", receiver.id.String()) } - receiverFactory := factory.(component.ReceiverFactory) + receiverFactory := factory.(rcvr.Factory) cfg, endpoint, err := run.loadRuntimeReceiverConfig(receiverFactory, receiver, discoveredConfig) if err != nil { @@ -85,7 +86,7 @@ func (run *receiverRunner) shutdown(rcvr component.Component) error { // loadRuntimeReceiverConfig loads the given receiverTemplate merged with config values // that may have been discovered at runtime. func (run *receiverRunner) loadRuntimeReceiverConfig( - factory component.ReceiverFactory, + factory rcvr.Factory, receiver receiverConfig, discoveredConfig userConfigMap, ) (component.Config, string, error) { @@ -106,11 +107,11 @@ func (run *receiverRunner) loadRuntimeReceiverConfig( // createRuntimeReceiver creates a receiver that is discovered at runtime. func (run *receiverRunner) createRuntimeReceiver( - factory component.ReceiverFactory, + factory rcvr.Factory, id component.ID, cfg component.Config, nextConsumer consumer.Metrics, -) (component.MetricsReceiver, error) { +) (rcvr.Metrics, error) { runParams := run.params runParams.Logger = runParams.Logger.With(zap.String("name", id.String())) runParams.ID = id diff --git a/receiver/receivercreator/runner_test.go b/receiver/receivercreator/runner_test.go index e02571c40156e..1c46267806650 100644 --- a/receiver/receivercreator/runner_test.go +++ b/receiver/receivercreator/runner_test.go @@ -20,7 +20,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/component/componenttest" + "go.opentelemetry.io/collector/receiver/receivertest" "go.uber.org/zap" "go.uber.org/zap/zaptest/observer" ) @@ -28,7 +28,7 @@ import ( func Test_loadAndCreateRuntimeReceiver(t *testing.T) { logCore, logs := observer.New(zap.DebugLevel) logger := zap.New(logCore).With(zap.String("name", "receiver_creator")) - rcs := componenttest.NewNopReceiverCreateSettings() + rcs := receivertest.NewNopCreateSettings() rcs.Logger = logger run := &receiverRunner{params: rcs, idNamespace: component.NewIDWithName(typeStr, "1")} exampleFactory := &nopWithEndpointFactory{} diff --git a/receiver/redisreceiver/factory.go b/receiver/redisreceiver/factory.go index aebce01c2c354..81d90a89171ba 100644 --- a/receiver/redisreceiver/factory.go +++ b/receiver/redisreceiver/factory.go @@ -22,6 +22,7 @@ import ( "go.opentelemetry.io/collector/config/confignet" "go.opentelemetry.io/collector/config/configtls" "go.opentelemetry.io/collector/consumer" + "go.opentelemetry.io/collector/receiver" "go.opentelemetry.io/collector/receiver/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/redisreceiver/internal/metadata" @@ -33,11 +34,11 @@ const ( ) // NewFactory creates a factory for Redis receiver. -func NewFactory() component.ReceiverFactory { - return component.NewReceiverFactory( +func NewFactory() receiver.Factory { + return receiver.NewFactory( typeStr, createDefaultConfig, - component.WithMetricsReceiver(createMetricsReceiver, stability)) + receiver.WithMetrics(createMetricsReceiver, stability)) } func createDefaultConfig() component.Config { @@ -57,10 +58,10 @@ func createDefaultConfig() component.Config { func createMetricsReceiver( ctx context.Context, - set component.ReceiverCreateSettings, + set receiver.CreateSettings, cfg component.Config, consumer consumer.Metrics, -) (component.MetricsReceiver, error) { +) (receiver.Metrics, error) { oCfg := cfg.(*Config) scrp, err := newRedisScraper(oCfg, set) diff --git a/receiver/redisreceiver/go.mod b/receiver/redisreceiver/go.mod index a878db20a4ab8..35eebee769d28 100644 --- a/receiver/redisreceiver/go.mod +++ b/receiver/redisreceiver/go.mod @@ -6,11 +6,11 @@ require ( github.com/go-redis/redis/v7 v7.4.1 github.com/stretchr/testify v1.8.1 github.com/testcontainers/testcontainers-go v0.15.0 - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector v0.67.0 + go.opentelemetry.io/collector/component v0.67.0 + go.opentelemetry.io/collector/confmap v0.67.0 + go.opentelemetry.io/collector/consumer v0.67.0 + go.opentelemetry.io/collector/pdata v1.0.0-rc1 go.uber.org/zap v1.24.0 ) @@ -53,7 +53,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/sirupsen/logrus v1.8.1 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/featuregate v0.67.0 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/receiver/redisreceiver/go.sum b/receiver/redisreceiver/go.sum index ba0ac22f994e1..ea7c74b11bc5f 100644 --- a/receiver/redisreceiver/go.sum +++ b/receiver/redisreceiver/go.sum @@ -829,18 +829,18 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/component v0.67.0 h1:GCBRZAqk4yNaT4L1uwlbbwophFHrxYccLZ4Uj1Ifs/M= +go.opentelemetry.io/collector/component v0.67.0/go.mod h1:Txa2lm9oe7xsGQN8u7GdUIrRpAHFIKsTO4Qi3/CSmKk= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/receiver/redisreceiver/internal/metadata/generated_metrics.go b/receiver/redisreceiver/internal/metadata/generated_metrics.go index 9fb6dc1bbafba..792495d4813f8 100644 --- a/receiver/redisreceiver/internal/metadata/generated_metrics.go +++ b/receiver/redisreceiver/internal/metadata/generated_metrics.go @@ -9,6 +9,7 @@ import ( "go.opentelemetry.io/collector/confmap" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" + "go.opentelemetry.io/collector/receiver" ) // MetricSettings provides common settings for a particular metric. @@ -1964,7 +1965,7 @@ func WithStartTime(startTime pcommon.Timestamp) metricBuilderOption { } } -func NewMetricsBuilder(ms MetricsSettings, settings component.ReceiverCreateSettings, options ...metricBuilderOption) *MetricsBuilder { +func NewMetricsBuilder(ms MetricsSettings, settings receiver.CreateSettings, options ...metricBuilderOption) *MetricsBuilder { mb := &MetricsBuilder{ startTime: pcommon.NewTimestampFromTime(time.Now()), metricsBuffer: pmetric.NewMetrics(), diff --git a/receiver/redisreceiver/internal/metadata/generated_metrics_test.go b/receiver/redisreceiver/internal/metadata/generated_metrics_test.go index 75efc49885269..eb126151307e0 100644 --- a/receiver/redisreceiver/internal/metadata/generated_metrics_test.go +++ b/receiver/redisreceiver/internal/metadata/generated_metrics_test.go @@ -7,9 +7,9 @@ import ( "testing" "github.com/stretchr/testify/assert" - "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" + "go.opentelemetry.io/collector/receiver/receivertest" "go.uber.org/zap" "go.uber.org/zap/zaptest/observer" ) @@ -17,7 +17,7 @@ import ( func TestDefaultMetrics(t *testing.T) { start := pcommon.Timestamp(1_000_000_000) ts := pcommon.Timestamp(1_000_001_000) - mb := NewMetricsBuilder(DefaultMetricsSettings(), componenttest.NewNopReceiverCreateSettings(), WithStartTime(start)) + mb := NewMetricsBuilder(DefaultMetricsSettings(), receivertest.NewNopCreateSettings(), WithStartTime(start)) enabledMetrics := make(map[string]bool) enabledMetrics["redis.clients.blocked"] = true @@ -169,7 +169,7 @@ func TestAllMetrics(t *testing.T) { RedisUptime: MetricSettings{Enabled: true}, } observedZapCore, observedLogs := observer.New(zap.WarnLevel) - settings := componenttest.NewNopReceiverCreateSettings() + settings := receivertest.NewNopCreateSettings() settings.Logger = zap.New(observedZapCore) mb := NewMetricsBuilder(metricsSettings, settings, WithStartTime(start)) @@ -691,7 +691,7 @@ func TestNoMetrics(t *testing.T) { RedisUptime: MetricSettings{Enabled: false}, } observedZapCore, observedLogs := observer.New(zap.WarnLevel) - settings := componenttest.NewNopReceiverCreateSettings() + settings := receivertest.NewNopCreateSettings() settings.Logger = zap.New(observedZapCore) mb := NewMetricsBuilder(metricsSettings, settings, WithStartTime(start)) diff --git a/receiver/redisreceiver/metric_functions_test.go b/receiver/redisreceiver/metric_functions_test.go index 594a57addf86e..f75134c5a612c 100644 --- a/receiver/redisreceiver/metric_functions_test.go +++ b/receiver/redisreceiver/metric_functions_test.go @@ -20,8 +20,8 @@ import ( "testing" "github.com/stretchr/testify/assert" - "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/pdata/pcommon" + "go.opentelemetry.io/collector/receiver/receivertest" "go.uber.org/zap" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/redisreceiver/internal/metadata" @@ -29,7 +29,7 @@ import ( func TestDataPointRecorders(t *testing.T) { logger, _ := zap.NewDevelopment() - settings := componenttest.NewNopReceiverCreateSettings() + settings := receivertest.NewNopCreateSettings() settings.Logger = logger rs := &redisScraper{ redisSvc: newRedisSvc(newFakeClient()), diff --git a/receiver/redisreceiver/redis_e2e_test.go b/receiver/redisreceiver/redis_e2e_test.go index 83b4286698c40..d6a8e16dba281 100644 --- a/receiver/redisreceiver/redis_e2e_test.go +++ b/receiver/redisreceiver/redis_e2e_test.go @@ -28,8 +28,8 @@ import ( testcontainers "github.com/testcontainers/testcontainers-go" "github.com/testcontainers/testcontainers-go/wait" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/consumer/consumertest" + "go.opentelemetry.io/collector/receiver/receivertest" ) type testHost struct { @@ -69,7 +69,7 @@ func TestIntegration(t *testing.T) { consumer := new(consumertest.MetricsSink) - rcvr, err := f.CreateMetricsReceiver(context.Background(), componenttest.NewNopReceiverCreateSettings(), cfg, consumer) + rcvr, err := f.CreateMetricsReceiver(context.Background(), receivertest.NewNopCreateSettings(), cfg, consumer) require.NoError(t, err, "failed creating metrics receiver") require.NoError(t, rcvr.Start(context.Background(), &testHost{ t: t, diff --git a/receiver/redisreceiver/redis_scraper.go b/receiver/redisreceiver/redis_scraper.go index 2069d45e3291f..9bcdcbabfe8dd 100644 --- a/receiver/redisreceiver/redis_scraper.go +++ b/receiver/redisreceiver/redis_scraper.go @@ -24,6 +24,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" + "go.opentelemetry.io/collector/receiver" "go.opentelemetry.io/collector/receiver/scraperhelper" "go.uber.org/zap" @@ -41,7 +42,7 @@ type redisScraper struct { const redisMaxDbs = 16 // Maximum possible number of redis databases -func newRedisScraper(cfg *Config, settings component.ReceiverCreateSettings) (scraperhelper.Scraper, error) { +func newRedisScraper(cfg *Config, settings receiver.CreateSettings) (scraperhelper.Scraper, error) { opts := &redis.Options{ Addr: cfg.Endpoint, Password: cfg.Password, @@ -55,7 +56,7 @@ func newRedisScraper(cfg *Config, settings component.ReceiverCreateSettings) (sc return newRedisScraperWithClient(newRedisClient(opts), settings, cfg) } -func newRedisScraperWithClient(client client, settings component.ReceiverCreateSettings, cfg *Config) (scraperhelper.Scraper, error) { +func newRedisScraperWithClient(client client, settings receiver.CreateSettings, cfg *Config) (scraperhelper.Scraper, error) { rs := &redisScraper{ redisSvc: newRedisSvc(client), settings: settings.TelemetrySettings, diff --git a/receiver/redisreceiver/redis_scraper_test.go b/receiver/redisreceiver/redis_scraper_test.go index e1422ff886ebf..cce25fa357d56 100644 --- a/receiver/redisreceiver/redis_scraper_test.go +++ b/receiver/redisreceiver/redis_scraper_test.go @@ -20,8 +20,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config/configtls" + "go.opentelemetry.io/collector/receiver/receivertest" "go.uber.org/zap" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/redisreceiver/internal/metadata" @@ -29,7 +29,7 @@ import ( func TestRedisRunnable(t *testing.T) { logger, _ := zap.NewDevelopment() - settings := componenttest.NewNopReceiverCreateSettings() + settings := receivertest.NewNopCreateSettings() settings.Logger = logger cfg := createDefaultConfig().(*Config) rs := &redisScraper{mb: metadata.NewMetricsBuilder(cfg.Metrics, settings)} @@ -53,7 +53,7 @@ func TestNewReceiver_invalid_auth_error(t *testing.T) { CAFile: "/invalid", }, } - r, err := createMetricsReceiver(context.Background(), componenttest.NewNopReceiverCreateSettings(), c, nil) + r, err := createMetricsReceiver(context.Background(), receivertest.NewNopCreateSettings(), c, nil) assert.Error(t, err) assert.Contains(t, err.Error(), "failed to load TLS config") assert.Nil(t, r) diff --git a/receiver/riakreceiver/factory.go b/receiver/riakreceiver/factory.go index 725984af4a931..5dbb2719765ee 100644 --- a/receiver/riakreceiver/factory.go +++ b/receiver/riakreceiver/factory.go @@ -23,6 +23,7 @@ import ( "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/consumer" + "go.opentelemetry.io/collector/receiver" "go.opentelemetry.io/collector/receiver/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/riakreceiver/internal/metadata" @@ -36,11 +37,11 @@ const ( var errConfigNotRiak = errors.New("config was not a Riak receiver config") // NewFactory creates a new receiver factory -func NewFactory() component.ReceiverFactory { - return component.NewReceiverFactory( +func NewFactory() receiver.Factory { + return receiver.NewFactory( typeStr, createDefaultConfig, - component.WithMetricsReceiver(createMetricsReceiver, stability)) + receiver.WithMetrics(createMetricsReceiver, stability)) } func createDefaultConfig() component.Config { @@ -57,7 +58,7 @@ func createDefaultConfig() component.Config { } } -func createMetricsReceiver(ctx context.Context, params component.ReceiverCreateSettings, rConf component.Config, consumer consumer.Metrics) (component.MetricsReceiver, error) { +func createMetricsReceiver(ctx context.Context, params receiver.CreateSettings, rConf component.Config, consumer consumer.Metrics) (receiver.Metrics, error) { cfg, ok := rConf.(*Config) if !ok { return nil, errConfigNotRiak diff --git a/receiver/riakreceiver/factory_test.go b/receiver/riakreceiver/factory_test.go index bc078e6d232c2..12908cad3e056 100644 --- a/receiver/riakreceiver/factory_test.go +++ b/receiver/riakreceiver/factory_test.go @@ -21,10 +21,10 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/consumer/consumertest" + "go.opentelemetry.io/collector/receiver/receivertest" "go.opentelemetry.io/collector/receiver/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/riakreceiver/internal/metadata" @@ -69,7 +69,7 @@ func TestNewFactory(t *testing.T) { cfg := factory.CreateDefaultConfig() _, err := factory.CreateMetricsReceiver( context.Background(), - componenttest.NewNopReceiverCreateSettings(), + receivertest.NewNopCreateSettings(), cfg, consumertest.NewNop(), ) @@ -82,7 +82,7 @@ func TestNewFactory(t *testing.T) { factory := NewFactory() _, err := factory.CreateMetricsReceiver( context.Background(), - componenttest.NewNopReceiverCreateSettings(), + receivertest.NewNopCreateSettings(), nil, consumertest.NewNop(), ) diff --git a/receiver/riakreceiver/go.mod b/receiver/riakreceiver/go.mod index 0c12e19459e5b..6a78974b064f7 100644 --- a/receiver/riakreceiver/go.mod +++ b/receiver/riakreceiver/go.mod @@ -3,14 +3,14 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/receiver/riakre go 1.18 require ( - github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest v0.66.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest v0.67.0 github.com/stretchr/testify v1.8.1 github.com/testcontainers/testcontainers-go v0.15.0 - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector v0.67.0 + go.opentelemetry.io/collector/component v0.67.0 + go.opentelemetry.io/collector/confmap v0.67.0 + go.opentelemetry.io/collector/consumer v0.67.0 + go.opentelemetry.io/collector/pdata v1.0.0-rc1 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.24.0 ) @@ -58,7 +58,7 @@ require ( github.com/sirupsen/logrus v1.8.1 // indirect github.com/stretchr/objx v0.5.0 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/featuregate v0.67.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect diff --git a/receiver/riakreceiver/go.sum b/receiver/riakreceiver/go.sum index b04f23101060a..59ebb1bc6013b 100644 --- a/receiver/riakreceiver/go.sum +++ b/receiver/riakreceiver/go.sum @@ -829,18 +829,18 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/component v0.67.0 h1:GCBRZAqk4yNaT4L1uwlbbwophFHrxYccLZ4Uj1Ifs/M= +go.opentelemetry.io/collector/component v0.67.0/go.mod h1:Txa2lm9oe7xsGQN8u7GdUIrRpAHFIKsTO4Qi3/CSmKk= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 h1:aUEBEdCa6iamGzg6fuYxDA8ThxvOG240mAvWDU+XLio= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4/go.mod h1:l2MdsbKTocpPS5nQZscqTR9jd8u96VYZdcpF8Sye7mA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= diff --git a/receiver/riakreceiver/integration_test.go b/receiver/riakreceiver/integration_test.go index e841c624e0116..773869fc20053 100644 --- a/receiver/riakreceiver/integration_test.go +++ b/receiver/riakreceiver/integration_test.go @@ -30,6 +30,7 @@ import ( "github.com/testcontainers/testcontainers-go/wait" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/consumer/consumertest" + "go.opentelemetry.io/collector/receiver/receivertest" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest/golden" @@ -75,7 +76,7 @@ func TestRiakIntegration(t *testing.T) { cfg.Endpoint = fmt.Sprintf("http://%s", net.JoinHostPort(hostname, "8098")) consumer := new(consumertest.MetricsSink) - settings := componenttest.NewNopReceiverCreateSettings() + settings := receivertest.NewNopCreateSettings() rcvr, err := f.CreateMetricsReceiver(context.Background(), settings, cfg, consumer) require.NoError(t, err, "failed creating metrics receiver") diff --git a/receiver/riakreceiver/internal/metadata/generated_metrics.go b/receiver/riakreceiver/internal/metadata/generated_metrics.go index c1fdf55e49642..8c161ef64ee9b 100644 --- a/receiver/riakreceiver/internal/metadata/generated_metrics.go +++ b/receiver/riakreceiver/internal/metadata/generated_metrics.go @@ -9,6 +9,7 @@ import ( "go.opentelemetry.io/collector/confmap" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" + "go.opentelemetry.io/collector/receiver" ) // MetricSettings provides common settings for a particular metric. @@ -462,7 +463,7 @@ func WithStartTime(startTime pcommon.Timestamp) metricBuilderOption { } } -func NewMetricsBuilder(ms MetricsSettings, settings component.ReceiverCreateSettings, options ...metricBuilderOption) *MetricsBuilder { +func NewMetricsBuilder(ms MetricsSettings, settings receiver.CreateSettings, options ...metricBuilderOption) *MetricsBuilder { mb := &MetricsBuilder{ startTime: pcommon.NewTimestampFromTime(time.Now()), metricsBuffer: pmetric.NewMetrics(), diff --git a/receiver/riakreceiver/internal/metadata/generated_metrics_test.go b/receiver/riakreceiver/internal/metadata/generated_metrics_test.go index 0d89a66959cfa..37d00a6f9b020 100644 --- a/receiver/riakreceiver/internal/metadata/generated_metrics_test.go +++ b/receiver/riakreceiver/internal/metadata/generated_metrics_test.go @@ -7,9 +7,9 @@ import ( "testing" "github.com/stretchr/testify/assert" - "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" + "go.opentelemetry.io/collector/receiver/receivertest" "go.uber.org/zap" "go.uber.org/zap/zaptest/observer" ) @@ -17,7 +17,7 @@ import ( func TestDefaultMetrics(t *testing.T) { start := pcommon.Timestamp(1_000_000_000) ts := pcommon.Timestamp(1_000_001_000) - mb := NewMetricsBuilder(DefaultMetricsSettings(), componenttest.NewNopReceiverCreateSettings(), WithStartTime(start)) + mb := NewMetricsBuilder(DefaultMetricsSettings(), receivertest.NewNopCreateSettings(), WithStartTime(start)) enabledMetrics := make(map[string]bool) enabledMetrics["riak.memory.limit"] = true @@ -65,7 +65,7 @@ func TestAllMetrics(t *testing.T) { RiakVnodeOperationCount: MetricSettings{Enabled: true}, } observedZapCore, observedLogs := observer.New(zap.WarnLevel) - settings := componenttest.NewNopReceiverCreateSettings() + settings := receivertest.NewNopCreateSettings() settings.Logger = zap.New(observedZapCore) mb := NewMetricsBuilder(metricsSettings, settings, WithStartTime(start)) @@ -201,7 +201,7 @@ func TestNoMetrics(t *testing.T) { RiakVnodeOperationCount: MetricSettings{Enabled: false}, } observedZapCore, observedLogs := observer.New(zap.WarnLevel) - settings := componenttest.NewNopReceiverCreateSettings() + settings := receivertest.NewNopCreateSettings() settings.Logger = zap.New(observedZapCore) mb := NewMetricsBuilder(metricsSettings, settings, WithStartTime(start)) diff --git a/receiver/riakreceiver/scraper.go b/receiver/riakreceiver/scraper.go index 36ccdb49e7f5c..c50dc6c0eead9 100644 --- a/receiver/riakreceiver/scraper.go +++ b/receiver/riakreceiver/scraper.go @@ -22,6 +22,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" + "go.opentelemetry.io/collector/receiver" "go.opentelemetry.io/collector/receiver/scrapererror" "go.uber.org/zap" @@ -41,7 +42,7 @@ type riakScraper struct { } // newScraper creates a new scraper -func newScraper(logger *zap.Logger, cfg *Config, settings component.ReceiverCreateSettings) *riakScraper { +func newScraper(logger *zap.Logger, cfg *Config, settings receiver.CreateSettings) *riakScraper { return &riakScraper{ logger: logger, cfg: cfg, diff --git a/receiver/riakreceiver/scraper_test.go b/receiver/riakreceiver/scraper_test.go index 5d1cc6ed2464c..2fe4ac64dd1f9 100644 --- a/receiver/riakreceiver/scraper_test.go +++ b/receiver/riakreceiver/scraper_test.go @@ -27,6 +27,7 @@ import ( "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/config/configtls" "go.opentelemetry.io/collector/pdata/pmetric" + "go.opentelemetry.io/collector/receiver/receivertest" "go.uber.org/zap" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest" @@ -196,7 +197,7 @@ func TestScaperScrape(t *testing.T) { for _, tc := range testCases { t.Run(tc.desc, func(t *testing.T) { - scraper := newScraper(zap.NewNop(), tc.setupCfg(), componenttest.NewNopReceiverCreateSettings()) + scraper := newScraper(zap.NewNop(), tc.setupCfg(), receivertest.NewNopCreateSettings()) scraper.client = tc.setupMockClient(t) actualMetrics, err := scraper.scrape(context.Background()) if tc.expectedErr == nil { diff --git a/receiver/saphanareceiver/factory.go b/receiver/saphanareceiver/factory.go index 603a3286d2f8d..7fd788f4a0858 100644 --- a/receiver/saphanareceiver/factory.go +++ b/receiver/saphanareceiver/factory.go @@ -23,6 +23,7 @@ import ( "go.opentelemetry.io/collector/config/confignet" "go.opentelemetry.io/collector/config/configtls" "go.opentelemetry.io/collector/consumer" + "go.opentelemetry.io/collector/receiver" "go.opentelemetry.io/collector/receiver/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/saphanareceiver/internal/metadata" @@ -35,11 +36,11 @@ const ( ) // NewFactory creates a factory for SAP HANA receiver. -func NewFactory() component.ReceiverFactory { - return component.NewReceiverFactory( +func NewFactory() receiver.Factory { + return receiver.NewFactory( typeStr, createDefaultConfig, - component.WithMetricsReceiver(createMetricsReceiver, stability)) + receiver.WithMetrics(createMetricsReceiver, stability)) } func createDefaultConfig() component.Config { @@ -61,10 +62,10 @@ var errConfigNotSAPHANA = errors.New("config was not an sap hana receiver config func createMetricsReceiver( ctx context.Context, - set component.ReceiverCreateSettings, + set receiver.CreateSettings, cfg component.Config, consumer consumer.Metrics, -) (component.MetricsReceiver, error) { +) (receiver.Metrics, error) { c, ok := cfg.(*Config) if !ok { return nil, errConfigNotSAPHANA diff --git a/receiver/saphanareceiver/factory_test.go b/receiver/saphanareceiver/factory_test.go index 30aa54b558193..9121b9233a2ac 100644 --- a/receiver/saphanareceiver/factory_test.go +++ b/receiver/saphanareceiver/factory_test.go @@ -21,9 +21,9 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer/consumertest" + "go.opentelemetry.io/collector/receiver/receivertest" "go.opentelemetry.io/collector/receiver/scraperhelper" ) @@ -45,7 +45,7 @@ func TestCreateMetricsReceiver(t *testing.T) { factory := NewFactory() metricsReceiver, err := factory.CreateMetricsReceiver( context.Background(), - componenttest.NewNopReceiverCreateSettings(), + receivertest.NewNopCreateSettings(), &Config{ ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ ReceiverSettings: config.NewReceiverSettings(component.NewID("saphana")), diff --git a/receiver/saphanareceiver/go.mod b/receiver/saphanareceiver/go.mod index 188f072b0c8f6..1cc3ddddc80f0 100644 --- a/receiver/saphanareceiver/go.mod +++ b/receiver/saphanareceiver/go.mod @@ -5,13 +5,13 @@ go 1.18 require ( github.com/SAP/go-hdb v0.111.5 github.com/google/go-cmp v0.5.9 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest v0.66.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest v0.67.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector v0.67.0 + go.opentelemetry.io/collector/component v0.67.0 + go.opentelemetry.io/collector/confmap v0.67.0 + go.opentelemetry.io/collector/consumer v0.67.0 + go.opentelemetry.io/collector/pdata v1.0.0-rc1 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.24.0 ) @@ -34,7 +34,7 @@ require ( github.com/rogpeppe/go-internal v1.6.1 // indirect github.com/stretchr/objx v0.5.0 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/featuregate v0.67.0 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/receiver/saphanareceiver/go.sum b/receiver/saphanareceiver/go.sum index 298de8d4780d7..1587d2c0f32f7 100644 --- a/receiver/saphanareceiver/go.sum +++ b/receiver/saphanareceiver/go.sum @@ -286,18 +286,18 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/component v0.67.0 h1:GCBRZAqk4yNaT4L1uwlbbwophFHrxYccLZ4Uj1Ifs/M= +go.opentelemetry.io/collector/component v0.67.0/go.mod h1:Txa2lm9oe7xsGQN8u7GdUIrRpAHFIKsTO4Qi3/CSmKk= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/receiver/saphanareceiver/internal/metadata/generated_metrics.go b/receiver/saphanareceiver/internal/metadata/generated_metrics.go index 5cac864a2d621..cc64a31ec77da 100644 --- a/receiver/saphanareceiver/internal/metadata/generated_metrics.go +++ b/receiver/saphanareceiver/internal/metadata/generated_metrics.go @@ -11,6 +11,7 @@ import ( "go.opentelemetry.io/collector/confmap" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" + "go.opentelemetry.io/collector/receiver" ) // MetricSettings provides common settings for a particular metric. @@ -3196,7 +3197,7 @@ func WithStartTime(startTime pcommon.Timestamp) metricBuilderOption { } } -func NewMetricsBuilder(ms MetricsSettings, settings component.ReceiverCreateSettings, options ...metricBuilderOption) *MetricsBuilder { +func NewMetricsBuilder(ms MetricsSettings, settings receiver.CreateSettings, options ...metricBuilderOption) *MetricsBuilder { mb := &MetricsBuilder{ startTime: pcommon.NewTimestampFromTime(time.Now()), metricsBuffer: pmetric.NewMetrics(), diff --git a/receiver/saphanareceiver/internal/metadata/generated_metrics_test.go b/receiver/saphanareceiver/internal/metadata/generated_metrics_test.go index eb924be093a50..6ef183c44b741 100644 --- a/receiver/saphanareceiver/internal/metadata/generated_metrics_test.go +++ b/receiver/saphanareceiver/internal/metadata/generated_metrics_test.go @@ -7,9 +7,9 @@ import ( "testing" "github.com/stretchr/testify/assert" - "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" + "go.opentelemetry.io/collector/receiver/receivertest" "go.uber.org/zap" "go.uber.org/zap/zaptest/observer" ) @@ -17,7 +17,7 @@ import ( func TestDefaultMetrics(t *testing.T) { start := pcommon.Timestamp(1_000_000_000) ts := pcommon.Timestamp(1_000_001_000) - mb := NewMetricsBuilder(DefaultMetricsSettings(), componenttest.NewNopReceiverCreateSettings(), WithStartTime(start)) + mb := NewMetricsBuilder(DefaultMetricsSettings(), receivertest.NewNopCreateSettings(), WithStartTime(start)) enabledMetrics := make(map[string]bool) enabledMetrics["saphana.alert.count"] = true @@ -221,7 +221,7 @@ func TestAllMetrics(t *testing.T) { SaphanaVolumeOperationTime: MetricSettings{Enabled: true}, } observedZapCore, observedLogs := observer.New(zap.WarnLevel) - settings := componenttest.NewNopReceiverCreateSettings() + settings := receivertest.NewNopCreateSettings() settings.Logger = zap.New(observedZapCore) mb := NewMetricsBuilder(metricsSettings, settings, WithStartTime(start)) @@ -1129,7 +1129,7 @@ func TestNoMetrics(t *testing.T) { SaphanaVolumeOperationTime: MetricSettings{Enabled: false}, } observedZapCore, observedLogs := observer.New(zap.WarnLevel) - settings := componenttest.NewNopReceiverCreateSettings() + settings := receivertest.NewNopCreateSettings() settings.Logger = zap.New(observedZapCore) mb := NewMetricsBuilder(metricsSettings, settings, WithStartTime(start)) diff --git a/receiver/saphanareceiver/scraper.go b/receiver/saphanareceiver/scraper.go index 22293e1aba988..2f25166cccb52 100644 --- a/receiver/saphanareceiver/scraper.go +++ b/receiver/saphanareceiver/scraper.go @@ -20,9 +20,9 @@ import ( "fmt" "time" - "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" + "go.opentelemetry.io/collector/receiver" "go.opentelemetry.io/collector/receiver/scrapererror" "go.opentelemetry.io/collector/receiver/scraperhelper" @@ -32,13 +32,13 @@ import ( // Runs intermittently, fetching info from SAP HANA, creating metrics/datapoints, // and feeding them to a metricsConsumer. type sapHanaScraper struct { - settings component.ReceiverCreateSettings + settings receiver.CreateSettings cfg *Config mbs map[string]*metadata.MetricsBuilder factory sapHanaConnectionFactory } -func newSapHanaScraper(settings component.ReceiverCreateSettings, cfg *Config, factory sapHanaConnectionFactory) (scraperhelper.Scraper, error) { +func newSapHanaScraper(settings receiver.CreateSettings, cfg *Config, factory sapHanaConnectionFactory) (scraperhelper.Scraper, error) { rs := &sapHanaScraper{ settings: settings, cfg: cfg, diff --git a/receiver/saphanareceiver/scraper_test.go b/receiver/saphanareceiver/scraper_test.go index 591f6b570794b..16821d7f8f064 100644 --- a/receiver/saphanareceiver/scraper_test.go +++ b/receiver/saphanareceiver/scraper_test.go @@ -21,7 +21,7 @@ import ( "testing" "github.com/stretchr/testify/require" - "go.opentelemetry.io/collector/component/componenttest" + "go.opentelemetry.io/collector/receiver/receivertest" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest/golden" @@ -38,7 +38,7 @@ func TestScraper(t *testing.T) { dbWrapper := &testDBWrapper{} initializeWrapper(t, dbWrapper, allQueryMetrics) - sc, err := newSapHanaScraper(componenttest.NewNopReceiverCreateSettings(), createDefaultConfig().(*Config), &testConnectionFactory{dbWrapper}) + sc, err := newSapHanaScraper(receivertest.NewNopCreateSettings(), createDefaultConfig().(*Config), &testConnectionFactory{dbWrapper}) require.NoError(t, err) expectedMetrics, err := golden.ReadMetrics(fullExpectedMetricsPath) @@ -103,7 +103,7 @@ func TestDisabledMetrics(t *testing.T) { cfg.Metrics.SaphanaVolumeOperationSize.Enabled = false cfg.Metrics.SaphanaVolumeOperationTime.Enabled = false - sc, err := newSapHanaScraper(componenttest.NewNopReceiverCreateSettings(), cfg, &testConnectionFactory{dbWrapper}) + sc, err := newSapHanaScraper(receivertest.NewNopCreateSettings(), cfg, &testConnectionFactory{dbWrapper}) require.NoError(t, err) expectedMetrics, err := golden.ReadMetrics(partialExpectedMetricsPath) diff --git a/receiver/sapmreceiver/factory.go b/receiver/sapmreceiver/factory.go index 6226dc7645f93..bf90d5a0e8e34 100644 --- a/receiver/sapmreceiver/factory.go +++ b/receiver/sapmreceiver/factory.go @@ -26,6 +26,7 @@ import ( "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/consumer" + "go.opentelemetry.io/collector/receiver" ) const ( @@ -39,11 +40,11 @@ const ( ) // NewFactory creates a factory for SAPM receiver. -func NewFactory() component.ReceiverFactory { - return component.NewReceiverFactory( +func NewFactory() receiver.Factory { + return receiver.NewFactory( typeStr, createDefaultConfig, - component.WithTracesReceiver(createTracesReceiver, stability)) + receiver.WithTraces(createTracesReceiver, stability)) } func createDefaultConfig() component.Config { @@ -85,10 +86,10 @@ func (rCfg *Config) validate() error { // CreateTracesReceiver creates a trace receiver based on provided config. func createTracesReceiver( _ context.Context, - params component.ReceiverCreateSettings, + params receiver.CreateSettings, cfg component.Config, nextConsumer consumer.Traces, -) (component.TracesReceiver, error) { +) (receiver.Traces, error) { // assert config is SAPM config rCfg := cfg.(*Config) diff --git a/receiver/sapmreceiver/factory_test.go b/receiver/sapmreceiver/factory_test.go index 4788ef91cef24..4882358d86a83 100644 --- a/receiver/sapmreceiver/factory_test.go +++ b/receiver/sapmreceiver/factory_test.go @@ -21,6 +21,7 @@ import ( "github.com/stretchr/testify/assert" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" + "go.opentelemetry.io/collector/receiver/receivertest" ) func TestCreateDefaultConfig(t *testing.T) { @@ -34,7 +35,7 @@ func TestCreateReceiver(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() - params := componenttest.NewNopReceiverCreateSettings() + params := receivertest.NewNopCreateSettings() tReceiver, err := factory.CreateTracesReceiver(context.Background(), params, cfg, nil) assert.NoError(t, err, "receiver creation failed") assert.NotNil(t, tReceiver, "receiver creation failed") @@ -50,7 +51,7 @@ func TestCreateInvalidHTTPEndpoint(t *testing.T) { rCfg := cfg.(*Config) rCfg.Endpoint = "" - params := componenttest.NewNopReceiverCreateSettings() + params := receivertest.NewNopCreateSettings() _, err := factory.CreateTracesReceiver(context.Background(), params, cfg, nil) assert.Error(t, err, "receiver creation with no endpoints must fail") } @@ -61,7 +62,7 @@ func TestCreateNoPort(t *testing.T) { rCfg := cfg.(*Config) rCfg.Endpoint = "localhost:" - params := componenttest.NewNopReceiverCreateSettings() + params := receivertest.NewNopCreateSettings() _, err := factory.CreateTracesReceiver(context.Background(), params, cfg, nil) assert.Error(t, err, "receiver creation with no port number must fail") } @@ -72,7 +73,7 @@ func TestCreateLargePort(t *testing.T) { rCfg := cfg.(*Config) rCfg.Endpoint = "localhost:65536" - params := componenttest.NewNopReceiverCreateSettings() + params := receivertest.NewNopCreateSettings() _, err := factory.CreateTracesReceiver(context.Background(), params, cfg, nil) assert.Error(t, err, "receiver creation with too large port number must fail") } diff --git a/receiver/sapmreceiver/go.mod b/receiver/sapmreceiver/go.mod index d16d9f21dec66..1b364b86188e7 100644 --- a/receiver/sapmreceiver/go.mod +++ b/receiver/sapmreceiver/go.mod @@ -5,17 +5,17 @@ go 1.18 require ( github.com/gorilla/mux v1.8.0 github.com/jaegertracing/jaeger v1.39.1-0.20221110195127-14c11365a856 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/splunk v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.66.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/splunk v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.67.0 github.com/signalfx/sapm-proto v0.12.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector v0.67.0 + go.opentelemetry.io/collector/component v0.67.0 + go.opentelemetry.io/collector/confmap v0.67.0 + go.opentelemetry.io/collector/consumer v0.67.0 + go.opentelemetry.io/collector/pdata v1.0.0-rc1 + go.opentelemetry.io/collector/semconv v0.67.0 ) require ( @@ -36,14 +36,14 @@ require ( github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.66.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.67.0 // indirect github.com/opentracing/opentracing-go v1.2.0 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rs/cors v1.8.2 // indirect github.com/uber/jaeger-client-go v2.30.0+incompatible // indirect github.com/uber/jaeger-lib v2.4.1+incompatible // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/featuregate v0.67.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect diff --git a/receiver/sapmreceiver/go.sum b/receiver/sapmreceiver/go.sum index c5da515055a65..631b83ad07b76 100644 --- a/receiver/sapmreceiver/go.sum +++ b/receiver/sapmreceiver/go.sum @@ -300,20 +300,20 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 h1:Q5L9Urod3c8as6ZYaoaqBjarx/HXxsxy34DFZIU2fO4= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/component v0.67.0 h1:GCBRZAqk4yNaT4L1uwlbbwophFHrxYccLZ4Uj1Ifs/M= +go.opentelemetry.io/collector/component v0.67.0/go.mod h1:Txa2lm9oe7xsGQN8u7GdUIrRpAHFIKsTO4Qi3/CSmKk= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= +go.opentelemetry.io/collector/semconv v0.67.0 h1:zLAvcQa6Kgow52FFLrmk7/9ZVtEYyA73+xDtCcFG78Q= +go.opentelemetry.io/collector/semconv v0.67.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 h1:aUEBEdCa6iamGzg6fuYxDA8ThxvOG240mAvWDU+XLio= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4/go.mod h1:l2MdsbKTocpPS5nQZscqTR9jd8u96VYZdcpF8Sye7mA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= diff --git a/receiver/sapmreceiver/trace_receiver.go b/receiver/sapmreceiver/trace_receiver.go index b14514e796bc0..1c23c5c1d62b6 100644 --- a/receiver/sapmreceiver/trace_receiver.go +++ b/receiver/sapmreceiver/trace_receiver.go @@ -30,6 +30,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/obsreport" + "go.opentelemetry.io/collector/receiver" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/splunk" "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger" @@ -199,15 +200,15 @@ func (sr *sapmReceiver) Shutdown(context.Context) error { return err } -// this validates at compile time that sapmReceiver implements the component.TracesReceiver interface -var _ component.TracesReceiver = (*sapmReceiver)(nil) +// this validates at compile time that sapmReceiver implements the receiver.Traces interface +var _ receiver.Traces = (*sapmReceiver)(nil) // newReceiver creates a sapmReceiver that receives SAPM over http func newReceiver( - params component.ReceiverCreateSettings, + params receiver.CreateSettings, config *Config, nextConsumer consumer.Traces, -) (component.TracesReceiver, error) { +) (receiver.Traces, error) { // build the response message defaultResponse := &splunksapm.PostSpansResponse{} defaultResponseBytes, err := defaultResponse.Marshal() diff --git a/receiver/sapmreceiver/trace_receiver_test.go b/receiver/sapmreceiver/trace_receiver_test.go index 4756cd4731ca3..180b2f3cea7ac 100644 --- a/receiver/sapmreceiver/trace_receiver_test.go +++ b/receiver/sapmreceiver/trace_receiver_test.go @@ -36,6 +36,8 @@ import ( "go.opentelemetry.io/collector/consumer/consumertest" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/ptrace" + "go.opentelemetry.io/collector/receiver" + "go.opentelemetry.io/collector/receiver/receivertest" conventions "go.opentelemetry.io/collector/semconv/v1.6.1" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/common/testutil" @@ -205,8 +207,8 @@ func sendSapm(endpoint string, sapm *splunksapm.PostSpansRequest, zipped bool, t return resp, nil } -func setupReceiver(t *testing.T, config *Config, sink *consumertest.TracesSink) component.TracesReceiver { - params := componenttest.NewNopReceiverCreateSettings() +func setupReceiver(t *testing.T, config *Config, sink *consumertest.TracesSink) receiver.Traces { + params := receivertest.NewNopCreateSettings() sr, err := newReceiver(params, config, sink) assert.NoError(t, err, "should not have failed to create the SAPM receiver") t.Log("Starting") diff --git a/receiver/signalfxreceiver/factory.go b/receiver/signalfxreceiver/factory.go index 640b324fc7b78..70a858580ff6e 100644 --- a/receiver/signalfxreceiver/factory.go +++ b/receiver/signalfxreceiver/factory.go @@ -25,6 +25,7 @@ import ( "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/consumer" + "go.opentelemetry.io/collector/receiver" ) // This file implements factory for SignalFx receiver. @@ -40,12 +41,12 @@ const ( ) // NewFactory creates a factory for SignalFx receiver. -func NewFactory() component.ReceiverFactory { - return component.NewReceiverFactory( +func NewFactory() receiver.Factory { + return receiver.NewFactory( typeStr, createDefaultConfig, - component.WithMetricsReceiver(createMetricsReceiver, stability), - component.WithLogsReceiver(createLogsReceiver, stability)) + receiver.WithMetrics(createMetricsReceiver, stability), + receiver.WithLogs(createLogsReceiver, stability)) } func createDefaultConfig() component.Config { @@ -90,10 +91,10 @@ func (rCfg *Config) validate() error { // createMetricsReceiver creates a metrics receiver based on provided config. func createMetricsReceiver( _ context.Context, - params component.ReceiverCreateSettings, + params receiver.CreateSettings, cfg component.Config, consumer consumer.Metrics, -) (component.MetricsReceiver, error) { +) (receiver.Metrics, error) { rCfg := cfg.(*Config) err := rCfg.validate() @@ -120,10 +121,10 @@ func createMetricsReceiver( // createLogsReceiver creates a logs receiver based on provided config. func createLogsReceiver( _ context.Context, - params component.ReceiverCreateSettings, + params receiver.CreateSettings, cfg component.Config, consumer consumer.Logs, -) (component.LogsReceiver, error) { +) (receiver.Logs, error) { rCfg := cfg.(*Config) err := rCfg.validate() diff --git a/receiver/signalfxreceiver/factory_test.go b/receiver/signalfxreceiver/factory_test.go index 324d9a944935e..7c790da2a24d8 100644 --- a/receiver/signalfxreceiver/factory_test.go +++ b/receiver/signalfxreceiver/factory_test.go @@ -22,6 +22,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/consumer/consumertest" + "go.opentelemetry.io/collector/receiver/receivertest" ) func TestCreateDefaultConfig(t *testing.T) { @@ -36,15 +37,15 @@ func TestCreateReceiverMetricsFirst(t *testing.T) { cfg := factory.CreateDefaultConfig().(*Config) cfg.Endpoint = "localhost:1" // Endpoint is required, not going to be used here. - params := componenttest.NewNopReceiverCreateSettings() + params := receivertest.NewNopCreateSettings() mReceiver, err := factory.CreateMetricsReceiver(context.Background(), params, cfg, consumertest.NewNop()) assert.Nil(t, err, "receiver creation failed") assert.NotNil(t, mReceiver, "receiver creation failed") - _, err = factory.CreateTracesReceiver(context.Background(), componenttest.NewNopReceiverCreateSettings(), cfg, nil) + _, err = factory.CreateTracesReceiver(context.Background(), receivertest.NewNopCreateSettings(), cfg, nil) assert.ErrorIs(t, err, component.ErrDataTypeIsNotSupported) - lReceiver, err := factory.CreateLogsReceiver(context.Background(), componenttest.NewNopReceiverCreateSettings(), cfg, consumertest.NewNop()) + lReceiver, err := factory.CreateLogsReceiver(context.Background(), receivertest.NewNopCreateSettings(), cfg, consumertest.NewNop()) assert.Nil(t, err, "receiver creation failed") assert.NotNil(t, lReceiver, "receiver creation failed") @@ -56,11 +57,11 @@ func TestCreateReceiverLogsFirst(t *testing.T) { cfg := factory.CreateDefaultConfig().(*Config) cfg.Endpoint = "localhost:1" // Endpoint is required, not going to be used here. - lReceiver, err := factory.CreateLogsReceiver(context.Background(), componenttest.NewNopReceiverCreateSettings(), cfg, consumertest.NewNop()) + lReceiver, err := factory.CreateLogsReceiver(context.Background(), receivertest.NewNopCreateSettings(), cfg, consumertest.NewNop()) assert.Nil(t, err, "receiver creation failed") assert.NotNil(t, lReceiver, "receiver creation failed") - params := componenttest.NewNopReceiverCreateSettings() + params := receivertest.NewNopCreateSettings() mReceiver, err := factory.CreateMetricsReceiver(context.Background(), params, cfg, consumertest.NewNop()) assert.Nil(t, err, "receiver creation failed") assert.NotNil(t, mReceiver, "receiver creation failed") @@ -73,12 +74,12 @@ func TestCreateInvalidHTTPEndpoint(t *testing.T) { cfg := factory.CreateDefaultConfig().(*Config) cfg.Endpoint = "" - params := componenttest.NewNopReceiverCreateSettings() + params := receivertest.NewNopCreateSettings() tReceiver, err := factory.CreateMetricsReceiver(context.Background(), params, cfg, consumertest.NewNop()) assert.Error(t, err, "endpoint is not formatted correctly: missing port in address") assert.Nil(t, tReceiver) - tReceiver, err = factory.CreateLogsReceiver(context.Background(), componenttest.NewNopReceiverCreateSettings(), cfg, consumertest.NewNop()) + tReceiver, err = factory.CreateLogsReceiver(context.Background(), receivertest.NewNopCreateSettings(), cfg, consumertest.NewNop()) assert.Error(t, err, "endpoint is not formatted correctly: missing port in address") assert.Nil(t, tReceiver) } @@ -88,7 +89,7 @@ func TestCreateNoPort(t *testing.T) { cfg := factory.CreateDefaultConfig().(*Config) cfg.Endpoint = "localhost:" - params := componenttest.NewNopReceiverCreateSettings() + params := receivertest.NewNopCreateSettings() tReceiver, err := factory.CreateMetricsReceiver(context.Background(), params, cfg, consumertest.NewNop()) assert.Error(t, err, "endpoint port is not a number: strconv.ParseInt: parsing \"\": invalid syntax") assert.Nil(t, tReceiver) @@ -99,7 +100,7 @@ func TestCreateLargePort(t *testing.T) { cfg := factory.CreateDefaultConfig().(*Config) cfg.Endpoint = "localhost:65536" - params := componenttest.NewNopReceiverCreateSettings() + params := receivertest.NewNopCreateSettings() tReceiver, err := factory.CreateMetricsReceiver(context.Background(), params, cfg, consumertest.NewNop()) assert.Error(t, err, "port number must be between 1 and 65535") assert.Nil(t, tReceiver) diff --git a/receiver/signalfxreceiver/go.mod b/receiver/signalfxreceiver/go.mod index f7b06aae4b2e5..6a97b9705fcf9 100644 --- a/receiver/signalfxreceiver/go.mod +++ b/receiver/signalfxreceiver/go.mod @@ -4,19 +4,19 @@ go 1.18 require ( github.com/gorilla/mux v1.8.0 - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/signalfxexporter v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/splunk v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/signalfx v0.66.0 + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/signalfxexporter v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/splunk v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/signalfx v0.67.0 github.com/signalfx/com_signalfx_metrics_protobuf v0.0.3 github.com/stretchr/testify v1.8.1 go.opencensus.io v0.24.0 - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector v0.67.0 + go.opentelemetry.io/collector/component v0.67.0 + go.opentelemetry.io/collector/confmap v0.67.0 + go.opentelemetry.io/collector/consumer v0.67.0 + go.opentelemetry.io/collector/pdata v1.0.0-rc1 + go.opentelemetry.io/collector/semconv v0.67.0 go.uber.org/zap v1.24.0 ) @@ -46,9 +46,9 @@ 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/internal/coreinternal v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchperresourceattr v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/experimentalmetricmetadata v0.66.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchperresourceattr v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/experimentalmetricmetadata v0.67.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 @@ -63,7 +63,7 @@ require ( github.com/uber/jaeger-client-go v2.30.0+incompatible // indirect github.com/uber/jaeger-lib v2.4.1+incompatible // indirect github.com/yusufpapurcu/wmi v1.2.2 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/featuregate v0.67.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect diff --git a/receiver/signalfxreceiver/go.sum b/receiver/signalfxreceiver/go.sum index 8996df082d7e6..e8f5edee18b87 100644 --- a/receiver/signalfxreceiver/go.sum +++ b/receiver/signalfxreceiver/go.sum @@ -1232,45 +1232,32 @@ go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= go.opentelemetry.io/collector v0.52.0/go.mod h1:a9GvaOhyc0nVOUzqvdv5mxyWghCSso/WRO2GgRl4I1g= go.opentelemetry.io/collector v0.54.0/go.mod h1:FgNzyfb4sAGb5cqusB5znETJ8Pz4OQUBGbOeGIZ2rlQ= go.opentelemetry.io/collector v0.57.2/go.mod h1:9TwWyMRhbFNzaaGLtm/6poWNDJw+etvQMS6Fy+8/8Xs= -go.opentelemetry.io/collector v0.65.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/component v0.65.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/consumer v0.65.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/extension/zpagesextension v0.65.0/go.mod h1:+IPas7AeffG0GMIXhZr8IzpTNhH1Ri/6S/9YFqbLsmQ= -go.opentelemetry.io/collector/extension/zpagesextension v0.66.0/go.mod h1:+IPas7AeffG0GMIXhZr8IzpTNhH1Ri/6S/9YFqbLsmQ= -go.opentelemetry.io/collector/featuregate v0.65.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/component v0.67.0 h1:GCBRZAqk4yNaT4L1uwlbbwophFHrxYccLZ4Uj1Ifs/M= +go.opentelemetry.io/collector/component v0.67.0/go.mod h1:Txa2lm9oe7xsGQN8u7GdUIrRpAHFIKsTO4Qi3/CSmKk= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/extension/zpagesextension v0.67.0/go.mod h1:let/Bt3vTou1cVKhfv+z6FTSk3JaYV11z9C4O/PDPrA= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= go.opentelemetry.io/collector/model v0.49.0/go.mod h1:nOYQv9KoFPs6ihJwOi24qB209EOhS9HkwhGj54YiEAw= go.opentelemetry.io/collector/pdata v0.49.0/go.mod h1:YwmKuiFhNgtmhRdpi8Q8FAWPa0AwJTCSlssSsAtuRcY= go.opentelemetry.io/collector/pdata v0.52.0/go.mod h1:GJUTfTv8mlYpHRjcmHXVbvJr48EW/q/P/HuBvpXAE58= go.opentelemetry.io/collector/pdata v0.54.0/go.mod h1:1nSelv/YqGwdHHaIKNW9ZOHSMqicDX7W4/7TjNCm6N8= go.opentelemetry.io/collector/pdata v0.56.0/go.mod h1:mYcCREWiIJyHss0dbU+GSiz2tmGZ6u09vtfkKTciog4= go.opentelemetry.io/collector/pdata v0.57.2/go.mod h1:RU9I8lwBUxucwOsSYzHEcHi15M9QaX78hgQ2PRdSxV0= -go.opentelemetry.io/collector/pdata v0.65.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/processor/batchprocessor v0.65.0/go.mod h1:XhGTsC1B/bq4gpg8IZ/QYBLXkzE4Gw3r7Xu2+ik8A1Q= -go.opentelemetry.io/collector/processor/batchprocessor v0.66.0/go.mod h1:XhGTsC1B/bq4gpg8IZ/QYBLXkzE4Gw3r7Xu2+ik8A1Q= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= +go.opentelemetry.io/collector/processor/batchprocessor v0.67.0/go.mod h1:+ZXCkUG9tlwbbVLi+PT9DjQ7vz+lfFSQqvW45snLYno= go.opentelemetry.io/collector/semconv v0.52.0/go.mod h1:SxK0rUnUP7YeDakexzbE/vhimTOHwE6m/4aKKd9e27Q= go.opentelemetry.io/collector/semconv v0.54.0/go.mod h1:HAGkPKNMhc4kEHevEqVIEtUuvsRQMIbUWBb8yBrqEwk= go.opentelemetry.io/collector/semconv v0.56.0/go.mod h1:EH1wbDvTyqKpKBBpoMIe0KQk2plCcFS66Mo17WtR7CQ= go.opentelemetry.io/collector/semconv v0.57.2/go.mod h1:84YnUjmm+nhGu4YTDLnHCbxnL74ooWpismPG79tFD7w= -go.opentelemetry.io/collector/semconv v0.65.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= -go.opentelemetry.io/collector/semconv v0.66.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 h1:Q5L9Urod3c8as6ZYaoaqBjarx/HXxsxy34DFZIU2fO4= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector/semconv v0.67.0 h1:zLAvcQa6Kgow52FFLrmk7/9ZVtEYyA73+xDtCcFG78Q= +go.opentelemetry.io/collector/semconv v0.67.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.32.0/go.mod h1:J0dBVrt7dPS/lKJyQoW0xzQiUr4r2Ik1VwPjAUWnofI= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.33.0/go.mod h1:y/SlJpJQPd2UzfBCj0E9Flk9FDCtTyqUmaCB41qFrWI= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4/go.mod h1:05eWWy6ZWzmpeImD3UowLTB3VjDMU1yxQ+ENuVWDM3c= @@ -1337,7 +1324,6 @@ go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= go.uber.org/zap v1.19.1/go.mod h1:j3DNczoxDZroyBnOT1L/Q79cfUMGZxlv/9dzN7SM1rI= go.uber.org/zap v1.21.0/go.mod h1:wjWOCqI0f2ZZrJF/UufIOkiC8ii6tm1iqIsLo76RfJw= go.uber.org/zap v1.22.0/go.mod h1:H4siCOZOrAolnUPJEkfaSjDqyP+BDS0DdDWzwcgt3+U= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= diff --git a/receiver/signalfxreceiver/receiver.go b/receiver/signalfxreceiver/receiver.go index 9e12e8106c97f..0db900f312688 100644 --- a/receiver/signalfxreceiver/receiver.go +++ b/receiver/signalfxreceiver/receiver.go @@ -33,6 +33,7 @@ import ( "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/obsreport" "go.opentelemetry.io/collector/pdata/plog" + "go.opentelemetry.io/collector/receiver" conventions "go.opentelemetry.io/collector/semconv/v1.6.1" "go.uber.org/zap" @@ -78,9 +79,9 @@ var ( translator = &signalfx.ToTranslator{} ) -// sfxReceiver implements the component.MetricsReceiver for SignalFx metric protocol. +// sfxReceiver implements the receiver.Metrics for SignalFx metric protocol. type sfxReceiver struct { - settings component.ReceiverCreateSettings + settings receiver.CreateSettings config *Config metricsConsumer consumer.Metrics logsConsumer consumer.Logs @@ -89,11 +90,11 @@ type sfxReceiver struct { obsrecv *obsreport.Receiver } -var _ component.MetricsReceiver = (*sfxReceiver)(nil) +var _ receiver.Metrics = (*sfxReceiver)(nil) // New creates the SignalFx receiver with the given configuration. func newReceiver( - settings component.ReceiverCreateSettings, + settings receiver.CreateSettings, config Config, ) (*sfxReceiver, error) { transport := "http" diff --git a/receiver/signalfxreceiver/receiver_test.go b/receiver/signalfxreceiver/receiver_test.go index 2c5928d388292..10fb0c6b23155 100644 --- a/receiver/signalfxreceiver/receiver_test.go +++ b/receiver/signalfxreceiver/receiver_test.go @@ -40,8 +40,10 @@ import ( "go.opentelemetry.io/collector/config/configtls" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/consumer/consumertest" + "go.opentelemetry.io/collector/exporter/exportertest" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" + "go.opentelemetry.io/collector/receiver/receivertest" "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/signalfxexporter" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/common/testutil" @@ -86,7 +88,7 @@ func Test_signalfxeceiver_New(t *testing.T) { } for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { - got, err := newReceiver(componenttest.NewNopReceiverCreateSettings(), tt.args.config) + got, err := newReceiver(receivertest.NewNopCreateSettings(), tt.args.config) require.NoError(t, err) if tt.args.nextConsumer != nil { got.RegisterMetricsConsumer(tt.args.nextConsumer) @@ -102,7 +104,7 @@ func Test_signalfxeceiver_EndToEnd(t *testing.T) { cfg := createDefaultConfig().(*Config) cfg.Endpoint = addr sink := new(consumertest.MetricsSink) - r, err := newReceiver(componenttest.NewNopReceiverCreateSettings(), *cfg) + r, err := newReceiver(receivertest.NewNopCreateSettings(), *cfg) require.NoError(t, err) r.RegisterMetricsConsumer(sink) @@ -164,7 +166,7 @@ func Test_signalfxeceiver_EndToEnd(t *testing.T) { } exp, err := signalfxexporter.NewFactory().CreateMetricsExporter( context.Background(), - componenttest.NewNopExporterCreateSettings(), + exportertest.NewNopCreateSettings(), expCfg) require.NoError(t, err) require.NoError(t, exp.Start(context.Background(), componenttest.NewNopHost())) @@ -343,7 +345,7 @@ func Test_sfxReceiver_handleReq(t *testing.T) { for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { sink := new(consumertest.MetricsSink) - rcv, err := newReceiver(componenttest.NewNopReceiverCreateSettings(), *config) + rcv, err := newReceiver(receivertest.NewNopCreateSettings(), *config) require.NoError(t, err) if !tt.skipRegistration { rcv.RegisterMetricsConsumer(sink) @@ -519,7 +521,7 @@ func Test_sfxReceiver_handleEventReq(t *testing.T) { for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { sink := new(consumertest.LogsSink) - rcv, err := newReceiver(componenttest.NewNopReceiverCreateSettings(), *config) + rcv, err := newReceiver(receivertest.NewNopCreateSettings(), *config) require.NoError(t, err) if !tt.skipRegistration { rcv.RegisterLogsConsumer(sink) @@ -551,7 +553,7 @@ func Test_sfxReceiver_TLS(t *testing.T) { }, } sink := new(consumertest.MetricsSink) - r, err := newReceiver(componenttest.NewNopReceiverCreateSettings(), *cfg) + r, err := newReceiver(receivertest.NewNopCreateSettings(), *cfg) require.NoError(t, err) r.RegisterMetricsConsumer(sink) defer func() { @@ -656,7 +658,7 @@ func Test_sfxReceiver_DatapointAccessTokenPassthrough(t *testing.T) { config.AccessTokenPassthrough = tt.passthrough sink := new(consumertest.MetricsSink) - rcv, err := newReceiver(componenttest.NewNopReceiverCreateSettings(), *config) + rcv, err := newReceiver(receivertest.NewNopCreateSettings(), *config) require.NoError(t, err) rcv.RegisterMetricsConsumer(sink) @@ -734,7 +736,7 @@ func Test_sfxReceiver_EventAccessTokenPassthrough(t *testing.T) { config.AccessTokenPassthrough = tt.passthrough sink := new(consumertest.LogsSink) - rcv, err := newReceiver(componenttest.NewNopReceiverCreateSettings(), *config) + rcv, err := newReceiver(receivertest.NewNopCreateSettings(), *config) require.NoError(t, err) rcv.RegisterLogsConsumer(sink) diff --git a/receiver/simpleprometheusreceiver/factory.go b/receiver/simpleprometheusreceiver/factory.go index 4df18749d9984..c95d7fef89902 100644 --- a/receiver/simpleprometheusreceiver/factory.go +++ b/receiver/simpleprometheusreceiver/factory.go @@ -23,6 +23,7 @@ import ( "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/config/configtls" "go.opentelemetry.io/collector/consumer" + "go.opentelemetry.io/collector/receiver" ) // This file implements factory for prometheus_simple receiver @@ -39,11 +40,11 @@ const ( var defaultCollectionInterval = 10 * time.Second // NewFactory creates a factory for "Simple" Prometheus receiver. -func NewFactory() component.ReceiverFactory { - return component.NewReceiverFactory( +func NewFactory() receiver.Factory { + return receiver.NewFactory( typeStr, createDefaultConfig, - component.WithMetricsReceiver(createMetricsReceiver, stability)) + receiver.WithMetrics(createMetricsReceiver, stability)) } func createDefaultConfig() component.Config { @@ -62,10 +63,10 @@ func createDefaultConfig() component.Config { func createMetricsReceiver( _ context.Context, - params component.ReceiverCreateSettings, + params receiver.CreateSettings, cfg component.Config, nextConsumer consumer.Metrics, -) (component.MetricsReceiver, error) { +) (receiver.Metrics, error) { rCfg := cfg.(*Config) return new(params, rCfg, nextConsumer), nil } diff --git a/receiver/simpleprometheusreceiver/factory_test.go b/receiver/simpleprometheusreceiver/factory_test.go index a523289677a97..6e1f49adec6c9 100644 --- a/receiver/simpleprometheusreceiver/factory_test.go +++ b/receiver/simpleprometheusreceiver/factory_test.go @@ -19,8 +19,8 @@ import ( "testing" "github.com/stretchr/testify/require" - "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/consumer/consumertest" + "go.opentelemetry.io/collector/receiver/receivertest" ) func TestFactory(t *testing.T) { @@ -30,7 +30,7 @@ func TestFactory(t *testing.T) { r, err := f.CreateMetricsReceiver( context.Background(), - componenttest.NewNopReceiverCreateSettings(), + receivertest.NewNopCreateSettings(), cfg, consumertest.NewNop(), ) diff --git a/receiver/simpleprometheusreceiver/go.mod b/receiver/simpleprometheusreceiver/go.mod index 2e572050e8d3c..13f308de6178a 100644 --- a/receiver/simpleprometheusreceiver/go.mod +++ b/receiver/simpleprometheusreceiver/go.mod @@ -3,14 +3,14 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/receiver/simple go 1.18 require ( - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.66.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.67.0 github.com/prometheus/common v0.37.0 github.com/prometheus/prometheus v0.40.5 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector v0.67.0 + go.opentelemetry.io/collector/component v0.67.0 + go.opentelemetry.io/collector/confmap v0.67.0 + go.opentelemetry.io/collector/consumer v0.67.0 k8s.io/client-go v0.25.4 ) @@ -107,7 +107,7 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheus v0.66.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheus v0.67.0 // indirect github.com/opencontainers/go-digest v1.0.0 // indirect github.com/opencontainers/image-spec v1.0.2 // indirect github.com/ovh/go-ovh v1.1.0 // indirect @@ -123,9 +123,9 @@ require ( github.com/spf13/pflag v1.0.5 // indirect github.com/vultr/govultr/v2 v2.17.2 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 // indirect - go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/featuregate v0.67.0 // indirect + go.opentelemetry.io/collector/pdata v1.0.0-rc1 // indirect + go.opentelemetry.io/collector/semconv v0.67.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect diff --git a/receiver/simpleprometheusreceiver/go.sum b/receiver/simpleprometheusreceiver/go.sum index 634ae0d325069..6b188b7472b7c 100644 --- a/receiver/simpleprometheusreceiver/go.sum +++ b/receiver/simpleprometheusreceiver/go.sum @@ -644,21 +644,21 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221202005155-1c54042beb70 h1:Y4e8NnVevonnAgmjX9Z7QIMA32yMqHAOnAlh8SzTS8c= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 h1:Q5L9Urod3c8as6ZYaoaqBjarx/HXxsxy34DFZIU2fO4= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/component v0.67.0 h1:GCBRZAqk4yNaT4L1uwlbbwophFHrxYccLZ4Uj1Ifs/M= +go.opentelemetry.io/collector/component v0.67.0/go.mod h1:Txa2lm9oe7xsGQN8u7GdUIrRpAHFIKsTO4Qi3/CSmKk= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= +go.opentelemetry.io/collector/processor/batchprocessor v0.67.0 h1:Qn4Ytth3q1trwTSAYYTzIRs4SBh9rz0xBou1nZB+Dko= +go.opentelemetry.io/collector/semconv v0.67.0 h1:zLAvcQa6Kgow52FFLrmk7/9ZVtEYyA73+xDtCcFG78Q= +go.opentelemetry.io/collector/semconv v0.67.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 h1:aUEBEdCa6iamGzg6fuYxDA8ThxvOG240mAvWDU+XLio= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4/go.mod h1:l2MdsbKTocpPS5nQZscqTR9jd8u96VYZdcpF8Sye7mA= go.opentelemetry.io/contrib/propagators/b3 v1.11.1 h1:icQ6ttRV+r/2fnU46BIo/g/mPu6Rs5Ug8Rtohe3KqzI= diff --git a/receiver/simpleprometheusreceiver/receiver.go b/receiver/simpleprometheusreceiver/receiver.go index e6d6a82a72ae0..60d62ca340778 100644 --- a/receiver/simpleprometheusreceiver/receiver.go +++ b/receiver/simpleprometheusreceiver/receiver.go @@ -26,20 +26,21 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config/configtls" "go.opentelemetry.io/collector/consumer" + "go.opentelemetry.io/collector/receiver" "k8s.io/client-go/rest" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver" ) type prometheusReceiverWrapper struct { - params component.ReceiverCreateSettings + params receiver.CreateSettings config *Config consumer consumer.Metrics - prometheusRecever component.MetricsReceiver + prometheusRecever receiver.Metrics } // new returns a prometheusReceiverWrapper -func new(params component.ReceiverCreateSettings, cfg *Config, consumer consumer.Metrics) *prometheusReceiverWrapper { +func new(params receiver.CreateSettings, cfg *Config, consumer consumer.Metrics) *prometheusReceiverWrapper { return &prometheusReceiverWrapper{params: params, config: cfg, consumer: consumer} } @@ -62,7 +63,7 @@ func (prw *prometheusReceiverWrapper) Start(ctx context.Context, host component. } // Deprecated: [v0.55.0] Use getPrometheusConfig instead. -func getPrometheusConfigWrapper(cfg *Config, params component.ReceiverCreateSettings) (*prometheusreceiver.Config, error) { +func getPrometheusConfigWrapper(cfg *Config, params receiver.CreateSettings) (*prometheusreceiver.Config, error) { if cfg.TLSEnabled { params.Logger.Warn("the `tls_config` and 'tls_enabled' settings are deprecated, please use `tls` instead") cfg.HTTPClientSettings.TLSSetting = configtls.TLSClientSetting{ diff --git a/receiver/simpleprometheusreceiver/receiver_test.go b/receiver/simpleprometheusreceiver/receiver_test.go index 05984fb96d705..a84c9721d0ebc 100644 --- a/receiver/simpleprometheusreceiver/receiver_test.go +++ b/receiver/simpleprometheusreceiver/receiver_test.go @@ -30,6 +30,7 @@ import ( "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/config/configtls" "go.opentelemetry.io/collector/consumer/consumertest" + "go.opentelemetry.io/collector/receiver/receivertest" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver" ) @@ -57,7 +58,7 @@ func TestReceiver(t *testing.T) { r, err := f.CreateMetricsReceiver( context.Background(), - componenttest.NewNopReceiverCreateSettings(), + receivertest.NewNopCreateSettings(), cfg, consumertest.NewNop(), ) @@ -411,7 +412,7 @@ func TestGetPrometheusConfigWrapper(t *testing.T) { } for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { - got, err := getPrometheusConfigWrapper(tt.config, componenttest.NewNopReceiverCreateSettings()) + got, err := getPrometheusConfigWrapper(tt.config, receivertest.NewNopCreateSettings()) if (err != nil) != tt.wantErr { t.Errorf("getPrometheusConfigWrapper() error = %v, wantErr %v", err, tt.wantErr) return diff --git a/receiver/skywalkingreceiver/factory.go b/receiver/skywalkingreceiver/factory.go index 68e021752d3b9..ded7ce62ed4ab 100644 --- a/receiver/skywalkingreceiver/factory.go +++ b/receiver/skywalkingreceiver/factory.go @@ -28,6 +28,7 @@ import ( "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/config/confignet" "go.opentelemetry.io/collector/consumer" + "go.opentelemetry.io/collector/receiver" ) const ( @@ -44,11 +45,11 @@ const ( ) // NewFactory creates a new Skywalking receiver factory. -func NewFactory() component.ReceiverFactory { - return component.NewReceiverFactory( +func NewFactory() receiver.Factory { + return receiver.NewFactory( typeStr, createDefaultConfig, - component.WithTracesReceiver(createTracesReceiver, stability)) + receiver.WithTraces(createTracesReceiver, stability)) } // CreateDefaultConfig creates the default configuration for Skywalking receiver. @@ -72,10 +73,10 @@ func createDefaultConfig() component.Config { // createTracesReceiver creates a trace receiver based on provided config. func createTracesReceiver( _ context.Context, - set component.ReceiverCreateSettings, + set receiver.CreateSettings, cfg component.Config, nextConsumer consumer.Traces, -) (component.TracesReceiver, error) { +) (receiver.Traces, error) { // Convert settings in the source c to configuration struct // that Skywalking receiver understands. diff --git a/receiver/skywalkingreceiver/factory_test.go b/receiver/skywalkingreceiver/factory_test.go index 220f4c18b1704..776c0e14d9719 100644 --- a/receiver/skywalkingreceiver/factory_test.go +++ b/receiver/skywalkingreceiver/factory_test.go @@ -28,6 +28,7 @@ import ( "go.opentelemetry.io/collector/config/confignet" "go.opentelemetry.io/collector/config/configtls" "go.opentelemetry.io/collector/confmap/confmaptest" + "go.opentelemetry.io/collector/receiver/receivertest" ) func TestTypeStr(t *testing.T) { @@ -53,7 +54,7 @@ func TestCreateReceiver(t *testing.T) { Transport: "tcp", }, } - set := componenttest.NewNopReceiverCreateSettings() + set := receivertest.NewNopCreateSettings() tReceiver, err := factory.CreateTracesReceiver(context.Background(), set, cfg, nil) assert.NoError(t, err, "receiver creation failed") assert.NotNil(t, tReceiver, "receiver creation failed") @@ -73,7 +74,7 @@ func TestCreateReceiverGeneralConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, component.UnmarshalConfig(sub, cfg)) - set := componenttest.NewNopReceiverCreateSettings() + set := receivertest.NewNopCreateSettings() tReceiver, err := factory.CreateTracesReceiver(context.Background(), set, cfg, nil) assert.NoError(t, err, "receiver creation failed") assert.NotNil(t, tReceiver, "receiver creation failed") @@ -93,7 +94,7 @@ func TestCreateDefaultGRPCEndpoint(t *testing.T) { Transport: "tcp", }, } - set := componenttest.NewNopReceiverCreateSettings() + set := receivertest.NewNopCreateSettings() r, err := factory.CreateTracesReceiver(context.Background(), set, cfg, nil) assert.NoError(t, err, "unexpected error creating receiver") @@ -116,7 +117,7 @@ func TestCreateTLSGPRCEndpoint(t *testing.T) { }, }, } - set := componenttest.NewNopReceiverCreateSettings() + set := receivertest.NewNopCreateSettings() _, err := factory.CreateTracesReceiver(context.Background(), set, cfg, nil) assert.NoError(t, err, "tls-enabled receiver creation failed") @@ -136,7 +137,7 @@ func TestCreateTLSHTTPEndpoint(t *testing.T) { }, } - set := componenttest.NewNopReceiverCreateSettings() + set := receivertest.NewNopCreateSettings() _, err := factory.CreateTracesReceiver(context.Background(), set, cfg, nil) assert.NoError(t, err, "tls-enabled receiver creation failed") @@ -149,7 +150,7 @@ func TestCreateInvalidHTTPEndpoint(t *testing.T) { cfg.(*Config).Protocols.HTTP = &confighttp.HTTPServerSettings{ Endpoint: defaultHTTPBindEndpoint, } - set := componenttest.NewNopReceiverCreateSettings() + set := receivertest.NewNopCreateSettings() r, err := factory.CreateTracesReceiver(context.Background(), set, cfg, nil) assert.NoError(t, err, "unexpected error creating receiver") diff --git a/receiver/skywalkingreceiver/go.mod b/receiver/skywalkingreceiver/go.mod index a2c5a41c7621e..0416ad6846852 100644 --- a/receiver/skywalkingreceiver/go.mod +++ b/receiver/skywalkingreceiver/go.mod @@ -6,12 +6,12 @@ require ( github.com/google/uuid v1.3.0 github.com/gorilla/mux v1.8.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector v0.67.0 + go.opentelemetry.io/collector/component v0.67.0 + go.opentelemetry.io/collector/confmap v0.67.0 + go.opentelemetry.io/collector/consumer v0.67.0 + go.opentelemetry.io/collector/pdata v1.0.0-rc1 + go.opentelemetry.io/collector/semconv v0.67.0 go.uber.org/multierr v1.8.0 google.golang.org/grpc v1.51.0 google.golang.org/protobuf v1.28.1 @@ -41,7 +41,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rs/cors v1.8.2 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/featuregate v0.67.0 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 // indirect go.opentelemetry.io/otel v1.11.1 // indirect diff --git a/receiver/skywalkingreceiver/go.sum b/receiver/skywalkingreceiver/go.sum index c3937136bb0bc..beafdeaa4f84a 100644 --- a/receiver/skywalkingreceiver/go.sum +++ b/receiver/skywalkingreceiver/go.sum @@ -418,20 +418,20 @@ go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 h1:Q5L9Urod3c8as6ZYaoaqBjarx/HXxsxy34DFZIU2fO4= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/component v0.67.0 h1:GCBRZAqk4yNaT4L1uwlbbwophFHrxYccLZ4Uj1Ifs/M= +go.opentelemetry.io/collector/component v0.67.0/go.mod h1:Txa2lm9oe7xsGQN8u7GdUIrRpAHFIKsTO4Qi3/CSmKk= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= +go.opentelemetry.io/collector/semconv v0.67.0 h1:zLAvcQa6Kgow52FFLrmk7/9ZVtEYyA73+xDtCcFG78Q= +go.opentelemetry.io/collector/semconv v0.67.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4 h1:PRXhsszxTt5bbPriTjmaweWUsAnJYeWBhUMLRetUgBU= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4/go.mod h1:05eWWy6ZWzmpeImD3UowLTB3VjDMU1yxQ+ENuVWDM3c= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 h1:aUEBEdCa6iamGzg6fuYxDA8ThxvOG240mAvWDU+XLio= diff --git a/receiver/skywalkingreceiver/trace_receiver.go b/receiver/skywalkingreceiver/trace_receiver.go index 6fd93a88e1aef..0acd9e35f9d3b 100644 --- a/receiver/skywalkingreceiver/trace_receiver.go +++ b/receiver/skywalkingreceiver/trace_receiver.go @@ -30,6 +30,7 @@ import ( "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/obsreport" + "go.opentelemetry.io/collector/receiver" "go.uber.org/multierr" "google.golang.org/grpc" cds "skywalking.apache.org/repo/goapi/collect/agent/configuration/v3" @@ -60,7 +61,7 @@ type swReceiver struct { goroutines sync.WaitGroup - settings component.ReceiverCreateSettings + settings receiver.CreateSettings grpcObsrecv *obsreport.Receiver httpObsrecv *obsreport.Receiver @@ -78,7 +79,7 @@ const ( func newSkywalkingReceiver( config *configuration, nextConsumer consumer.Traces, - set component.ReceiverCreateSettings, + set receiver.CreateSettings, ) (*swReceiver, error) { grpcObsrecv, err := obsreport.NewReceiver(obsreport.ReceiverSettings{ diff --git a/receiver/skywalkingreceiver/trace_receiver_test.go b/receiver/skywalkingreceiver/trace_receiver_test.go index f8ef31449dc71..fc338a851045e 100644 --- a/receiver/skywalkingreceiver/trace_receiver_test.go +++ b/receiver/skywalkingreceiver/trace_receiver_test.go @@ -27,6 +27,7 @@ import ( "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/consumer/consumertest" + "go.opentelemetry.io/collector/receiver/receivertest" "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" common "skywalking.apache.org/repo/goapi/collect/common/v3" @@ -38,7 +39,7 @@ var ( ) func TestTraceSource(t *testing.T) { - set := componenttest.NewNopReceiverCreateSettings() + set := receivertest.NewNopCreateSettings() set.ID = skywalkingReceiver jr, err := newSkywalkingReceiver(&configuration{}, nil, set) require.NoError(t, err) @@ -55,7 +56,7 @@ func TestStartAndShutdown(t *testing.T) { } sink := new(consumertest.TracesSink) - set := componenttest.NewNopReceiverCreateSettings() + set := receivertest.NewNopCreateSettings() set.ID = skywalkingReceiver sr, err := newSkywalkingReceiver(config, sink, set) require.NoError(t, err) @@ -72,7 +73,7 @@ func TestGRPCReception(t *testing.T) { sink := new(consumertest.TracesSink) - set := componenttest.NewNopReceiverCreateSettings() + set := receivertest.NewNopCreateSettings() set.ID = skywalkingReceiver swReceiver, err := newSkywalkingReceiver(config, sink, set) require.NoError(t, err) diff --git a/receiver/snmpreceiver/factory.go b/receiver/snmpreceiver/factory.go index fd30dffee8d5a..819c942e77ea5 100644 --- a/receiver/snmpreceiver/factory.go +++ b/receiver/snmpreceiver/factory.go @@ -24,6 +24,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer" + "go.opentelemetry.io/collector/receiver" "go.opentelemetry.io/collector/receiver/scraperhelper" ) @@ -35,11 +36,11 @@ const ( var errConfigNotSNMP = errors.New("config was not a SNMP receiver config") // NewFactory creates a new receiver factory for SNMP -func NewFactory() component.ReceiverFactory { - return component.NewReceiverFactory( +func NewFactory() receiver.Factory { + return receiver.NewFactory( typeStr, createDefaultConfig, - component.WithMetricsReceiver(createMetricsReceiver, stability)) + receiver.WithMetrics(createMetricsReceiver, stability)) } // createDefaultConfig creates a config for SNMP with as many default values as possible @@ -61,10 +62,10 @@ func createDefaultConfig() component.Config { // createMetricsReceiver creates the metric receiver for SNMP func createMetricsReceiver( _ context.Context, - params component.ReceiverCreateSettings, + params receiver.CreateSettings, config component.Config, consumer consumer.Metrics, -) (component.MetricsReceiver, error) { +) (receiver.Metrics, error) { snmpConfig, ok := config.(*Config) if !ok { return nil, errConfigNotSNMP diff --git a/receiver/snmpreceiver/factory_test.go b/receiver/snmpreceiver/factory_test.go index ba0475f66cfe6..7218533eea0d8 100644 --- a/receiver/snmpreceiver/factory_test.go +++ b/receiver/snmpreceiver/factory_test.go @@ -20,9 +20,9 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer/consumertest" + "go.opentelemetry.io/collector/receiver/receivertest" "go.opentelemetry.io/collector/receiver/scraperhelper" ) @@ -76,7 +76,7 @@ func TestNewFactory(t *testing.T) { } _, err := factory.CreateMetricsReceiver( context.Background(), - componenttest.NewNopReceiverCreateSettings(), + receivertest.NewNopCreateSettings(), cfg, consumertest.NewNop(), ) @@ -89,7 +89,7 @@ func TestNewFactory(t *testing.T) { factory := NewFactory() _, err := factory.CreateMetricsReceiver( context.Background(), - componenttest.NewNopReceiverCreateSettings(), + receivertest.NewNopCreateSettings(), nil, consumertest.NewNop(), ) @@ -114,7 +114,7 @@ func TestNewFactory(t *testing.T) { } _, err := factory.CreateMetricsReceiver( context.Background(), - componenttest.NewNopReceiverCreateSettings(), + receivertest.NewNopCreateSettings(), cfg, consumertest.NewNop(), ) @@ -140,7 +140,7 @@ func TestNewFactory(t *testing.T) { } _, err := factory.CreateMetricsReceiver( context.Background(), - componenttest.NewNopReceiverCreateSettings(), + receivertest.NewNopCreateSettings(), cfg, consumertest.NewNop(), ) @@ -166,7 +166,7 @@ func TestNewFactory(t *testing.T) { } _, err := factory.CreateMetricsReceiver( context.Background(), - componenttest.NewNopReceiverCreateSettings(), + receivertest.NewNopCreateSettings(), cfg, consumertest.NewNop(), ) @@ -190,7 +190,7 @@ func TestNewFactory(t *testing.T) { } _, err := factory.CreateMetricsReceiver( context.Background(), - componenttest.NewNopReceiverCreateSettings(), + receivertest.NewNopCreateSettings(), cfg, consumertest.NewNop(), ) @@ -214,7 +214,7 @@ func TestNewFactory(t *testing.T) { } _, err := factory.CreateMetricsReceiver( context.Background(), - componenttest.NewNopReceiverCreateSettings(), + receivertest.NewNopCreateSettings(), cfg, consumertest.NewNop(), ) @@ -238,7 +238,7 @@ func TestNewFactory(t *testing.T) { } _, err := factory.CreateMetricsReceiver( context.Background(), - componenttest.NewNopReceiverCreateSettings(), + receivertest.NewNopCreateSettings(), cfg, consumertest.NewNop(), ) @@ -262,7 +262,7 @@ func TestNewFactory(t *testing.T) { } _, err := factory.CreateMetricsReceiver( context.Background(), - componenttest.NewNopReceiverCreateSettings(), + receivertest.NewNopCreateSettings(), cfg, consumertest.NewNop(), ) diff --git a/receiver/snmpreceiver/go.mod b/receiver/snmpreceiver/go.mod index b7c39e5b3b687..a3d6a1603c21f 100644 --- a/receiver/snmpreceiver/go.mod +++ b/receiver/snmpreceiver/go.mod @@ -4,14 +4,14 @@ go 1.18 require ( github.com/gosnmp/gosnmp v1.35.0 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest v0.66.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest v0.67.0 github.com/stretchr/testify v1.8.1 github.com/testcontainers/testcontainers-go v0.15.0 - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector v0.67.0 + go.opentelemetry.io/collector/component v0.67.0 + go.opentelemetry.io/collector/confmap v0.67.0 + go.opentelemetry.io/collector/consumer v0.67.0 + go.opentelemetry.io/collector/pdata v1.0.0-rc1 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.24.0 ) @@ -75,9 +75,9 @@ require ( github.com/tklauser/numcpus v0.6.0 // indirect github.com/yusufpapurcu/wmi v1.2.2 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect - go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221202005155-1c54042beb70 // indirect - go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/featuregate v0.67.0 // indirect + go.opentelemetry.io/collector/processor/batchprocessor v0.67.0 // indirect + go.opentelemetry.io/collector/semconv v0.67.0 // indirect go.opentelemetry.io/contrib/propagators/b3 v1.11.1 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.33.0 // indirect diff --git a/receiver/snmpreceiver/go.sum b/receiver/snmpreceiver/go.sum index 4fc17deaa6be3..2ba1097885148 100644 --- a/receiver/snmpreceiver/go.sum +++ b/receiver/snmpreceiver/go.sum @@ -881,23 +881,23 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/extension/zpagesextension v0.66.0 h1:tPqSKH5K3VhTT0XXVoWL3woWBSTJqnXZQRt0ZLSCoCc= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221202005155-1c54042beb70 h1:Y4e8NnVevonnAgmjX9Z7QIMA32yMqHAOnAlh8SzTS8c= -go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:Pi1CsKDQFoDrUP1i3+VdE6s2Xuji7bOGFBgqHK0J32E= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 h1:Q5L9Urod3c8as6ZYaoaqBjarx/HXxsxy34DFZIU2fO4= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/component v0.67.0 h1:GCBRZAqk4yNaT4L1uwlbbwophFHrxYccLZ4Uj1Ifs/M= +go.opentelemetry.io/collector/component v0.67.0/go.mod h1:Txa2lm9oe7xsGQN8u7GdUIrRpAHFIKsTO4Qi3/CSmKk= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/extension/zpagesextension v0.67.0 h1:TRW8vZwE+/h2vJqqMDmyQO9X0sxcYCSXf5MyXozSLas= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= +go.opentelemetry.io/collector/processor/batchprocessor v0.67.0 h1:Qn4Ytth3q1trwTSAYYTzIRs4SBh9rz0xBou1nZB+Dko= +go.opentelemetry.io/collector/processor/batchprocessor v0.67.0/go.mod h1:+ZXCkUG9tlwbbVLi+PT9DjQ7vz+lfFSQqvW45snLYno= +go.opentelemetry.io/collector/semconv v0.67.0 h1:zLAvcQa6Kgow52FFLrmk7/9ZVtEYyA73+xDtCcFG78Q= +go.opentelemetry.io/collector/semconv v0.67.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/contrib/propagators/b3 v1.11.1 h1:icQ6ttRV+r/2fnU46BIo/g/mPu6Rs5Ug8Rtohe3KqzI= go.opentelemetry.io/contrib/propagators/b3 v1.11.1/go.mod h1:ECIveyMXgnl4gorxFcA7RYjJY/Ql9n20ubhbfDc3QfA= go.opentelemetry.io/contrib/zpages v0.36.4 h1:Z2VK5WsDhWs9VwZ1p0TM5RyusTOgAQfdMMDDQPRnlmY= diff --git a/receiver/snmpreceiver/integration_test.go b/receiver/snmpreceiver/integration_test.go index 91f0cd818b049..97d267e419b19 100644 --- a/receiver/snmpreceiver/integration_test.go +++ b/receiver/snmpreceiver/integration_test.go @@ -28,7 +28,8 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/consumer/consumertest" - "go.opentelemetry.io/collector/service/servicetest" + "go.opentelemetry.io/collector/otelcol/otelcoltest" + "go.opentelemetry.io/collector/receiver/receivertest" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest/golden" @@ -67,11 +68,11 @@ func TestSnmpReceiverIntegration(t *testing.T) { factory := NewFactory() factories.Receivers[typeStr] = factory configFile := filepath.Join("testdata", "integration", testCase.configFilename) - cfg, err := servicetest.LoadConfigAndValidate(configFile, factories) + cfg, err := otelcoltest.LoadConfigAndValidate(configFile, factories) snmpConfig := cfg.Receivers[component.NewID(typeStr)].(*Config) consumer := new(consumertest.MetricsSink) - settings := componenttest.NewNopReceiverCreateSettings() + settings := receivertest.NewNopCreateSettings() rcvr, err := factory.CreateMetricsReceiver(context.Background(), settings, snmpConfig, consumer) require.NoError(t, err, "failed creating metrics receiver") require.NoError(t, rcvr.Start(context.Background(), componenttest.NewNopHost())) diff --git a/receiver/snmpreceiver/otel_metric_helper.go b/receiver/snmpreceiver/otel_metric_helper.go index 3292e55b350b1..1986edf53469d 100644 --- a/receiver/snmpreceiver/otel_metric_helper.go +++ b/receiver/snmpreceiver/otel_metric_helper.go @@ -20,9 +20,9 @@ import ( "strings" "time" - "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" + "go.opentelemetry.io/collector/receiver" ) // generalResourceKey is the resource key for the no general "no attribute" resource @@ -89,11 +89,11 @@ type otelMetricHelper struct { // This is the timestamp that should be added to all created data points dataPointTime pcommon.Timestamp // This is used so that we can put the proper version on the scope metrics - settings component.ReceiverCreateSettings + settings receiver.CreateSettings } // newOtelMetricHelper returns a new otelMetricHelper with an initialized master Metrics -func newOTELMetricHelper(settings component.ReceiverCreateSettings) *otelMetricHelper { +func newOTELMetricHelper(settings receiver.CreateSettings) *otelMetricHelper { metrics := pmetric.NewMetrics() omh := otelMetricHelper{ metrics: metrics, diff --git a/receiver/snmpreceiver/otel_metric_helper_test.go b/receiver/snmpreceiver/otel_metric_helper_test.go index 22888f300f7a4..38a46c5392ffe 100644 --- a/receiver/snmpreceiver/otel_metric_helper_test.go +++ b/receiver/snmpreceiver/otel_metric_helper_test.go @@ -19,8 +19,8 @@ import ( // client is an autogenerated mock type for the client type "github.com/stretchr/testify/require" - "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/pdata/pmetric" + "go.opentelemetry.io/collector/receiver" ) func TestGetResourceKey(t *testing.T) { @@ -59,7 +59,7 @@ func TestNewOTELMetricHelper(t *testing.T) { { desc: "Returns a good otelMetricHelper", testFunc: func(t *testing.T) { - settings := component.ReceiverCreateSettings{} + settings := receiver.CreateSettings{} helper := newOTELMetricHelper(settings) require.NotNil(t, helper) require.NotNil(t, helper.metrics) @@ -83,7 +83,7 @@ func TestGetResource(t *testing.T) { { desc: "Returns nil when resource not yet created", testFunc: func(t *testing.T) { - settings := component.ReceiverCreateSettings{} + settings := receiver.CreateSettings{} helper := newOTELMetricHelper(settings) actual := helper.getResource("r1") require.Nil(t, actual) @@ -92,7 +92,7 @@ func TestGetResource(t *testing.T) { { desc: "Returns resource when already created", testFunc: func(t *testing.T) { - settings := component.ReceiverCreateSettings{} + settings := receiver.CreateSettings{} helper := newOTELMetricHelper(settings) resource := helper.resourceMetricsSlice.AppendEmpty() resource.Resource().Attributes().PutStr("key1", "val1") @@ -116,7 +116,7 @@ func TestCreateResource(t *testing.T) { { desc: "Creates resource with given attributes and saves it for easy reference", testFunc: func(t *testing.T) { - settings := component.ReceiverCreateSettings{} + settings := receiver.CreateSettings{} helper := newOTELMetricHelper(settings) actual := helper.createResource("r1", map[string]string{"key1": "val1"}) require.NotNil(t, actual) @@ -141,7 +141,7 @@ func TestGetMetric(t *testing.T) { { desc: "Returns nil when resource not yet created", testFunc: func(t *testing.T) { - settings := component.ReceiverCreateSettings{} + settings := receiver.CreateSettings{} helper := newOTELMetricHelper(settings) actual := helper.getMetric("r1", "m1") require.Nil(t, actual) @@ -150,7 +150,7 @@ func TestGetMetric(t *testing.T) { { desc: "Returns nil when metric not yet created", testFunc: func(t *testing.T) { - settings := component.ReceiverCreateSettings{} + settings := receiver.CreateSettings{} helper := newOTELMetricHelper(settings) resource := helper.resourceMetricsSlice.AppendEmpty() resource.Resource().Attributes().PutStr("key1", "val1") @@ -163,7 +163,7 @@ func TestGetMetric(t *testing.T) { { desc: "Returns metric when already created", testFunc: func(t *testing.T) { - settings := component.ReceiverCreateSettings{} + settings := receiver.CreateSettings{} helper := newOTELMetricHelper(settings) resource := helper.resourceMetricsSlice.AppendEmpty() resource.Resource().Attributes().PutStr("key1", "val1") @@ -191,7 +191,7 @@ func TestCreateMetric(t *testing.T) { { desc: "Returns error when resource does not exist", testFunc: func(t *testing.T) { - settings := component.ReceiverCreateSettings{} + settings := receiver.CreateSettings{} helper := newOTELMetricHelper(settings) metricCfg := MetricConfig{ Description: "description", @@ -208,7 +208,7 @@ func TestCreateMetric(t *testing.T) { { desc: "Creates gauge metric and saves it for easy reference", testFunc: func(t *testing.T) { - settings := component.ReceiverCreateSettings{} + settings := receiver.CreateSettings{} helper := newOTELMetricHelper(settings) resource := helper.resourceMetricsSlice.AppendEmpty() resource.ScopeMetrics().AppendEmpty() @@ -235,7 +235,7 @@ func TestCreateMetric(t *testing.T) { { desc: "Creates sum metric and saves it for easy reference", testFunc: func(t *testing.T) { - settings := component.ReceiverCreateSettings{} + settings := receiver.CreateSettings{} helper := newOTELMetricHelper(settings) resource := helper.resourceMetricsSlice.AppendEmpty() resource.ScopeMetrics().AppendEmpty() @@ -277,7 +277,7 @@ func TestAddMetricDataPoint(t *testing.T) { { desc: "Returns error when resource does not exist", testFunc: func(t *testing.T) { - settings := component.ReceiverCreateSettings{} + settings := receiver.CreateSettings{} helper := newOTELMetricHelper(settings) metricCfg := MetricConfig{ Description: "description", @@ -299,7 +299,7 @@ func TestAddMetricDataPoint(t *testing.T) { { desc: "Returns error when metric does not exist", testFunc: func(t *testing.T) { - settings := component.ReceiverCreateSettings{} + settings := receiver.CreateSettings{} helper := newOTELMetricHelper(settings) resource := helper.resourceMetricsSlice.AppendEmpty() resource.ScopeMetrics().AppendEmpty() @@ -326,7 +326,7 @@ func TestAddMetricDataPoint(t *testing.T) { { desc: "Creates data points on existing gauge metric using passed in data", testFunc: func(t *testing.T) { - settings := component.ReceiverCreateSettings{} + settings := receiver.CreateSettings{} helper := newOTELMetricHelper(settings) resource := helper.resourceMetricsSlice.AppendEmpty() resource.ScopeMetrics().AppendEmpty() @@ -362,7 +362,7 @@ func TestAddMetricDataPoint(t *testing.T) { { desc: "Creates data points on existing sum metric using passed in data", testFunc: func(t *testing.T) { - settings := component.ReceiverCreateSettings{} + settings := receiver.CreateSettings{} helper := newOTELMetricHelper(settings) resource := helper.resourceMetricsSlice.AppendEmpty() resource.ScopeMetrics().AppendEmpty() @@ -402,7 +402,7 @@ func TestAddMetricDataPoint(t *testing.T) { { desc: "Creates data points on existing metric converting float to int", testFunc: func(t *testing.T) { - settings := component.ReceiverCreateSettings{} + settings := receiver.CreateSettings{} helper := newOTELMetricHelper(settings) resource := helper.resourceMetricsSlice.AppendEmpty() resource.ScopeMetrics().AppendEmpty() @@ -438,7 +438,7 @@ func TestAddMetricDataPoint(t *testing.T) { { desc: "Creates data points on existing metric converting int to float", testFunc: func(t *testing.T) { - settings := component.ReceiverCreateSettings{} + settings := receiver.CreateSettings{} helper := newOTELMetricHelper(settings) resource := helper.resourceMetricsSlice.AppendEmpty() resource.ScopeMetrics().AppendEmpty() diff --git a/receiver/snmpreceiver/scraper.go b/receiver/snmpreceiver/scraper.go index 04f0bdd1f22b5..a6ef01c6a3cdb 100644 --- a/receiver/snmpreceiver/scraper.go +++ b/receiver/snmpreceiver/scraper.go @@ -23,6 +23,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/pdata/pmetric" + "go.opentelemetry.io/collector/receiver" "go.opentelemetry.io/collector/receiver/scrapererror" "go.uber.org/zap" ) @@ -45,13 +46,13 @@ type snmpScraper struct { client client logger *zap.Logger cfg *Config - settings component.ReceiverCreateSettings + settings receiver.CreateSettings } type indexedAttributeValues map[string]string // newScraper creates an initialized snmpScraper -func newScraper(logger *zap.Logger, cfg *Config, settings component.ReceiverCreateSettings) *snmpScraper { +func newScraper(logger *zap.Logger, cfg *Config, settings receiver.CreateSettings) *snmpScraper { return &snmpScraper{ logger: logger, cfg: cfg, diff --git a/receiver/snmpreceiver/scraper_test.go b/receiver/snmpreceiver/scraper_test.go index 08bf9d93d368b..38fa6f58f5fef 100644 --- a/receiver/snmpreceiver/scraper_test.go +++ b/receiver/snmpreceiver/scraper_test.go @@ -25,6 +25,7 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/pdata/pmetric" + "go.opentelemetry.io/collector/receiver/receivertest" "go.opentelemetry.io/collector/receiver/scrapererror" "go.uber.org/zap" @@ -102,7 +103,7 @@ func TestStart(t *testing.T) { testFunc: func(t *testing.T) { scraper := &snmpScraper{ cfg: &Config{}, - settings: componenttest.NewNopReceiverCreateSettings(), + settings: receivertest.NewNopCreateSettings(), } err := scraper.start(context.Background(), componenttest.NewNopHost()) require.Error(t, err) @@ -114,7 +115,7 @@ func TestStart(t *testing.T) { scraper := &snmpScraper{ cfg: createDefaultConfig().(*Config), - settings: componenttest.NewNopReceiverCreateSettings(), + settings: receivertest.NewNopCreateSettings(), } err := scraper.start(context.Background(), componenttest.NewNopHost()) require.NoError(t, err) @@ -141,7 +142,7 @@ func TestScrape(t *testing.T) { mockClient.On("Close").Return(nil) scraper := &snmpScraper{ cfg: &Config{}, - settings: componenttest.NewNopReceiverCreateSettings(), + settings: receivertest.NewNopCreateSettings(), client: mockClient, logger: zap.NewNop(), } @@ -176,7 +177,7 @@ func TestScrape(t *testing.T) { }, }, }, - settings: componenttest.NewNopReceiverCreateSettings(), + settings: receivertest.NewNopCreateSettings(), client: mockClient, logger: zap.NewNop(), } @@ -212,7 +213,7 @@ func TestScrape(t *testing.T) { }, }, }, - settings: componenttest.NewNopReceiverCreateSettings(), + settings: receivertest.NewNopCreateSettings(), client: mockClient, logger: zap.NewNop(), } @@ -250,7 +251,7 @@ func TestScrape(t *testing.T) { }, }, }, - settings: componenttest.NewNopReceiverCreateSettings(), + settings: receivertest.NewNopCreateSettings(), client: mockClient, logger: zap.NewNop(), } @@ -297,7 +298,7 @@ func TestScrape(t *testing.T) { }, }, }, - settings: componenttest.NewNopReceiverCreateSettings(), + settings: receivertest.NewNopCreateSettings(), client: mockClient, logger: zap.NewNop(), } @@ -346,7 +347,7 @@ func TestScrape(t *testing.T) { }, }, }, - settings: componenttest.NewNopReceiverCreateSettings(), + settings: receivertest.NewNopCreateSettings(), client: mockClient, logger: zap.NewNop(), } @@ -395,7 +396,7 @@ func TestScrape(t *testing.T) { }, }, }, - settings: componenttest.NewNopReceiverCreateSettings(), + settings: receivertest.NewNopCreateSettings(), client: mockClient, logger: zap.NewNop(), } @@ -459,7 +460,7 @@ func TestScrape(t *testing.T) { }, }, }, - settings: componenttest.NewNopReceiverCreateSettings(), + settings: receivertest.NewNopCreateSettings(), client: mockClient, logger: zap.NewNop(), } @@ -525,7 +526,7 @@ func TestScrape(t *testing.T) { }, }, }, - settings: componenttest.NewNopReceiverCreateSettings(), + settings: receivertest.NewNopCreateSettings(), client: mockClient, logger: zap.NewNop(), } @@ -597,7 +598,7 @@ func TestScrape(t *testing.T) { }, }, }, - settings: componenttest.NewNopReceiverCreateSettings(), + settings: receivertest.NewNopCreateSettings(), client: mockClient, logger: zap.NewNop(), } @@ -640,7 +641,7 @@ func TestScrape(t *testing.T) { }, }, }, - settings: componenttest.NewNopReceiverCreateSettings(), + settings: receivertest.NewNopCreateSettings(), client: mockClient, logger: zap.NewNop(), } @@ -688,7 +689,7 @@ func TestScrape(t *testing.T) { }, }, }, - settings: componenttest.NewNopReceiverCreateSettings(), + settings: receivertest.NewNopCreateSettings(), client: mockClient, logger: zap.NewNop(), } @@ -743,7 +744,7 @@ func TestScrape(t *testing.T) { }, }, }, - settings: componenttest.NewNopReceiverCreateSettings(), + settings: receivertest.NewNopCreateSettings(), client: mockClient, logger: zap.NewNop(), } @@ -807,7 +808,7 @@ func TestScrape(t *testing.T) { }, }, }, - settings: componenttest.NewNopReceiverCreateSettings(), + settings: receivertest.NewNopCreateSettings(), client: mockClient, logger: zap.NewNop(), } @@ -873,7 +874,7 @@ func TestScrape(t *testing.T) { }, }, }, - settings: componenttest.NewNopReceiverCreateSettings(), + settings: receivertest.NewNopCreateSettings(), client: mockClient, logger: zap.NewNop(), } @@ -939,7 +940,7 @@ func TestScrape(t *testing.T) { }, }, }, - settings: componenttest.NewNopReceiverCreateSettings(), + settings: receivertest.NewNopCreateSettings(), client: mockClient, logger: zap.NewNop(), } @@ -1021,7 +1022,7 @@ func TestScrape(t *testing.T) { }, }, }, - settings: componenttest.NewNopReceiverCreateSettings(), + settings: receivertest.NewNopCreateSettings(), client: mockClient, logger: zap.NewNop(), } @@ -1114,7 +1115,7 @@ func TestScrape(t *testing.T) { }, }, }, - settings: componenttest.NewNopReceiverCreateSettings(), + settings: receivertest.NewNopCreateSettings(), client: mockClient, logger: zap.NewNop(), } @@ -1205,7 +1206,7 @@ func TestScrape(t *testing.T) { }, }, }, - settings: componenttest.NewNopReceiverCreateSettings(), + settings: receivertest.NewNopCreateSettings(), client: mockClient, logger: zap.NewNop(), } @@ -1284,7 +1285,7 @@ func TestScrape(t *testing.T) { }, }, }, - settings: componenttest.NewNopReceiverCreateSettings(), + settings: receivertest.NewNopCreateSettings(), client: mockClient, logger: zap.NewNop(), } @@ -1368,7 +1369,7 @@ func TestScrape(t *testing.T) { }, }, }, - settings: componenttest.NewNopReceiverCreateSettings(), + settings: receivertest.NewNopCreateSettings(), client: mockClient, logger: zap.NewNop(), } @@ -1437,7 +1438,7 @@ func TestScrape(t *testing.T) { }, }, }, - settings: componenttest.NewNopReceiverCreateSettings(), + settings: receivertest.NewNopCreateSettings(), client: mockClient, logger: zap.NewNop(), } @@ -1514,7 +1515,7 @@ func TestScrape(t *testing.T) { }, }, }, - settings: componenttest.NewNopReceiverCreateSettings(), + settings: receivertest.NewNopCreateSettings(), client: mockClient, logger: zap.NewNop(), } @@ -1591,7 +1592,7 @@ func TestScrape(t *testing.T) { }, }, }, - settings: componenttest.NewNopReceiverCreateSettings(), + settings: receivertest.NewNopCreateSettings(), client: mockClient, logger: zap.NewNop(), } @@ -1668,7 +1669,7 @@ func TestScrape(t *testing.T) { }, }, }, - settings: componenttest.NewNopReceiverCreateSettings(), + settings: receivertest.NewNopCreateSettings(), client: mockClient, logger: zap.NewNop(), } @@ -1753,7 +1754,7 @@ func TestScrape(t *testing.T) { }, }, }, - settings: componenttest.NewNopReceiverCreateSettings(), + settings: receivertest.NewNopCreateSettings(), client: mockClient, logger: zap.NewNop(), } @@ -1828,7 +1829,7 @@ func TestScrape(t *testing.T) { }, }, }, - settings: componenttest.NewNopReceiverCreateSettings(), + settings: receivertest.NewNopCreateSettings(), client: mockClient, logger: zap.NewNop(), } @@ -1908,7 +1909,7 @@ func TestScrape(t *testing.T) { }, }, }, - settings: componenttest.NewNopReceiverCreateSettings(), + settings: receivertest.NewNopCreateSettings(), client: mockClient, logger: zap.NewNop(), } @@ -1998,7 +1999,7 @@ func TestScrape(t *testing.T) { }, }, }, - settings: componenttest.NewNopReceiverCreateSettings(), + settings: receivertest.NewNopCreateSettings(), client: mockClient, logger: zap.NewNop(), } @@ -2096,7 +2097,7 @@ func TestScrape(t *testing.T) { }, }, }, - settings: componenttest.NewNopReceiverCreateSettings(), + settings: receivertest.NewNopCreateSettings(), client: mockClient, logger: zap.NewNop(), } @@ -2172,7 +2173,7 @@ func TestScrape(t *testing.T) { }, }, }, - settings: componenttest.NewNopReceiverCreateSettings(), + settings: receivertest.NewNopCreateSettings(), client: mockClient, logger: zap.NewNop(), } diff --git a/receiver/solacereceiver/factory.go b/receiver/solacereceiver/factory.go index ed1ffacfced30..dee724e68bde1 100644 --- a/receiver/solacereceiver/factory.go +++ b/receiver/solacereceiver/factory.go @@ -22,6 +22,7 @@ import ( "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/configtls" "go.opentelemetry.io/collector/consumer" + "go.opentelemetry.io/collector/receiver" ) const ( @@ -36,11 +37,11 @@ const ( ) // NewFactory creates a factory for Solace receiver. -func NewFactory() component.ReceiverFactory { - return component.NewReceiverFactory( +func NewFactory() receiver.Factory { + return receiver.NewFactory( componentType, createDefaultConfig, - component.WithTracesReceiver(createTracesReceiver, stability), + receiver.WithTraces(createTracesReceiver, stability), ) } @@ -66,10 +67,10 @@ func createDefaultConfig() component.Config { // CreateTracesReceiver creates a trace receiver based on provided config. Component is not shared func createTracesReceiver( _ context.Context, - params component.ReceiverCreateSettings, + params receiver.CreateSettings, receiverConfig component.Config, nextConsumer consumer.Traces, -) (component.TracesReceiver, error) { +) (receiver.Traces, error) { cfg, ok := receiverConfig.(*Config) if !ok { return nil, component.ErrDataTypeIsNotSupported diff --git a/receiver/solacereceiver/factory_test.go b/receiver/solacereceiver/factory_test.go index cdec4ded4845a..9239ae4b811c5 100644 --- a/receiver/solacereceiver/factory_test.go +++ b/receiver/solacereceiver/factory_test.go @@ -27,6 +27,7 @@ import ( "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/confmap/confmaptest" "go.opentelemetry.io/collector/consumer/consumertest" + "go.opentelemetry.io/collector/receiver/receivertest" ) func TestCreateTracesReceiver(t *testing.T) { @@ -41,7 +42,7 @@ func TestCreateTracesReceiver(t *testing.T) { receiver, err := factory.CreateTracesReceiver( context.Background(), - componenttest.NewNopReceiverCreateSettings(), + receivertest.NewNopCreateSettings(), cfg, consumertest.NewNop(), ) @@ -54,7 +55,7 @@ func TestCreateTracesReceiver(t *testing.T) { func TestCreateTracesReceiverWrongConfig(t *testing.T) { factories := getTestNopFactories(t) factory := factories.Receivers[componentType] - _, err := factory.CreateTracesReceiver(context.Background(), componenttest.NewNopReceiverCreateSettings(), nil, nil) + _, err := factory.CreateTracesReceiver(context.Background(), receivertest.NewNopCreateSettings(), nil, nil) assert.Equal(t, component.ErrDataTypeIsNotSupported, err) } @@ -62,7 +63,7 @@ func TestCreateTracesReceiverNilConsumer(t *testing.T) { factories := getTestNopFactories(t) cfg := createDefaultConfig() factory := factories.Receivers[componentType] - _, err := factory.CreateTracesReceiver(context.Background(), componenttest.NewNopReceiverCreateSettings(), cfg, nil) + _, err := factory.CreateTracesReceiver(context.Background(), receivertest.NewNopCreateSettings(), cfg, nil) assert.Equal(t, component.ErrNilNextConsumer, err) } @@ -71,7 +72,7 @@ func TestCreateTracesReceiverBadConfigNoAuth(t *testing.T) { cfg := createDefaultConfig().(*Config) cfg.Queue = "some-queue" factory := factories.Receivers[componentType] - _, err := factory.CreateTracesReceiver(context.Background(), componenttest.NewNopReceiverCreateSettings(), cfg, consumertest.NewNop()) + _, err := factory.CreateTracesReceiver(context.Background(), receivertest.NewNopCreateSettings(), cfg, consumertest.NewNop()) assert.Equal(t, errMissingAuthDetails, err) } @@ -81,7 +82,7 @@ func TestCreateTracesReceiverBadConfigIncompleteAuth(t *testing.T) { cfg.Queue = "some-queue" cfg.Auth = Authentication{PlainText: &SaslPlainTextConfig{Username: "someUsername"}} // missing password factory := factories.Receivers[componentType] - _, err := factory.CreateTracesReceiver(context.Background(), componenttest.NewNopReceiverCreateSettings(), cfg, consumertest.NewNop()) + _, err := factory.CreateTracesReceiver(context.Background(), receivertest.NewNopCreateSettings(), cfg, consumertest.NewNop()) assert.Equal(t, errMissingPlainTextParams, err) } @@ -108,7 +109,7 @@ func TestCreateTracesReceiverBadMetrics(t *testing.T) { receiver, err := factory.CreateTracesReceiver( context.Background(), - componenttest.NewNopReceiverCreateSettings(), + receivertest.NewNopCreateSettings(), cfg, consumertest.NewNop(), ) diff --git a/receiver/solacereceiver/go.mod b/receiver/solacereceiver/go.mod index 70bd9127bc279..5851f15480bb2 100644 --- a/receiver/solacereceiver/go.mod +++ b/receiver/solacereceiver/go.mod @@ -20,11 +20,11 @@ require ( github.com/Azure/go-amqp v0.17.5 github.com/stretchr/testify v1.8.1 go.opencensus.io v0.24.0 - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector v0.67.0 + go.opentelemetry.io/collector/component v0.67.0 + go.opentelemetry.io/collector/confmap v0.67.0 + go.opentelemetry.io/collector/consumer v0.67.0 + go.opentelemetry.io/collector/pdata v1.0.0-rc1 go.opentelemetry.io/otel v1.11.1 go.uber.org/atomic v1.10.0 go.uber.org/zap v1.24.0 @@ -45,7 +45,7 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pelletier/go-toml v1.9.3 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/featuregate v0.67.0 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect go.uber.org/multierr v1.8.0 // indirect diff --git a/receiver/solacereceiver/go.sum b/receiver/solacereceiver/go.sum index 358a558e20abb..5cec71b0399bd 100644 --- a/receiver/solacereceiver/go.sum +++ b/receiver/solacereceiver/go.sum @@ -273,18 +273,18 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/component v0.67.0 h1:GCBRZAqk4yNaT4L1uwlbbwophFHrxYccLZ4Uj1Ifs/M= +go.opentelemetry.io/collector/component v0.67.0/go.mod h1:Txa2lm9oe7xsGQN8u7GdUIrRpAHFIKsTO4Qi3/CSmKk= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/metric v0.33.0 h1:xQAyl7uGEYvrLAiV/09iTJlp1pZnQ9Wl793qbVvED1E= diff --git a/receiver/solacereceiver/model/v1/receive_v1.pb.go b/receiver/solacereceiver/model/v1/receive_v1.pb.go index 6f2b5bc0fcd5a..6c0d90b50dfeb 100644 --- a/receiver/solacereceiver/model/v1/receive_v1.pb.go +++ b/receiver/solacereceiver/model/v1/receive_v1.pb.go @@ -223,13 +223,12 @@ func (SpanData_TransactionEvent_Initiator) EnumDescriptor() ([]byte, []int) { // nanoseconds, since midnight, Jan. 1, 1970 UTC. // // Notes on the field numbers used: -// - Field numbers 1-15 are used for attributes that are expected to be present -// on the wire with every single message not containing an error_description. -// Special priority is given to fields that can be repeated. -// - Field numbers 16+ are used for other attributes. +// - Field numbers 1-15 are used for attributes that are expected to be present +// on the wire with every single message not containing an error_description. +// Special priority is given to fields that can be repeated. +// - Field numbers 16+ are used for other attributes. // // Next available field ID: 40 -// type SpanData struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache diff --git a/receiver/solacereceiver/receiver.go b/receiver/solacereceiver/receiver.go index 47820a0222984..d82243d1e2782 100644 --- a/receiver/solacereceiver/receiver.go +++ b/receiver/solacereceiver/receiver.go @@ -24,17 +24,18 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/consumer/consumererror" + "go.opentelemetry.io/collector/receiver" "go.uber.org/atomic" "go.uber.org/zap" ) -// solaceTracesReceiver uses azure AMQP to consume and handle telemetry data from SOlace. Implements component.TracesReceiver +// solaceTracesReceiver uses azure AMQP to consume and handle telemetry data from SOlace. Implements receiver.Traces type solaceTracesReceiver struct { // config is the receiver.Config instance used to build the receiver config *Config nextConsumer consumer.Traces - settings component.ReceiverCreateSettings + settings receiver.CreateSettings metrics *opencensusMetrics unmarshaller tracesUnmarshaller // cancel is the function that will cancel the context associated with the main worker loop @@ -48,8 +49,8 @@ type solaceTracesReceiver struct { retryTimeout time.Duration } -// newTracesReceiver creates a new solaceTraceReceiver as a component.TracesReceiver -func newTracesReceiver(config *Config, set component.ReceiverCreateSettings, nextConsumer consumer.Traces) (component.TracesReceiver, error) { +// newTracesReceiver creates a new solaceTraceReceiver as a receiver.Traces +func newTracesReceiver(config *Config, set receiver.CreateSettings, nextConsumer consumer.Traces) (receiver.Traces, error) { if nextConsumer == nil { set.Logger.Warn("Next consumer in pipeline is null, stopping receiver") return nil, component.ErrNilNextConsumer diff --git a/receiver/solacereceiver/receiver_test.go b/receiver/solacereceiver/receiver_test.go index 446873f454cd8..b48c149e776d0 100644 --- a/receiver/solacereceiver/receiver_test.go +++ b/receiver/solacereceiver/receiver_test.go @@ -24,11 +24,11 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/consumer/consumererror" "go.opentelemetry.io/collector/consumer/consumertest" "go.opentelemetry.io/collector/pdata/ptrace" + "go.opentelemetry.io/collector/receiver/receivertest" "go.uber.org/atomic" ) @@ -523,7 +523,7 @@ func newReceiver(t *testing.T) (*solaceTracesReceiver, *mockMessagingService, *m } metrics := newTestMetrics(t) receiver := &solaceTracesReceiver{ - settings: componenttest.NewNopReceiverCreateSettings(), + settings: receivertest.NewNopCreateSettings(), config: &Config{ Flow: FlowControl{ DelayedRetry: &FlowControlDelayedRetry{ diff --git a/receiver/solacereceiver/unmarshaller_test.go b/receiver/solacereceiver/unmarshaller_test.go index fd30126837d19..2f94b1105f29e 100644 --- a/receiver/solacereceiver/unmarshaller_test.go +++ b/receiver/solacereceiver/unmarshaller_test.go @@ -845,8 +845,13 @@ func compareSpans(t *testing.T, expected, actual ptrace.Span) { lessFunc := func(a, b ptrace.SpanEvent) bool { return a.Name() < b.Name() // choose any comparison here } - expectedEvent := expected.Events().Sort(lessFunc).At(i) - actualEvent := actual.Events().Sort(lessFunc).At(i) + ee := expected.Events() + ee.Sort(lessFunc) + expectedEvent := ee.At(i) + + ae := actual.Events() + ae.Sort(lessFunc) + actualEvent := ae.At(i) assert.Equal(t, expectedEvent.Name(), actualEvent.Name()) assert.Equal(t, expectedEvent.Timestamp(), actualEvent.Timestamp()) assert.Equal(t, expectedEvent.Attributes().AsRaw(), actualEvent.Attributes().AsRaw()) @@ -964,7 +969,9 @@ func TestUnmarshallerBaggageString(t *testing.T) { if testCase.expected != nil { expected := pcommon.NewMap() testCase.expected(expected) - assert.Equal(t, expected.Sort(), actual.Sort()) + expected.Sort() + actual.Sort() + assert.Equal(t, expected, actual) } else { // assert we didn't add anything if we don't have a result map assert.Equal(t, 0, actual.Len()) diff --git a/receiver/splunkhecreceiver/factory.go b/receiver/splunkhecreceiver/factory.go index 0a3403a479dd6..0392adfeb28d8 100644 --- a/receiver/splunkhecreceiver/factory.go +++ b/receiver/splunkhecreceiver/factory.go @@ -21,6 +21,7 @@ import ( "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/consumer" + "go.opentelemetry.io/collector/receiver" conventions "go.opentelemetry.io/collector/semconv/v1.6.1" "go.uber.org/zap" @@ -40,12 +41,12 @@ const ( ) // NewFactory creates a factory for Splunk HEC receiver. -func NewFactory() component.ReceiverFactory { - return component.NewReceiverFactory( +func NewFactory() receiver.Factory { + return receiver.NewFactory( typeStr, createDefaultConfig, - component.WithMetricsReceiver(createMetricsReceiver, stability), - component.WithLogsReceiver(createLogsReceiver, stability)) + receiver.WithMetrics(createMetricsReceiver, stability), + receiver.WithLogs(createLogsReceiver, stability)) } // CreateDefaultConfig creates the default configuration for Splunk HEC receiver. @@ -70,10 +71,10 @@ func createDefaultConfig() component.Config { // CreateMetricsReceiver creates a metrics receiver based on provided config. func createMetricsReceiver( _ context.Context, - params component.ReceiverCreateSettings, + params receiver.CreateSettings, cfg component.Config, consumer consumer.Metrics, -) (component.MetricsReceiver, error) { +) (receiver.Metrics, error) { rCfg := cfg.(*Config) @@ -87,10 +88,10 @@ func createMetricsReceiver( // createLogsReceiver creates a logs receiver based on provided config. func createLogsReceiver( _ context.Context, - params component.ReceiverCreateSettings, + params receiver.CreateSettings, cfg component.Config, consumer consumer.Logs, -) (component.LogsReceiver, error) { +) (receiver.Logs, error) { rCfg := cfg.(*Config) diff --git a/receiver/splunkhecreceiver/factory_test.go b/receiver/splunkhecreceiver/factory_test.go index 631e3ca36812d..eee1d0d58e0ce 100644 --- a/receiver/splunkhecreceiver/factory_test.go +++ b/receiver/splunkhecreceiver/factory_test.go @@ -22,6 +22,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/consumer/consumertest" + "go.opentelemetry.io/collector/receiver/receivertest" ) func TestCreateDefaultConfig(t *testing.T) { @@ -35,12 +36,12 @@ func TestCreateReceiver(t *testing.T) { cfg.Endpoint = "localhost:1" // Endpoint is required, not going to be used here. mockLogsConsumer := consumertest.NewNop() - lReceiver, err := createLogsReceiver(context.Background(), componenttest.NewNopReceiverCreateSettings(), cfg, mockLogsConsumer) + lReceiver, err := createLogsReceiver(context.Background(), receivertest.NewNopCreateSettings(), cfg, mockLogsConsumer) assert.Nil(t, err, "receiver creation failed") assert.NotNil(t, lReceiver, "receiver creation failed") mockMetricsConsumer := consumertest.NewNop() - mReceiver, err := createMetricsReceiver(context.Background(), componenttest.NewNopReceiverCreateSettings(), cfg, mockMetricsConsumer) + mReceiver, err := createMetricsReceiver(context.Background(), receivertest.NewNopCreateSettings(), cfg, mockMetricsConsumer) assert.Nil(t, err, "receiver creation failed") assert.NotNil(t, mReceiver, "receiver creation failed") } @@ -53,7 +54,7 @@ func TestCreateNilNextConsumerMetrics(t *testing.T) { cfg := createDefaultConfig().(*Config) cfg.Endpoint = "localhost:1" - mReceiver, err := createMetricsReceiver(context.Background(), componenttest.NewNopReceiverCreateSettings(), cfg, nil) + mReceiver, err := createMetricsReceiver(context.Background(), receivertest.NewNopCreateSettings(), cfg, nil) assert.EqualError(t, err, "nil metricsConsumer") assert.Nil(t, mReceiver, "receiver creation failed") } @@ -62,7 +63,7 @@ func TestCreateNilNextConsumerLogs(t *testing.T) { cfg := createDefaultConfig().(*Config) cfg.Endpoint = "localhost:1" - mReceiver, err := createLogsReceiver(context.Background(), componenttest.NewNopReceiverCreateSettings(), cfg, nil) + mReceiver, err := createLogsReceiver(context.Background(), receivertest.NewNopCreateSettings(), cfg, nil) assert.EqualError(t, err, "nil logsConsumer") assert.Nil(t, mReceiver, "receiver creation failed") } diff --git a/receiver/splunkhecreceiver/go.mod b/receiver/splunkhecreceiver/go.mod index 103fc338b60ac..dab999cf50362 100644 --- a/receiver/splunkhecreceiver/go.mod +++ b/receiver/splunkhecreceiver/go.mod @@ -5,16 +5,16 @@ go 1.18 require ( github.com/gorilla/mux v1.8.0 github.com/json-iterator/go v1.1.12 - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/splunkhecexporter v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/splunk v0.66.0 + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/splunkhecexporter v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/splunk v0.67.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector v0.67.0 + go.opentelemetry.io/collector/component v0.67.0 + go.opentelemetry.io/collector/confmap v0.67.0 + go.opentelemetry.io/collector/consumer v0.67.0 + go.opentelemetry.io/collector/pdata v1.0.0-rc1 + go.opentelemetry.io/collector/semconv v0.67.0 go.uber.org/zap v1.24.0 ) @@ -34,12 +34,12 @@ 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/internal/coreinternal v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchperresourceattr v0.66.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchperresourceattr v0.67.0 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rs/cors v1.8.2 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/featuregate v0.67.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect diff --git a/receiver/splunkhecreceiver/go.sum b/receiver/splunkhecreceiver/go.sum index f7abbd103dea9..dd7643c7cd766 100644 --- a/receiver/splunkhecreceiver/go.sum +++ b/receiver/splunkhecreceiver/go.sum @@ -285,20 +285,20 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 h1:Q5L9Urod3c8as6ZYaoaqBjarx/HXxsxy34DFZIU2fO4= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/component v0.67.0 h1:GCBRZAqk4yNaT4L1uwlbbwophFHrxYccLZ4Uj1Ifs/M= +go.opentelemetry.io/collector/component v0.67.0/go.mod h1:Txa2lm9oe7xsGQN8u7GdUIrRpAHFIKsTO4Qi3/CSmKk= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= +go.opentelemetry.io/collector/semconv v0.67.0 h1:zLAvcQa6Kgow52FFLrmk7/9ZVtEYyA73+xDtCcFG78Q= +go.opentelemetry.io/collector/semconv v0.67.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 h1:aUEBEdCa6iamGzg6fuYxDA8ThxvOG240mAvWDU+XLio= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4/go.mod h1:l2MdsbKTocpPS5nQZscqTR9jd8u96VYZdcpF8Sye7mA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= diff --git a/receiver/splunkhecreceiver/receiver.go b/receiver/splunkhecreceiver/receiver.go index c5c742f1a4877..b9303bd676161 100644 --- a/receiver/splunkhecreceiver/receiver.go +++ b/receiver/splunkhecreceiver/receiver.go @@ -34,6 +34,7 @@ import ( "go.opentelemetry.io/collector/obsreport" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/plog" + "go.opentelemetry.io/collector/receiver" "go.uber.org/zap" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/splunk" @@ -73,9 +74,9 @@ var ( errUnsupportedLogEvent = initJSONResponse(responseErrUnsupportedLogEvent) ) -// splunkReceiver implements the component.MetricsReceiver for Splunk HEC metric protocol. +// splunkReceiver implements the receiver.Metrics for Splunk HEC metric protocol. type splunkReceiver struct { - settings component.ReceiverCreateSettings + settings receiver.CreateSettings config *Config logsConsumer consumer.Logs metricsConsumer consumer.Metrics @@ -85,14 +86,14 @@ type splunkReceiver struct { gzipReaderPool *sync.Pool } -var _ component.MetricsReceiver = (*splunkReceiver)(nil) +var _ receiver.Metrics = (*splunkReceiver)(nil) // newMetricsReceiver creates the Splunk HEC receiver with the given configuration. func newMetricsReceiver( - settings component.ReceiverCreateSettings, + settings receiver.CreateSettings, config Config, nextConsumer consumer.Metrics, -) (component.MetricsReceiver, error) { +) (receiver.Metrics, error) { if nextConsumer == nil { return nil, errNilNextMetricsConsumer } @@ -134,10 +135,10 @@ func newMetricsReceiver( // newLogsReceiver creates the Splunk HEC receiver with the given configuration. func newLogsReceiver( - settings component.ReceiverCreateSettings, + settings receiver.CreateSettings, config Config, nextConsumer consumer.Logs, -) (component.LogsReceiver, error) { +) (receiver.Logs, error) { if nextConsumer == nil { return nil, errNilNextLogsConsumer } diff --git a/receiver/splunkhecreceiver/receiver_test.go b/receiver/splunkhecreceiver/receiver_test.go index 06cb59bea3f95..f8fa83dcf9954 100644 --- a/receiver/splunkhecreceiver/receiver_test.go +++ b/receiver/splunkhecreceiver/receiver_test.go @@ -36,8 +36,10 @@ import ( "go.opentelemetry.io/collector/config/configtls" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/consumer/consumertest" + "go.opentelemetry.io/collector/exporter/exportertest" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/plog" + "go.opentelemetry.io/collector/receiver/receivertest" "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/splunkhecexporter" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/common/testutil" @@ -93,7 +95,7 @@ func Test_splunkhecreceiver_NewLogsReceiver(t *testing.T) { } for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { - got, err := newLogsReceiver(componenttest.NewNopReceiverCreateSettings(), tt.args.config, tt.args.logsConsumer) + got, err := newLogsReceiver(receivertest.NewNopCreateSettings(), tt.args.config, tt.args.logsConsumer) assert.Equal(t, tt.wantErr, err) if err == nil { assert.NotNil(t, got) @@ -153,7 +155,7 @@ func Test_splunkhecreceiver_NewMetricsReceiver(t *testing.T) { } for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { - got, err := newMetricsReceiver(componenttest.NewNopReceiverCreateSettings(), tt.args.config, tt.args.metricsConsumer) + got, err := newMetricsReceiver(receivertest.NewNopCreateSettings(), tt.args.config, tt.args.metricsConsumer) assert.Equal(t, tt.wantErr, err) if err == nil { assert.NotNil(t, got) @@ -299,7 +301,7 @@ func Test_splunkhecReceiver_handleReq(t *testing.T) { for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { sink := new(consumertest.LogsSink) - rcv, err := newLogsReceiver(componenttest.NewNopReceiverCreateSettings(), *config, sink) + rcv, err := newLogsReceiver(receivertest.NewNopCreateSettings(), *config, sink) assert.NoError(t, err) r := rcv.(*splunkReceiver) @@ -323,7 +325,7 @@ func Test_consumer_err(t *testing.T) { splunkMsg := buildSplunkHecMsg(currentTime, 3) config := createDefaultConfig().(*Config) config.Endpoint = "localhost:0" // Actually not creating the endpoint - rcv, err := newLogsReceiver(componenttest.NewNopReceiverCreateSettings(), *config, consumertest.NewErr(errors.New("bad consumer"))) + rcv, err := newLogsReceiver(receivertest.NewNopCreateSettings(), *config, consumertest.NewErr(errors.New("bad consumer"))) assert.NoError(t, err) r := rcv.(*splunkReceiver) @@ -350,7 +352,7 @@ func Test_consumer_err_metrics(t *testing.T) { assert.True(t, splunkMsg.IsMetric()) config := createDefaultConfig().(*Config) config.Endpoint = "localhost:0" // Actually not creating the endpoint\ - rcv, err := newMetricsReceiver(componenttest.NewNopReceiverCreateSettings(), *config, consumertest.NewErr(errors.New("bad consumer"))) + rcv, err := newMetricsReceiver(receivertest.NewNopCreateSettings(), *config, consumertest.NewErr(errors.New("bad consumer"))) assert.NoError(t, err) r := rcv.(*splunkReceiver) @@ -382,7 +384,7 @@ func Test_splunkhecReceiver_TLS(t *testing.T) { }, } sink := new(consumertest.LogsSink) - r, err := newLogsReceiver(componenttest.NewNopReceiverCreateSettings(), *cfg, sink) + r, err := newLogsReceiver(receivertest.NewNopCreateSettings(), *cfg, sink) require.NoError(t, err) defer func() { require.NoError(t, r.Shutdown(context.Background())) @@ -554,10 +556,10 @@ func Test_splunkhecReceiver_AccessTokenPassthrough(t *testing.T) { }() if tt.metric { - exporter, err := factory.CreateMetricsExporter(context.Background(), componenttest.NewNopExporterCreateSettings(), exporterConfig) + exporter, err := factory.CreateMetricsExporter(context.Background(), exportertest.NewNopCreateSettings(), exporterConfig) assert.NoError(t, exporter.Start(context.Background(), nil)) assert.NoError(t, err) - rcv, err := newMetricsReceiver(componenttest.NewNopReceiverCreateSettings(), *config, exporter) + rcv, err := newMetricsReceiver(receivertest.NewNopCreateSettings(), *config, exporter) assert.NoError(t, err) r := rcv.(*splunkReceiver) w := httptest.NewRecorder() @@ -566,10 +568,10 @@ func Test_splunkhecReceiver_AccessTokenPassthrough(t *testing.T) { _, err = io.ReadAll(resp.Body) assert.NoError(t, err) } else { - exporter, err := factory.CreateLogsExporter(context.Background(), componenttest.NewNopExporterCreateSettings(), exporterConfig) + exporter, err := factory.CreateLogsExporter(context.Background(), exportertest.NewNopCreateSettings(), exporterConfig) assert.NoError(t, exporter.Start(context.Background(), nil)) assert.NoError(t, err) - rcv, err := newLogsReceiver(componenttest.NewNopReceiverCreateSettings(), *config, exporter) + rcv, err := newLogsReceiver(receivertest.NewNopCreateSettings(), *config, exporter) assert.NoError(t, err) r := rcv.(*splunkReceiver) w := httptest.NewRecorder() @@ -631,10 +633,10 @@ func Test_Logs_splunkhecReceiver_IndexSourceTypePassthrough(t *testing.T) { exporterConfig.Index = "defaultindex" exporterConfig.DisableCompression = true exporterConfig.Endpoint = endServer.URL - exporter, err := factory.CreateLogsExporter(context.Background(), componenttest.NewNopExporterCreateSettings(), exporterConfig) + exporter, err := factory.CreateLogsExporter(context.Background(), exportertest.NewNopCreateSettings(), exporterConfig) assert.NoError(t, exporter.Start(context.Background(), nil)) assert.NoError(t, err) - rcv, err := newLogsReceiver(componenttest.NewNopReceiverCreateSettings(), *cfg, exporter) + rcv, err := newLogsReceiver(receivertest.NewNopCreateSettings(), *cfg, exporter) assert.NoError(t, err) currentTime := float64(time.Now().UnixNano()) / 1e6 @@ -725,10 +727,10 @@ func Test_Metrics_splunkhecReceiver_IndexSourceTypePassthrough(t *testing.T) { exporterConfig.DisableCompression = true exporterConfig.Endpoint = endServer.URL - exporter, err := factory.CreateMetricsExporter(context.Background(), componenttest.NewNopExporterCreateSettings(), exporterConfig) + exporter, err := factory.CreateMetricsExporter(context.Background(), exportertest.NewNopCreateSettings(), exporterConfig) assert.NoError(t, exporter.Start(context.Background(), nil)) assert.NoError(t, err) - rcv, err := newMetricsReceiver(componenttest.NewNopReceiverCreateSettings(), *cfg, exporter) + rcv, err := newMetricsReceiver(receivertest.NewNopCreateSettings(), *cfg, exporter) assert.NoError(t, err) currentTime := float64(time.Now().UnixNano()) / 1e6 @@ -954,7 +956,7 @@ func Test_splunkhecReceiver_handleRawReq(t *testing.T) { for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { sink := new(consumertest.LogsSink) - rcv, err := newLogsReceiver(componenttest.NewNopReceiverCreateSettings(), *config, sink) + rcv, err := newLogsReceiver(receivertest.NewNopCreateSettings(), *config, sink) assert.NoError(t, err) r := rcv.(*splunkReceiver) @@ -984,7 +986,7 @@ func Test_splunkhecReceiver_handleRawReq(t *testing.T) { func Test_splunkhecreceiver_handleHealthPath(t *testing.T) { config := createDefaultConfig().(*Config) sink := new(consumertest.LogsSink) - rcv, err := newLogsReceiver(componenttest.NewNopReceiverCreateSettings(), *config, sink) + rcv, err := newLogsReceiver(receivertest.NewNopCreateSettings(), *config, sink) assert.NoError(t, err) r := rcv.(*splunkReceiver) @@ -1006,7 +1008,7 @@ func BenchmarkHandleReq(b *testing.B) { config := createDefaultConfig().(*Config) config.Endpoint = "localhost:0" sink := new(consumertest.LogsSink) - rcv, err := newLogsReceiver(componenttest.NewNopReceiverCreateSettings(), *config, sink) + rcv, err := newLogsReceiver(receivertest.NewNopCreateSettings(), *config, sink) assert.NoError(b, err) r := rcv.(*splunkReceiver) diff --git a/receiver/sqlqueryreceiver/factory.go b/receiver/sqlqueryreceiver/factory.go index afddb3c667256..76fc8302543e1 100644 --- a/receiver/sqlqueryreceiver/factory.go +++ b/receiver/sqlqueryreceiver/factory.go @@ -18,6 +18,7 @@ import ( "database/sql" "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/receiver" ) const ( @@ -25,10 +26,10 @@ const ( stability = component.StabilityLevelUndefined ) -func NewFactory() component.ReceiverFactory { - return component.NewReceiverFactory( +func NewFactory() receiver.Factory { + return receiver.NewFactory( typeStr, createDefaultConfig, - component.WithMetricsReceiver(createReceiverFunc(sql.Open, newDbClient), stability), + receiver.WithMetrics(createReceiverFunc(sql.Open, newDbClient), stability), ) } diff --git a/receiver/sqlqueryreceiver/factory_test.go b/receiver/sqlqueryreceiver/factory_test.go index 56e04daac8972..f8d387cf3999d 100644 --- a/receiver/sqlqueryreceiver/factory_test.go +++ b/receiver/sqlqueryreceiver/factory_test.go @@ -19,15 +19,15 @@ import ( "testing" "github.com/stretchr/testify/require" - "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/consumer/consumertest" + "go.opentelemetry.io/collector/receiver/receivertest" ) func TestNewFactory(t *testing.T) { factory := NewFactory() _, err := factory.CreateMetricsReceiver( context.Background(), - componenttest.NewNopReceiverCreateSettings(), + receivertest.NewNopCreateSettings(), factory.CreateDefaultConfig(), consumertest.NewNop(), ) diff --git a/receiver/sqlqueryreceiver/go.mod b/receiver/sqlqueryreceiver/go.mod index 19a616e65dc92..3aca2ff1aa569 100644 --- a/receiver/sqlqueryreceiver/go.mod +++ b/receiver/sqlqueryreceiver/go.mod @@ -12,11 +12,11 @@ require ( github.com/snowflakedb/gosnowflake v1.6.15 github.com/stretchr/testify v1.8.1 github.com/testcontainers/testcontainers-go v0.15.0 - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector v0.67.0 + go.opentelemetry.io/collector/component v0.67.0 + go.opentelemetry.io/collector/confmap v0.67.0 + go.opentelemetry.io/collector/consumer v0.67.0 + go.opentelemetry.io/collector/pdata v1.0.0-rc1 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.24.0 ) @@ -91,7 +91,7 @@ require ( github.com/rogpeppe/go-internal v1.8.1 // indirect github.com/sirupsen/logrus v1.9.0 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/featuregate v0.67.0 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/receiver/sqlqueryreceiver/go.sum b/receiver/sqlqueryreceiver/go.sum index 54e5f994e86d6..8fab372c1fec3 100644 --- a/receiver/sqlqueryreceiver/go.sum +++ b/receiver/sqlqueryreceiver/go.sum @@ -958,18 +958,18 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/component v0.67.0 h1:GCBRZAqk4yNaT4L1uwlbbwophFHrxYccLZ4Uj1Ifs/M= +go.opentelemetry.io/collector/component v0.67.0/go.mod h1:Txa2lm9oe7xsGQN8u7GdUIrRpAHFIKsTO4Qi3/CSmKk= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/receiver/sqlqueryreceiver/integration_test.go b/receiver/sqlqueryreceiver/integration_test.go index 3e91e975f3d4d..568053266767c 100644 --- a/receiver/sqlqueryreceiver/integration_test.go +++ b/receiver/sqlqueryreceiver/integration_test.go @@ -32,6 +32,7 @@ import ( "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/consumer/consumertest" "go.opentelemetry.io/collector/pdata/pmetric" + "go.opentelemetry.io/collector/receiver/receivertest" ) func TestPostgresIntegration(t *testing.T) { @@ -134,7 +135,7 @@ func TestPostgresIntegration(t *testing.T) { consumer := &consumertest.MetricsSink{} receiver, err := factory.CreateMetricsReceiver( ctx, - componenttest.NewNopReceiverCreateSettings(), + receivertest.NewNopCreateSettings(), config, consumer, ) @@ -219,7 +220,7 @@ func TestOracleDBIntegration(t *testing.T) { consumer := &consumertest.MetricsSink{} receiver, err := factory.CreateMetricsReceiver( ctx, - componenttest.NewNopReceiverCreateSettings(), + receivertest.NewNopCreateSettings(), config, consumer, ) diff --git a/receiver/sqlqueryreceiver/receiver.go b/receiver/sqlqueryreceiver/receiver.go index 967b310d43791..4ac1228aa9e24 100644 --- a/receiver/sqlqueryreceiver/receiver.go +++ b/receiver/sqlqueryreceiver/receiver.go @@ -21,6 +21,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/consumer" + "go.opentelemetry.io/collector/receiver" "go.opentelemetry.io/collector/receiver/scraperhelper" "go.uber.org/zap" ) @@ -31,13 +32,13 @@ type dbProviderFunc func() (*sql.DB, error) type clientProviderFunc func(*sql.DB, string, *zap.Logger) dbClient -func createReceiverFunc(sqlOpenerFunc sqlOpenerFunc, clientProviderFunc clientProviderFunc) component.CreateMetricsReceiverFunc { +func createReceiverFunc(sqlOpenerFunc sqlOpenerFunc, clientProviderFunc clientProviderFunc) receiver.CreateMetricsFunc { return func( ctx context.Context, - settings component.ReceiverCreateSettings, + settings receiver.CreateSettings, cfg component.Config, consumer consumer.Metrics, - ) (component.MetricsReceiver, error) { + ) (receiver.Metrics, error) { sqlCfg := cfg.(*Config) var opts []scraperhelper.ScraperControllerOption for i, query := range sqlCfg.Queries { diff --git a/receiver/sqlqueryreceiver/receiver_test.go b/receiver/sqlqueryreceiver/receiver_test.go index 9a14f0dde4771..ef0e2ed754cf4 100644 --- a/receiver/sqlqueryreceiver/receiver_test.go +++ b/receiver/sqlqueryreceiver/receiver_test.go @@ -23,6 +23,7 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/consumer/consumertest" + "go.opentelemetry.io/collector/receiver/receivertest" "go.opentelemetry.io/collector/receiver/scraperhelper" "go.uber.org/zap" ) @@ -32,7 +33,7 @@ func TestCreateReceiver(t *testing.T) { ctx := context.Background() receiver, err := createReceiver( ctx, - componenttest.NewNopReceiverCreateSettings(), + receivertest.NewNopCreateSettings(), &Config{ ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ CollectionInterval: 10 * time.Second, diff --git a/receiver/sqlserverreceiver/factory.go b/receiver/sqlserverreceiver/factory.go index 4a6d1c96ded0b..b60969172de63 100644 --- a/receiver/sqlserverreceiver/factory.go +++ b/receiver/sqlserverreceiver/factory.go @@ -19,6 +19,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" + "go.opentelemetry.io/collector/receiver" "go.opentelemetry.io/collector/receiver/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/sqlserverreceiver/internal/metadata" @@ -30,11 +31,11 @@ const ( ) // NewFactory creates a factory for SQL Server receiver. -func NewFactory() component.ReceiverFactory { - return component.NewReceiverFactory( +func NewFactory() receiver.Factory { + return receiver.NewFactory( typeStr, createDefaultConfig, - component.WithMetricsReceiver(createMetricsReceiver, stability)) + receiver.WithMetrics(createMetricsReceiver, stability)) } func createDefaultConfig() component.Config { diff --git a/receiver/sqlserverreceiver/factory_others.go b/receiver/sqlserverreceiver/factory_others.go index da9cf3162b016..fa9cbd69ac747 100644 --- a/receiver/sqlserverreceiver/factory_others.go +++ b/receiver/sqlserverreceiver/factory_others.go @@ -23,14 +23,15 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/consumer" + "go.opentelemetry.io/collector/receiver" ) // createMetricsReceiver creates a metrics receiver based on provided config. func createMetricsReceiver( ctx context.Context, - params component.ReceiverCreateSettings, + params receiver.CreateSettings, cfg component.Config, consumer consumer.Metrics, -) (component.MetricsReceiver, error) { +) (receiver.Metrics, error) { return nil, errors.New("the sqlserver receiver is only supported on Windows") } diff --git a/receiver/sqlserverreceiver/factory_others_test.go b/receiver/sqlserverreceiver/factory_others_test.go index 197cf75c3fdc2..7eb1fa68882e3 100644 --- a/receiver/sqlserverreceiver/factory_others_test.go +++ b/receiver/sqlserverreceiver/factory_others_test.go @@ -22,14 +22,14 @@ import ( "testing" "github.com/stretchr/testify/assert" - "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/consumer/consumertest" + "go.opentelemetry.io/collector/receiver/receivertest" ) func TestCreateMetricsReceiver(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() - mReceiver, err := factory.CreateMetricsReceiver(context.Background(), componenttest.NewNopReceiverCreateSettings(), cfg, consumertest.NewNop()) + mReceiver, err := factory.CreateMetricsReceiver(context.Background(), receivertest.NewNopCreateSettings(), cfg, consumertest.NewNop()) assert.EqualError(t, err, "the sqlserver receiver is only supported on Windows") assert.Nil(t, mReceiver) diff --git a/receiver/sqlserverreceiver/factory_windows.go b/receiver/sqlserverreceiver/factory_windows.go index fa6b5e82af74c..c57a75e843efe 100644 --- a/receiver/sqlserverreceiver/factory_windows.go +++ b/receiver/sqlserverreceiver/factory_windows.go @@ -23,6 +23,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/consumer" + "go.opentelemetry.io/collector/receiver" "go.opentelemetry.io/collector/receiver/scraperhelper" ) @@ -31,10 +32,10 @@ var errConfigNotSqlServer = errors.New("config was not a sqlserver receiver conf // createMetricsReceiver creates a metrics receiver based on provided config. func createMetricsReceiver( _ context.Context, - params component.ReceiverCreateSettings, + params receiver.CreateSettings, receiverCfg component.Config, metricsConsumer consumer.Metrics, -) (component.MetricsReceiver, error) { +) (receiver.Metrics, error) { cfg, ok := receiverCfg.(*Config) if !ok { return nil, errConfigNotSqlServer diff --git a/receiver/sqlserverreceiver/factory_windows_test.go b/receiver/sqlserverreceiver/factory_windows_test.go index 5c044bd59f5a1..24f1ac19f3e31 100644 --- a/receiver/sqlserverreceiver/factory_windows_test.go +++ b/receiver/sqlserverreceiver/factory_windows_test.go @@ -24,6 +24,7 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/consumer/consumertest" + "go.opentelemetry.io/collector/receiver/receivertest" ) func TestCreateMetricsReceiver(t *testing.T) { @@ -38,7 +39,7 @@ func TestCreateMetricsReceiver(t *testing.T) { cfg := factory.CreateDefaultConfig() r, err := factory.CreateMetricsReceiver( context.Background(), - componenttest.NewNopReceiverCreateSettings(), + receivertest.NewNopCreateSettings(), cfg, consumertest.NewNop(), ) @@ -53,7 +54,7 @@ func TestCreateMetricsReceiver(t *testing.T) { factory := NewFactory() _, err := factory.CreateMetricsReceiver( context.Background(), - componenttest.NewNopReceiverCreateSettings(), + receivertest.NewNopCreateSettings(), nil, consumertest.NewNop(), ) diff --git a/receiver/sqlserverreceiver/go.mod b/receiver/sqlserverreceiver/go.mod index 6279c1ec41a80..ee8ddffd2aa9d 100644 --- a/receiver/sqlserverreceiver/go.mod +++ b/receiver/sqlserverreceiver/go.mod @@ -3,14 +3,14 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/receiver/sqlser go 1.18 require ( - github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/winperfcounters v0.66.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/winperfcounters v0.67.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector v0.67.0 + go.opentelemetry.io/collector/component v0.67.0 + go.opentelemetry.io/collector/confmap v0.67.0 + go.opentelemetry.io/collector/consumer v0.67.0 + go.opentelemetry.io/collector/pdata v1.0.0-rc1 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.24.0 ) @@ -33,7 +33,7 @@ require ( github.com/rogpeppe/go-internal v1.8.1 // indirect github.com/stretchr/objx v0.5.0 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/featuregate v0.67.0 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/receiver/sqlserverreceiver/go.sum b/receiver/sqlserverreceiver/go.sum index eceeb9d2e36b3..fef836867b06f 100644 --- a/receiver/sqlserverreceiver/go.sum +++ b/receiver/sqlserverreceiver/go.sum @@ -284,18 +284,18 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/component v0.67.0 h1:GCBRZAqk4yNaT4L1uwlbbwophFHrxYccLZ4Uj1Ifs/M= +go.opentelemetry.io/collector/component v0.67.0/go.mod h1:Txa2lm9oe7xsGQN8u7GdUIrRpAHFIKsTO4Qi3/CSmKk= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/receiver/sqlserverreceiver/internal/metadata/generated_metrics.go b/receiver/sqlserverreceiver/internal/metadata/generated_metrics.go index 68ecc03f1da27..58ac6463ca337 100644 --- a/receiver/sqlserverreceiver/internal/metadata/generated_metrics.go +++ b/receiver/sqlserverreceiver/internal/metadata/generated_metrics.go @@ -9,6 +9,7 @@ import ( "go.opentelemetry.io/collector/confmap" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" + "go.opentelemetry.io/collector/receiver" ) // MetricSettings provides common settings for a particular metric. @@ -1176,7 +1177,7 @@ func WithStartTime(startTime pcommon.Timestamp) metricBuilderOption { } } -func NewMetricsBuilder(ms MetricsSettings, settings component.ReceiverCreateSettings, options ...metricBuilderOption) *MetricsBuilder { +func NewMetricsBuilder(ms MetricsSettings, settings receiver.CreateSettings, options ...metricBuilderOption) *MetricsBuilder { mb := &MetricsBuilder{ startTime: pcommon.NewTimestampFromTime(time.Now()), metricsBuffer: pmetric.NewMetrics(), diff --git a/receiver/sqlserverreceiver/internal/metadata/generated_metrics_test.go b/receiver/sqlserverreceiver/internal/metadata/generated_metrics_test.go index 9f329bf80d027..6429b34ad9bfe 100644 --- a/receiver/sqlserverreceiver/internal/metadata/generated_metrics_test.go +++ b/receiver/sqlserverreceiver/internal/metadata/generated_metrics_test.go @@ -7,9 +7,9 @@ import ( "testing" "github.com/stretchr/testify/assert" - "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" + "go.opentelemetry.io/collector/receiver/receivertest" "go.uber.org/zap" "go.uber.org/zap/zaptest/observer" ) @@ -17,7 +17,7 @@ import ( func TestDefaultMetrics(t *testing.T) { start := pcommon.Timestamp(1_000_000_000) ts := pcommon.Timestamp(1_000_001_000) - mb := NewMetricsBuilder(DefaultMetricsSettings(), componenttest.NewNopReceiverCreateSettings(), WithStartTime(start)) + mb := NewMetricsBuilder(DefaultMetricsSettings(), receivertest.NewNopCreateSettings(), WithStartTime(start)) enabledMetrics := make(map[string]bool) enabledMetrics["sqlserver.batch.request.rate"] = true @@ -121,7 +121,7 @@ func TestAllMetrics(t *testing.T) { SqlserverUserConnectionCount: MetricSettings{Enabled: true}, } observedZapCore, observedLogs := observer.New(zap.WarnLevel) - settings := componenttest.NewNopReceiverCreateSettings() + settings := receivertest.NewNopCreateSettings() settings.Logger = zap.New(observedZapCore) mb := NewMetricsBuilder(metricsSettings, settings, WithStartTime(start)) @@ -424,7 +424,7 @@ func TestNoMetrics(t *testing.T) { SqlserverUserConnectionCount: MetricSettings{Enabled: false}, } observedZapCore, observedLogs := observer.New(zap.WarnLevel) - settings := componenttest.NewNopReceiverCreateSettings() + settings := receivertest.NewNopCreateSettings() settings.Logger = zap.New(observedZapCore) mb := NewMetricsBuilder(metricsSettings, settings, WithStartTime(start)) diff --git a/receiver/sqlserverreceiver/scraper.go b/receiver/sqlserverreceiver/scraper.go index c8ca6827361e8..3da65ac29b524 100644 --- a/receiver/sqlserverreceiver/scraper.go +++ b/receiver/sqlserverreceiver/scraper.go @@ -24,6 +24,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" + "go.opentelemetry.io/collector/receiver" "go.uber.org/multierr" "go.uber.org/zap" @@ -49,7 +50,7 @@ type watcherRecorder struct { type curriedRecorder func(*metadata.MetricsBuilder, pcommon.Timestamp) // newSqlServerScraper returns a new sqlServerScraper. -func newSqlServerScraper(params component.ReceiverCreateSettings, cfg *Config) *sqlServerScraper { +func newSqlServerScraper(params receiver.CreateSettings, cfg *Config) *sqlServerScraper { metricsBuilder := metadata.NewMetricsBuilder(cfg.Metrics, params) return &sqlServerScraper{logger: params.Logger, config: cfg, metricsBuilder: metricsBuilder} } diff --git a/receiver/sqlserverreceiver/scraper_test.go b/receiver/sqlserverreceiver/scraper_test.go index 3f6b6b9f3c3a9..3782cc03ad952 100644 --- a/receiver/sqlserverreceiver/scraper_test.go +++ b/receiver/sqlserverreceiver/scraper_test.go @@ -25,7 +25,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - "go.opentelemetry.io/collector/component/componenttest" + "go.opentelemetry.io/collector/receiver/receivertest" "go.uber.org/zap" "go.uber.org/zap/zaptest/observer" @@ -94,7 +94,7 @@ func TestSqlServerScraper(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig().(*Config) logger, obsLogs := observer.New(zap.WarnLevel) - settings := componenttest.NewNopReceiverCreateSettings() + settings := receivertest.NewNopCreateSettings() settings.Logger = zap.New(logger) s := newSqlServerScraper(settings, cfg) @@ -124,7 +124,7 @@ var dbInstance = "db-instance" func TestScrape(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig().(*Config) - settings := componenttest.NewNopReceiverCreateSettings() + settings := receivertest.NewNopCreateSettings() scraper := newSqlServerScraper(settings, cfg) for i, rec := range perfCounterRecorders { diff --git a/receiver/statsdreceiver/factory.go b/receiver/statsdreceiver/factory.go index 447448986e840..9be4e19eae707 100644 --- a/receiver/statsdreceiver/factory.go +++ b/receiver/statsdreceiver/factory.go @@ -22,6 +22,7 @@ import ( "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confignet" "go.opentelemetry.io/collector/consumer" + "go.opentelemetry.io/collector/receiver" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/statsdreceiver/protocol" ) @@ -42,11 +43,11 @@ var ( ) // NewFactory creates a factory for the StatsD receiver. -func NewFactory() component.ReceiverFactory { - return component.NewReceiverFactory( +func NewFactory() receiver.Factory { + return receiver.NewFactory( typeStr, createDefaultConfig, - component.WithMetricsReceiver(createMetricsReceiver, stability), + receiver.WithMetrics(createMetricsReceiver, stability), ) } @@ -66,10 +67,10 @@ func createDefaultConfig() component.Config { func createMetricsReceiver( _ context.Context, - params component.ReceiverCreateSettings, + params receiver.CreateSettings, cfg component.Config, consumer consumer.Metrics, -) (component.MetricsReceiver, error) { +) (receiver.Metrics, error) { c := cfg.(*Config) err := c.validate() if err != nil { diff --git a/receiver/statsdreceiver/factory_test.go b/receiver/statsdreceiver/factory_test.go index 2f1fb07f6d37e..ce54b62511b5c 100644 --- a/receiver/statsdreceiver/factory_test.go +++ b/receiver/statsdreceiver/factory_test.go @@ -24,6 +24,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/consumer/consumertest" + "go.opentelemetry.io/collector/receiver/receivertest" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/statsdreceiver/protocol" ) @@ -51,7 +52,7 @@ func TestCreateReceiver(t *testing.T) { cfg := createDefaultConfig().(*Config) cfg.NetAddr.Endpoint = "localhost:0" // Endpoint is required, not going to be used here. - params := componenttest.NewNopReceiverCreateSettings() + params := receivertest.NewNopCreateSettings() tReceiver, err := createMetricsReceiver(context.Background(), params, cfg, consumertest.NewNop()) assert.NoError(t, err) assert.NotNil(t, tReceiver, "receiver creation failed") @@ -66,7 +67,7 @@ func TestCreateReceiverWithConfigErr(t *testing.T) { } receiver, err := createMetricsReceiver( context.Background(), - componenttest.NewNopReceiverCreateSettings(), + receivertest.NewNopCreateSettings(), cfg, consumertest.NewNop(), ) @@ -91,7 +92,7 @@ func TestCreateReceiverWithHistogramConfigError(t *testing.T) { } receiver, err := createMetricsReceiver( context.Background(), - componenttest.NewNopReceiverCreateSettings(), + receivertest.NewNopCreateSettings(), cfg, consumertest.NewNop(), ) @@ -117,7 +118,7 @@ func TestCreateReceiverWithHistogramGoodConfig(t *testing.T) { } receiver, err := createMetricsReceiver( context.Background(), - componenttest.NewNopReceiverCreateSettings(), + receivertest.NewNopCreateSettings(), cfg, consumertest.NewNop(), ) @@ -143,7 +144,7 @@ func TestCreateReceiverWithInvalidHistogramConfig(t *testing.T) { } receiver, err := createMetricsReceiver( context.Background(), - componenttest.NewNopReceiverCreateSettings(), + receivertest.NewNopCreateSettings(), cfg, consumertest.NewNop(), ) @@ -155,7 +156,7 @@ func TestCreateReceiverWithInvalidHistogramConfig(t *testing.T) { func TestCreateMetricsReceiverWithNilConsumer(t *testing.T) { receiver, err := createMetricsReceiver( context.Background(), - componenttest.NewNopReceiverCreateSettings(), + receivertest.NewNopCreateSettings(), createDefaultConfig(), nil, ) diff --git a/receiver/statsdreceiver/go.mod b/receiver/statsdreceiver/go.mod index 7abd7c094b119..69822c3d5d631 100644 --- a/receiver/statsdreceiver/go.mod +++ b/receiver/statsdreceiver/go.mod @@ -4,15 +4,15 @@ go 1.18 require ( github.com/lightstep/go-expohisto v1.0.0 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.66.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.67.0 github.com/stretchr/testify v1.8.1 go.opencensus.io v0.24.0 - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector v0.67.0 + go.opentelemetry.io/collector/component v0.67.0 + go.opentelemetry.io/collector/confmap v0.67.0 + go.opentelemetry.io/collector/consumer v0.67.0 + go.opentelemetry.io/collector/pdata v1.0.0-rc1 go.opentelemetry.io/otel v1.11.1 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.24.0 @@ -46,7 +46,7 @@ require ( github.com/prometheus/procfs v0.8.0 // indirect github.com/prometheus/statsd_exporter v0.22.7 // indirect github.com/rogpeppe/go-internal v1.6.1 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/featuregate v0.67.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.33.0 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/sdk v1.11.1 // indirect diff --git a/receiver/statsdreceiver/go.sum b/receiver/statsdreceiver/go.sum index 3b37f2b504d79..b198eda8ef3cc 100644 --- a/receiver/statsdreceiver/go.sum +++ b/receiver/statsdreceiver/go.sum @@ -373,19 +373,19 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 h1:Q5L9Urod3c8as6ZYaoaqBjarx/HXxsxy34DFZIU2fO4= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/component v0.67.0 h1:GCBRZAqk4yNaT4L1uwlbbwophFHrxYccLZ4Uj1Ifs/M= +go.opentelemetry.io/collector/component v0.67.0/go.mod h1:Txa2lm9oe7xsGQN8u7GdUIrRpAHFIKsTO4Qi3/CSmKk= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= +go.opentelemetry.io/collector/semconv v0.67.0 h1:zLAvcQa6Kgow52FFLrmk7/9ZVtEYyA73+xDtCcFG78Q= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/receiver/statsdreceiver/receiver.go b/receiver/statsdreceiver/receiver.go index 738c157bbfe67..5d0f723e19287 100644 --- a/receiver/statsdreceiver/receiver.go +++ b/receiver/statsdreceiver/receiver.go @@ -25,16 +25,17 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/pdata/pmetric" + "go.opentelemetry.io/collector/receiver" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/statsdreceiver/protocol" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/statsdreceiver/transport" ) -var _ component.MetricsReceiver = (*statsdReceiver)(nil) +var _ receiver.Metrics = (*statsdReceiver)(nil) -// statsdReceiver implements the component.MetricsReceiver for StatsD protocol. +// statsdReceiver implements the receiver.Metrics for StatsD protocol. type statsdReceiver struct { - settings component.ReceiverCreateSettings + settings receiver.CreateSettings config *Config server transport.Server @@ -46,10 +47,10 @@ type statsdReceiver struct { // New creates the StatsD receiver with the given parameters. func New( - set component.ReceiverCreateSettings, + set receiver.CreateSettings, config Config, nextConsumer consumer.Metrics, -) (component.MetricsReceiver, error) { +) (receiver.Metrics, error) { if nextConsumer == nil { return nil, component.ErrNilNextConsumer } diff --git a/receiver/statsdreceiver/receiver_test.go b/receiver/statsdreceiver/receiver_test.go index 43cb0e41ff00d..73a5a393ad1fd 100644 --- a/receiver/statsdreceiver/receiver_test.go +++ b/receiver/statsdreceiver/receiver_test.go @@ -31,6 +31,7 @@ import ( "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/consumer/consumertest" "go.opentelemetry.io/collector/pdata/pmetric" + "go.opentelemetry.io/collector/receiver/receivertest" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/common/testutil" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/statsdreceiver/transport" @@ -72,7 +73,7 @@ func Test_statsdreceiver_New(t *testing.T) { } for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { - _, err := New(componenttest.NewNopReceiverCreateSettings(), tt.args.config, tt.args.nextConsumer) + _, err := New(receivertest.NewNopCreateSettings(), tt.args.config, tt.args.nextConsumer) assert.Equal(t, tt.wantErr, err) }) } @@ -82,7 +83,7 @@ func TestStatsdReceiver_Flush(t *testing.T) { ctx := context.Background() cfg := createDefaultConfig().(*Config) nextConsumer := consumertest.NewNop() - rcv, err := New(componenttest.NewNopReceiverCreateSettings(), *cfg, nextConsumer) + rcv, err := New(receivertest.NewNopCreateSettings(), *cfg, nextConsumer) assert.NoError(t, err) r := rcv.(*statsdReceiver) var metrics = pmetric.NewMetrics() @@ -127,7 +128,7 @@ func Test_statsdreceiver_EndToEnd(t *testing.T) { cfg := tt.configFn() cfg.NetAddr.Endpoint = addr sink := new(consumertest.MetricsSink) - rcv, err := New(componenttest.NewNopReceiverCreateSettings(), *cfg, sink) + rcv, err := New(receivertest.NewNopCreateSettings(), *cfg, sink) require.NoError(t, err) r := rcv.(*statsdReceiver) diff --git a/receiver/statsdreceiver/reporter.go b/receiver/statsdreceiver/reporter.go index cc35bc6c912ec..b66d4cd922131 100644 --- a/receiver/statsdreceiver/reporter.go +++ b/receiver/statsdreceiver/reporter.go @@ -18,8 +18,8 @@ import ( "context" "go.opencensus.io/trace" - "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/obsreport" + "go.opentelemetry.io/collector/receiver" "go.uber.org/zap" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/statsdreceiver/transport" @@ -35,7 +35,7 @@ type reporter struct { var _ transport.Reporter = (*reporter)(nil) -func newReporter(set component.ReceiverCreateSettings) (transport.Reporter, error) { +func newReporter(set receiver.CreateSettings) (transport.Reporter, error) { obsrecv, err := obsreport.NewReceiver(obsreport.ReceiverSettings{ ReceiverID: set.ID, Transport: "tcp", diff --git a/receiver/statsdreceiver/reporter_test.go b/receiver/statsdreceiver/reporter_test.go index 698c19d7adc24..e37acce9cc4bb 100644 --- a/receiver/statsdreceiver/reporter_test.go +++ b/receiver/statsdreceiver/reporter_test.go @@ -39,12 +39,12 @@ func TestReporterObservability(t *testing.T) { reporter.OnMetricsProcessed(ctx, 17, nil) - require.NoError(t, obsreporttest.CheckReceiverMetrics(tt, receiverID, "tcp", 17, 0)) + require.NoError(t, tt.CheckReceiverMetrics("tcp", 17, 0)) // Below just exercise the error paths. err = errors.New("fake error for tests") reporter.OnTranslationError(ctx, err) reporter.OnMetricsProcessed(ctx, 10, err) - require.NoError(t, obsreporttest.CheckReceiverMetrics(tt, receiverID, "tcp", 17, 10)) + require.NoError(t, tt.CheckReceiverMetrics("tcp", 17, 10)) } diff --git a/receiver/syslogreceiver/go.mod b/receiver/syslogreceiver/go.mod index 8192669430909..678d8fd2722f2 100644 --- a/receiver/syslogreceiver/go.mod +++ b/receiver/syslogreceiver/go.mod @@ -3,13 +3,13 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/receiver/syslog go 1.18 require ( - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.66.0 + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.67.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector v0.67.0 + go.opentelemetry.io/collector/component v0.67.0 + go.opentelemetry.io/collector/confmap v0.67.0 + go.opentelemetry.io/collector/consumer v0.67.0 + go.opentelemetry.io/collector/pdata v1.0.0-rc1 ) require ( @@ -34,7 +34,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rogpeppe/go-internal v1.8.1 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/featuregate v0.67.0 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/receiver/syslogreceiver/go.sum b/receiver/syslogreceiver/go.sum index 1c887dc563e65..6319193b88263 100644 --- a/receiver/syslogreceiver/go.sum +++ b/receiver/syslogreceiver/go.sum @@ -310,18 +310,18 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/component v0.67.0 h1:GCBRZAqk4yNaT4L1uwlbbwophFHrxYccLZ4Uj1Ifs/M= +go.opentelemetry.io/collector/component v0.67.0/go.mod h1:Txa2lm9oe7xsGQN8u7GdUIrRpAHFIKsTO4Qi3/CSmKk= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/receiver/syslogreceiver/syslog.go b/receiver/syslogreceiver/syslog.go index 6620ed40b97bb..f3fba3c301f91 100644 --- a/receiver/syslogreceiver/syslog.go +++ b/receiver/syslogreceiver/syslog.go @@ -18,6 +18,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/confmap" + "go.opentelemetry.io/collector/receiver" "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/adapter" "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/operator" @@ -32,7 +33,7 @@ const ( ) // NewFactory creates a factory for syslog receiver -func NewFactory() component.ReceiverFactory { +func NewFactory() receiver.Factory { return adapter.NewFactory(ReceiverType{}, stability) } diff --git a/receiver/syslogreceiver/syslog_test.go b/receiver/syslogreceiver/syslog_test.go index 188cbde01c225..da92c82051099 100644 --- a/receiver/syslogreceiver/syslog_test.go +++ b/receiver/syslogreceiver/syslog_test.go @@ -30,6 +30,7 @@ import ( "go.opentelemetry.io/collector/confmap/confmaptest" "go.opentelemetry.io/collector/consumer/consumertest" "go.opentelemetry.io/collector/pdata/pcommon" + "go.opentelemetry.io/collector/receiver/receivertest" "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/adapter" "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/operator" @@ -51,7 +52,7 @@ func testSyslog(t *testing.T, cfg *SysLogConfig) { f := NewFactory() sink := new(consumertest.LogsSink) - rcvr, err := f.CreateLogsReceiver(context.Background(), componenttest.NewNopReceiverCreateSettings(), cfg, sink) + rcvr, err := f.CreateLogsReceiver(context.Background(), receivertest.NewNopCreateSettings(), cfg, sink) require.NoError(t, err) require.NoError(t, rcvr.Start(context.Background(), componenttest.NewNopHost())) @@ -149,7 +150,7 @@ func TestDecodeInputConfigFailure(t *testing.T) { return *c }(), } - receiver, err := factory.CreateLogsReceiver(context.Background(), componenttest.NewNopReceiverCreateSettings(), badCfg, sink) + receiver, err := factory.CreateLogsReceiver(context.Background(), receivertest.NewNopCreateSettings(), badCfg, sink) require.Error(t, err, "receiver creation should fail if input config isn't valid") require.Nil(t, receiver, "receiver creation should fail if input config isn't valid") } diff --git a/receiver/tcplogreceiver/go.mod b/receiver/tcplogreceiver/go.mod index 2a1afc7d1f899..823eea7c365d1 100644 --- a/receiver/tcplogreceiver/go.mod +++ b/receiver/tcplogreceiver/go.mod @@ -3,12 +3,12 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/receiver/tcplog go 1.18 require ( - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.66.0 + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.67.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector v0.67.0 + go.opentelemetry.io/collector/component v0.67.0 + go.opentelemetry.io/collector/confmap v0.67.0 + go.opentelemetry.io/collector/consumer v0.67.0 ) require ( @@ -31,8 +31,8 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rogpeppe/go-internal v1.8.1 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/featuregate v0.67.0 // indirect + go.opentelemetry.io/collector/pdata v1.0.0-rc1 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/receiver/tcplogreceiver/go.sum b/receiver/tcplogreceiver/go.sum index 0718a15a3d02d..427f5615de4f3 100644 --- a/receiver/tcplogreceiver/go.sum +++ b/receiver/tcplogreceiver/go.sum @@ -306,18 +306,18 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/component v0.67.0 h1:GCBRZAqk4yNaT4L1uwlbbwophFHrxYccLZ4Uj1Ifs/M= +go.opentelemetry.io/collector/component v0.67.0/go.mod h1:Txa2lm9oe7xsGQN8u7GdUIrRpAHFIKsTO4Qi3/CSmKk= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/receiver/tcplogreceiver/tcp.go b/receiver/tcplogreceiver/tcp.go index 646d98ddf3c2f..1846c6fcaeea3 100644 --- a/receiver/tcplogreceiver/tcp.go +++ b/receiver/tcplogreceiver/tcp.go @@ -17,6 +17,7 @@ package tcplogreceiver // import "github.com/open-telemetry/opentelemetry-collec import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" + "go.opentelemetry.io/collector/receiver" "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/adapter" "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/operator" @@ -29,7 +30,7 @@ const ( ) // NewFactory creates a factory for tcp receiver -func NewFactory() component.ReceiverFactory { +func NewFactory() receiver.Factory { return adapter.NewFactory(ReceiverType{}, stability) } diff --git a/receiver/tcplogreceiver/tcp_test.go b/receiver/tcplogreceiver/tcp_test.go index 0cb44b2c367bc..ee9584feb0143 100644 --- a/receiver/tcplogreceiver/tcp_test.go +++ b/receiver/tcplogreceiver/tcp_test.go @@ -29,6 +29,7 @@ import ( "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/confmap/confmaptest" "go.opentelemetry.io/collector/consumer/consumertest" + "go.opentelemetry.io/collector/receiver/receivertest" "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/adapter" "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/operator" @@ -44,7 +45,7 @@ func testTCP(t *testing.T, cfg *TCPLogConfig) { f := NewFactory() sink := new(consumertest.LogsSink) - rcvr, err := f.CreateLogsReceiver(context.Background(), componenttest.NewNopReceiverCreateSettings(), cfg, sink) + rcvr, err := f.CreateLogsReceiver(context.Background(), receivertest.NewNopCreateSettings(), cfg, sink) require.NoError(t, err) require.NoError(t, rcvr.Start(context.Background(), componenttest.NewNopHost())) @@ -115,7 +116,7 @@ func TestDecodeInputConfigFailure(t *testing.T) { return *c }(), } - receiver, err := factory.CreateLogsReceiver(context.Background(), componenttest.NewNopReceiverCreateSettings(), badCfg, consumertest.NewNop()) + receiver, err := factory.CreateLogsReceiver(context.Background(), receivertest.NewNopCreateSettings(), badCfg, consumertest.NewNop()) require.Error(t, err, "receiver creation should fail if input config isn't valid") require.Nil(t, receiver, "receiver creation should fail if input config isn't valid") } diff --git a/receiver/udplogreceiver/go.mod b/receiver/udplogreceiver/go.mod index 4494ba25a3ced..b9b16492b76ab 100644 --- a/receiver/udplogreceiver/go.mod +++ b/receiver/udplogreceiver/go.mod @@ -3,12 +3,12 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/receiver/udplog go 1.18 require ( - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.66.0 + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.67.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector v0.67.0 + go.opentelemetry.io/collector/component v0.67.0 + go.opentelemetry.io/collector/confmap v0.67.0 + go.opentelemetry.io/collector/consumer v0.67.0 ) require ( @@ -30,8 +30,8 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rogpeppe/go-internal v1.8.1 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/featuregate v0.67.0 // indirect + go.opentelemetry.io/collector/pdata v1.0.0-rc1 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/receiver/udplogreceiver/go.sum b/receiver/udplogreceiver/go.sum index 5b92a495aa8b4..e22b023959628 100644 --- a/receiver/udplogreceiver/go.sum +++ b/receiver/udplogreceiver/go.sum @@ -305,18 +305,18 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/component v0.67.0 h1:GCBRZAqk4yNaT4L1uwlbbwophFHrxYccLZ4Uj1Ifs/M= +go.opentelemetry.io/collector/component v0.67.0/go.mod h1:Txa2lm9oe7xsGQN8u7GdUIrRpAHFIKsTO4Qi3/CSmKk= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/receiver/udplogreceiver/udp.go b/receiver/udplogreceiver/udp.go index 00aadf29fcddb..7bd4af717571e 100644 --- a/receiver/udplogreceiver/udp.go +++ b/receiver/udplogreceiver/udp.go @@ -17,6 +17,7 @@ package udplogreceiver // import "github.com/open-telemetry/opentelemetry-collec import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" + "go.opentelemetry.io/collector/receiver" "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/adapter" "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/operator" @@ -29,7 +30,7 @@ const ( ) // NewFactory creates a factory for udp receiver -func NewFactory() component.ReceiverFactory { +func NewFactory() receiver.Factory { return adapter.NewFactory(ReceiverType{}, stability) } diff --git a/receiver/udplogreceiver/udp_test.go b/receiver/udplogreceiver/udp_test.go index 1c89502873a56..82374d4a5fcef 100644 --- a/receiver/udplogreceiver/udp_test.go +++ b/receiver/udplogreceiver/udp_test.go @@ -29,6 +29,7 @@ import ( "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/confmap/confmaptest" "go.opentelemetry.io/collector/consumer/consumertest" + "go.opentelemetry.io/collector/receiver/receivertest" "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/adapter" "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/operator" @@ -44,7 +45,7 @@ func testUDP(t *testing.T, cfg *UDPLogConfig) { f := NewFactory() sink := new(consumertest.LogsSink) - rcvr, err := f.CreateLogsReceiver(context.Background(), componenttest.NewNopReceiverCreateSettings(), cfg, sink) + rcvr, err := f.CreateLogsReceiver(context.Background(), receivertest.NewNopCreateSettings(), cfg, sink) require.NoError(t, err) require.NoError(t, rcvr.Start(context.Background(), componenttest.NewNopHost())) @@ -120,7 +121,7 @@ func TestDecodeInputConfigFailure(t *testing.T) { return *c }(), } - receiver, err := factory.CreateLogsReceiver(context.Background(), componenttest.NewNopReceiverCreateSettings(), badCfg, sink) + receiver, err := factory.CreateLogsReceiver(context.Background(), receivertest.NewNopCreateSettings(), badCfg, sink) require.Error(t, err, "receiver creation should fail if input config isn't valid") require.Nil(t, receiver, "receiver creation should fail if input config isn't valid") } diff --git a/receiver/vcenterreceiver/factory.go b/receiver/vcenterreceiver/factory.go index 88cdab91879b5..043c80ba3fe08 100644 --- a/receiver/vcenterreceiver/factory.go +++ b/receiver/vcenterreceiver/factory.go @@ -23,6 +23,7 @@ import ( "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/configtls" "go.opentelemetry.io/collector/consumer" + "go.opentelemetry.io/collector/receiver" "go.opentelemetry.io/collector/receiver/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/vcenterreceiver/internal/metadata" @@ -34,11 +35,11 @@ const ( ) // NewFactory returns the receiver factory for the vcenterreceiver -func NewFactory() component.ReceiverFactory { - return component.NewReceiverFactory( +func NewFactory() receiver.Factory { + return receiver.NewFactory( typeStr, createDefaultConfig, - component.WithMetricsReceiver(createMetricsReceiver, stability), + receiver.WithMetrics(createMetricsReceiver, stability), ) } @@ -57,10 +58,10 @@ var errConfigNotVcenter = errors.New("config was not an vcenter receiver config" func createMetricsReceiver( _ context.Context, - params component.ReceiverCreateSettings, + params receiver.CreateSettings, rConf component.Config, consumer consumer.Metrics, -) (component.MetricsReceiver, error) { +) (receiver.Metrics, error) { cfg, ok := rConf.(*Config) if !ok { return nil, errConfigNotVcenter diff --git a/receiver/vcenterreceiver/factory_test.go b/receiver/vcenterreceiver/factory_test.go index 4778efc2853c0..ae8b8f43e687a 100644 --- a/receiver/vcenterreceiver/factory_test.go +++ b/receiver/vcenterreceiver/factory_test.go @@ -20,8 +20,8 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/consumer/consumertest" + "go.opentelemetry.io/collector/receiver/receivertest" ) func TestCreateMetricsReceiver(t *testing.T) { @@ -35,7 +35,7 @@ func TestCreateMetricsReceiver(t *testing.T) { t.Parallel() _, err := createMetricsReceiver( context.Background(), - componenttest.NewNopReceiverCreateSettings(), + receivertest.NewNopCreateSettings(), createDefaultConfig(), consumertest.NewNop(), ) @@ -48,7 +48,7 @@ func TestCreateMetricsReceiver(t *testing.T) { t.Parallel() _, err := createMetricsReceiver( context.Background(), - componenttest.NewNopReceiverCreateSettings(), + receivertest.NewNopCreateSettings(), nil, consumertest.NewNop(), ) @@ -61,7 +61,7 @@ func TestCreateMetricsReceiver(t *testing.T) { t.Parallel() _, err := createMetricsReceiver( context.Background(), - componenttest.NewNopReceiverCreateSettings(), + receivertest.NewNopCreateSettings(), createDefaultConfig(), nil, ) diff --git a/receiver/vcenterreceiver/go.mod b/receiver/vcenterreceiver/go.mod index 4e899413857fc..49b8e53609eea 100644 --- a/receiver/vcenterreceiver/go.mod +++ b/receiver/vcenterreceiver/go.mod @@ -5,14 +5,14 @@ go 1.18 require ( github.com/basgys/goxml2json v1.1.0 github.com/google/go-cmp v0.5.9 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest v0.66.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest v0.67.0 github.com/stretchr/testify v1.8.1 github.com/vmware/govmomi v0.29.0 - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector v0.67.0 + go.opentelemetry.io/collector/component v0.67.0 + go.opentelemetry.io/collector/confmap v0.67.0 + go.opentelemetry.io/collector/consumer v0.67.0 + go.opentelemetry.io/collector/pdata v1.0.0-rc1 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.24.0 ) @@ -35,7 +35,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rogpeppe/go-internal v1.8.0 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/featuregate v0.67.0 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/receiver/vcenterreceiver/go.sum b/receiver/vcenterreceiver/go.sum index e2ceb936c889e..41fe344e1835e 100644 --- a/receiver/vcenterreceiver/go.sum +++ b/receiver/vcenterreceiver/go.sum @@ -291,18 +291,18 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/component v0.67.0 h1:GCBRZAqk4yNaT4L1uwlbbwophFHrxYccLZ4Uj1Ifs/M= +go.opentelemetry.io/collector/component v0.67.0/go.mod h1:Txa2lm9oe7xsGQN8u7GdUIrRpAHFIKsTO4Qi3/CSmKk= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/receiver/vcenterreceiver/integration_test.go b/receiver/vcenterreceiver/integration_test.go index 99c8d3f304e02..93b0af519c03a 100644 --- a/receiver/vcenterreceiver/integration_test.go +++ b/receiver/vcenterreceiver/integration_test.go @@ -30,6 +30,7 @@ import ( "github.com/vmware/govmomi/vim25" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config/configtls" + "go.opentelemetry.io/collector/receiver/receivertest" "go.uber.org/zap" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest" @@ -47,7 +48,7 @@ func TestEndtoEnd_ESX(t *testing.T) { } s := session.NewManager(c) - scraper := newVmwareVcenterScraper(zap.NewNop(), cfg, componenttest.NewNopReceiverCreateSettings()) + scraper := newVmwareVcenterScraper(zap.NewNop(), cfg, receivertest.NewNopCreateSettings()) scraper.client.moClient = &govmomi.Client{ Client: c, SessionManager: s, diff --git a/receiver/vcenterreceiver/internal/metadata/generated_metrics.go b/receiver/vcenterreceiver/internal/metadata/generated_metrics.go index 5a75d6000ae36..b48cce44811e3 100644 --- a/receiver/vcenterreceiver/internal/metadata/generated_metrics.go +++ b/receiver/vcenterreceiver/internal/metadata/generated_metrics.go @@ -9,6 +9,7 @@ import ( "go.opentelemetry.io/collector/confmap" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" + "go.opentelemetry.io/collector/receiver" ) // MetricSettings provides common settings for a particular metric. @@ -2219,7 +2220,7 @@ func WithStartTime(startTime pcommon.Timestamp) metricBuilderOption { } } -func NewMetricsBuilder(ms MetricsSettings, settings component.ReceiverCreateSettings, options ...metricBuilderOption) *MetricsBuilder { +func NewMetricsBuilder(ms MetricsSettings, settings receiver.CreateSettings, options ...metricBuilderOption) *MetricsBuilder { mb := &MetricsBuilder{ startTime: pcommon.NewTimestampFromTime(time.Now()), metricsBuffer: pmetric.NewMetrics(), diff --git a/receiver/vcenterreceiver/internal/metadata/generated_metrics_test.go b/receiver/vcenterreceiver/internal/metadata/generated_metrics_test.go index 952efc2ff543d..a14cbec70fa6c 100644 --- a/receiver/vcenterreceiver/internal/metadata/generated_metrics_test.go +++ b/receiver/vcenterreceiver/internal/metadata/generated_metrics_test.go @@ -7,9 +7,9 @@ import ( "testing" "github.com/stretchr/testify/assert" - "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" + "go.opentelemetry.io/collector/receiver/receivertest" "go.uber.org/zap" "go.uber.org/zap/zaptest/observer" ) @@ -17,7 +17,7 @@ import ( func TestDefaultMetrics(t *testing.T) { start := pcommon.Timestamp(1_000_000_000) ts := pcommon.Timestamp(1_000_001_000) - mb := NewMetricsBuilder(DefaultMetricsSettings(), componenttest.NewNopReceiverCreateSettings(), WithStartTime(start)) + mb := NewMetricsBuilder(DefaultMetricsSettings(), receivertest.NewNopCreateSettings(), WithStartTime(start)) enabledMetrics := make(map[string]bool) enabledMetrics["vcenter.cluster.cpu.effective"] = true @@ -185,7 +185,7 @@ func TestAllMetrics(t *testing.T) { VcenterVMNetworkUsage: MetricSettings{Enabled: true}, } observedZapCore, observedLogs := observer.New(zap.WarnLevel) - settings := componenttest.NewNopReceiverCreateSettings() + settings := receivertest.NewNopCreateSettings() settings.Logger = zap.New(observedZapCore) mb := NewMetricsBuilder(metricsSettings, settings, WithStartTime(start)) @@ -804,7 +804,7 @@ func TestNoMetrics(t *testing.T) { VcenterVMNetworkUsage: MetricSettings{Enabled: false}, } observedZapCore, observedLogs := observer.New(zap.WarnLevel) - settings := componenttest.NewNopReceiverCreateSettings() + settings := receivertest.NewNopCreateSettings() settings.Logger = zap.New(observedZapCore) mb := NewMetricsBuilder(metricsSettings, settings, WithStartTime(start)) diff --git a/receiver/vcenterreceiver/scraper.go b/receiver/vcenterreceiver/scraper.go index d03b8296e722e..a8e96772f1cd8 100644 --- a/receiver/vcenterreceiver/scraper.go +++ b/receiver/vcenterreceiver/scraper.go @@ -24,13 +24,14 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" + "go.opentelemetry.io/collector/receiver" "go.opentelemetry.io/collector/receiver/scrapererror" "go.uber.org/zap" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/vcenterreceiver/internal/metadata" ) -var _ component.MetricsReceiver = (*vcenterMetricScraper)(nil) +var _ receiver.Metrics = (*vcenterMetricScraper)(nil) type vcenterMetricScraper struct { client *vcenterClient @@ -42,7 +43,7 @@ type vcenterMetricScraper struct { func newVmwareVcenterScraper( logger *zap.Logger, config *Config, - settings component.ReceiverCreateSettings, + settings receiver.CreateSettings, ) *vcenterMetricScraper { client := newVcenterClient(config) return &vcenterMetricScraper{ diff --git a/receiver/vcenterreceiver/scraper_test.go b/receiver/vcenterreceiver/scraper_test.go index f0d7e716e890b..700dc6ecf5cc2 100644 --- a/receiver/vcenterreceiver/scraper_test.go +++ b/receiver/vcenterreceiver/scraper_test.go @@ -20,7 +20,7 @@ import ( "testing" "github.com/stretchr/testify/require" - "go.opentelemetry.io/collector/component/componenttest" + "go.opentelemetry.io/collector/receiver/receivertest" "go.uber.org/zap" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest" @@ -61,7 +61,7 @@ func TestScrape_TLS(t *testing.T) { } func testScrape(ctx context.Context, t *testing.T, cfg *Config) { - scraper := newVmwareVcenterScraper(zap.NewNop(), cfg, componenttest.NewNopReceiverCreateSettings()) + scraper := newVmwareVcenterScraper(zap.NewNop(), cfg, receivertest.NewNopCreateSettings()) metrics, err := scraper.scrape(ctx) require.NoError(t, err) @@ -83,7 +83,7 @@ func TestScrape_NoClient(t *testing.T) { config: &Config{ Endpoint: "http://vcsa.localnet", }, - mb: metadata.NewMetricsBuilder(metadata.DefaultMetricsSettings(), componenttest.NewNopReceiverCreateSettings()), + mb: metadata.NewMetricsBuilder(metadata.DefaultMetricsSettings(), receivertest.NewNopCreateSettings()), logger: zap.NewNop(), } metrics, err := scraper.scrape(ctx) @@ -114,7 +114,7 @@ func TestStartFailures_Metrics(t *testing.T) { ctx := context.Background() for _, tc := range cases { - scraper := newVmwareVcenterScraper(zap.NewNop(), &tc.cfg, componenttest.NewNopReceiverCreateSettings()) + scraper := newVmwareVcenterScraper(zap.NewNop(), &tc.cfg, receivertest.NewNopCreateSettings()) err := scraper.Start(ctx, nil) if tc.err != nil { require.ErrorContains(t, err, tc.err.Error()) diff --git a/receiver/wavefrontreceiver/factory.go b/receiver/wavefrontreceiver/factory.go index 22533b1f7950e..3721a29e19121 100644 --- a/receiver/wavefrontreceiver/factory.go +++ b/receiver/wavefrontreceiver/factory.go @@ -21,6 +21,7 @@ import ( "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confignet" "go.opentelemetry.io/collector/consumer" + "go.opentelemetry.io/collector/receiver" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/carbonreceiver" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/carbonreceiver/protocol" @@ -37,11 +38,11 @@ const ( ) // NewFactory creates a factory for WaveFront receiver. -func NewFactory() component.ReceiverFactory { - return component.NewReceiverFactory( +func NewFactory() receiver.Factory { + return receiver.NewFactory( typeStr, createDefaultConfig, - component.WithMetricsReceiver(createMetricsReceiver, stability)) + receiver.WithMetrics(createMetricsReceiver, stability)) } func createDefaultConfig() component.Config { @@ -56,10 +57,10 @@ func createDefaultConfig() component.Config { func createMetricsReceiver( ctx context.Context, - params component.ReceiverCreateSettings, + params receiver.CreateSettings, cfg component.Config, consumer consumer.Metrics, -) (component.MetricsReceiver, error) { +) (receiver.Metrics, error) { rCfg := cfg.(*Config) diff --git a/receiver/wavefrontreceiver/factory_test.go b/receiver/wavefrontreceiver/factory_test.go index e66334a5d0f4d..8fa88f06d243e 100644 --- a/receiver/wavefrontreceiver/factory_test.go +++ b/receiver/wavefrontreceiver/factory_test.go @@ -21,6 +21,7 @@ import ( "github.com/stretchr/testify/assert" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/consumer/consumertest" + "go.opentelemetry.io/collector/receiver/receivertest" ) func TestCreateDefaultConfig(t *testing.T) { @@ -34,7 +35,7 @@ func TestCreateReceiver(t *testing.T) { cfg := createDefaultConfig().(*Config) cfg.Endpoint = "localhost:0" // Endpoint is required, not going to be used here. - params := componenttest.NewNopReceiverCreateSettings() + params := receivertest.NewNopCreateSettings() tReceiver, err := createMetricsReceiver(context.Background(), params, cfg, consumertest.NewNop()) assert.NoError(t, err) assert.NotNil(t, tReceiver, "receiver creation failed") diff --git a/receiver/wavefrontreceiver/go.mod b/receiver/wavefrontreceiver/go.mod index 306157e4cc3f6..3dba383864194 100644 --- a/receiver/wavefrontreceiver/go.mod +++ b/receiver/wavefrontreceiver/go.mod @@ -4,15 +4,15 @@ go 1.18 require ( github.com/census-instrumentation/opencensus-proto v0.4.1 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/carbonreceiver v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/collectdreceiver v0.66.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/carbonreceiver v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/collectdreceiver v0.67.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector v0.67.0 + go.opentelemetry.io/collector/component v0.67.0 + go.opentelemetry.io/collector/confmap v0.67.0 + go.opentelemetry.io/collector/consumer v0.67.0 google.golang.org/protobuf v1.28.1 ) @@ -28,12 +28,12 @@ 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/internal/coreinternal v0.66.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.67.0 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 // indirect - go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/featuregate v0.67.0 // indirect + go.opentelemetry.io/collector/pdata v1.0.0-rc1 // indirect + go.opentelemetry.io/collector/semconv v0.67.0 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/receiver/wavefrontreceiver/go.sum b/receiver/wavefrontreceiver/go.sum index b73ed8f310092..006ed464394d8 100644 --- a/receiver/wavefrontreceiver/go.sum +++ b/receiver/wavefrontreceiver/go.sum @@ -275,20 +275,20 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 h1:Q5L9Urod3c8as6ZYaoaqBjarx/HXxsxy34DFZIU2fO4= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/component v0.67.0 h1:GCBRZAqk4yNaT4L1uwlbbwophFHrxYccLZ4Uj1Ifs/M= +go.opentelemetry.io/collector/component v0.67.0/go.mod h1:Txa2lm9oe7xsGQN8u7GdUIrRpAHFIKsTO4Qi3/CSmKk= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= +go.opentelemetry.io/collector/semconv v0.67.0 h1:zLAvcQa6Kgow52FFLrmk7/9ZVtEYyA73+xDtCcFG78Q= +go.opentelemetry.io/collector/semconv v0.67.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/receiver/wavefrontreceiver/receiver_test.go b/receiver/wavefrontreceiver/receiver_test.go index aeb5ec571e8b0..0e6638ad47b18 100644 --- a/receiver/wavefrontreceiver/receiver_test.go +++ b/receiver/wavefrontreceiver/receiver_test.go @@ -27,6 +27,7 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/consumer/consumertest" + "go.opentelemetry.io/collector/receiver/receivertest" "google.golang.org/protobuf/types/known/timestamppb" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/common/testutil" @@ -41,7 +42,7 @@ func Test_wavefrontreceiver_EndToEnd(t *testing.T) { addr := testutil.GetAvailableLocalAddress(t) rCfg.Endpoint = addr sink := new(consumertest.MetricsSink) - params := componenttest.NewNopReceiverCreateSettings() + params := receivertest.NewNopCreateSettings() rcvr, err := createMetricsReceiver(context.Background(), params, rCfg, sink) require.NoError(t, err) diff --git a/receiver/windowseventlogreceiver/go.mod b/receiver/windowseventlogreceiver/go.mod index edbe8c4abeb6c..a8276d7ab8f37 100644 --- a/receiver/windowseventlogreceiver/go.mod +++ b/receiver/windowseventlogreceiver/go.mod @@ -3,12 +3,12 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/receiver/window go 1.18 require ( - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.66.0 + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.67.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector v0.67.0 + go.opentelemetry.io/collector/component v0.67.0 + go.opentelemetry.io/collector/confmap v0.67.0 + go.opentelemetry.io/collector/consumer v0.67.0 golang.org/x/sys v0.3.0 ) @@ -31,8 +31,8 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rogpeppe/go-internal v1.8.1 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/featuregate v0.67.0 // indirect + go.opentelemetry.io/collector/pdata v1.0.0-rc1 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/receiver/windowseventlogreceiver/go.sum b/receiver/windowseventlogreceiver/go.sum index 537c3a639a06e..397d570c6bb6b 100644 --- a/receiver/windowseventlogreceiver/go.sum +++ b/receiver/windowseventlogreceiver/go.sum @@ -304,18 +304,18 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/component v0.67.0 h1:GCBRZAqk4yNaT4L1uwlbbwophFHrxYccLZ4Uj1Ifs/M= +go.opentelemetry.io/collector/component v0.67.0/go.mod h1:Txa2lm9oe7xsGQN8u7GdUIrRpAHFIKsTO4Qi3/CSmKk= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/receiver/windowseventlogreceiver/receiver_others.go b/receiver/windowseventlogreceiver/receiver_others.go index 2d3d083551030..8574234a26cad 100644 --- a/receiver/windowseventlogreceiver/receiver_others.go +++ b/receiver/windowseventlogreceiver/receiver_others.go @@ -24,6 +24,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer" + "go.opentelemetry.io/collector/receiver" "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/adapter" "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/operator" @@ -35,11 +36,11 @@ const ( ) // NewFactory creates a factory for windowseventlog receiver -func NewFactory() component.ReceiverFactory { - return component.NewReceiverFactory( +func NewFactory() receiver.Factory { + return receiver.NewFactory( typeStr, createDefaultConfig, - component.WithLogsReceiver(createLogsReceiver, stability)) + receiver.WithLogs(createLogsReceiver, stability)) } func createDefaultConfig() component.Config { @@ -53,10 +54,10 @@ func createDefaultConfig() component.Config { func createLogsReceiver( _ context.Context, - params component.ReceiverCreateSettings, + params receiver.CreateSettings, cfg component.Config, consumer consumer.Logs, -) (component.LogsReceiver, error) { +) (receiver.Logs, error) { return nil, fmt.Errorf("windows eventlog receiver is only supported on Windows") } diff --git a/receiver/windowseventlogreceiver/receiver_others_test.go b/receiver/windowseventlogreceiver/receiver_others_test.go index cbf0eace7a3d6..a4214ab976df6 100644 --- a/receiver/windowseventlogreceiver/receiver_others_test.go +++ b/receiver/windowseventlogreceiver/receiver_others_test.go @@ -24,6 +24,7 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/consumer/consumertest" + "go.opentelemetry.io/collector/receiver/receivertest" ) func TestDefaultConfigFailure(t *testing.T) { @@ -34,7 +35,7 @@ func TestDefaultConfigFailure(t *testing.T) { receiver, err := factory.CreateLogsReceiver( context.Background(), - componenttest.NewNopReceiverCreateSettings(), + receivertest.NewNopCreateSettings(), cfg, new(consumertest.LogsSink), ) diff --git a/receiver/windowseventlogreceiver/receiver_windows.go b/receiver/windowseventlogreceiver/receiver_windows.go index 0b579021e519b..65a1b20da2ea0 100644 --- a/receiver/windowseventlogreceiver/receiver_windows.go +++ b/receiver/windowseventlogreceiver/receiver_windows.go @@ -20,6 +20,7 @@ package windowseventlogreceiver // import "github.com/open-telemetry/opentelemet import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" + "go.opentelemetry.io/collector/receiver" "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/adapter" "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/operator" @@ -32,7 +33,7 @@ const ( ) // NewFactory creates a factory for windowseventlog receiver -func NewFactory() component.ReceiverFactory { +func NewFactory() receiver.Factory { return adapter.NewFactory(ReceiverType{}, stability) } diff --git a/receiver/windowseventlogreceiver/receiver_windows_test.go b/receiver/windowseventlogreceiver/receiver_windows_test.go index 6c31332967af5..7685d5d3c369d 100644 --- a/receiver/windowseventlogreceiver/receiver_windows_test.go +++ b/receiver/windowseventlogreceiver/receiver_windows_test.go @@ -30,6 +30,7 @@ import ( "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/confmap/confmaptest" "go.opentelemetry.io/collector/consumer/consumertest" + "go.opentelemetry.io/collector/receiver/receivertest" "golang.org/x/sys/windows/svc/eventlog" "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/adapter" @@ -70,7 +71,7 @@ func TestCreateWithInvalidInputConfig(t *testing.T) { _, err := NewFactory().CreateLogsReceiver( context.Background(), - componenttest.NewNopReceiverCreateSettings(), + receivertest.NewNopCreateSettings(), cfg, new(consumertest.LogsSink), ) @@ -80,7 +81,7 @@ func TestCreateWithInvalidInputConfig(t *testing.T) { func TestReadWindowsEventLogger(t *testing.T) { ctx := context.Background() factory := NewFactory() - createSettings := componenttest.NewNopReceiverCreateSettings() + createSettings := receivertest.NewNopCreateSettings() cfg := createTestConfig() sink := new(consumertest.LogsSink) diff --git a/receiver/windowsperfcountersreceiver/factory.go b/receiver/windowsperfcountersreceiver/factory.go index a961aa1b0e496..9ae7acc914bc2 100644 --- a/receiver/windowsperfcountersreceiver/factory.go +++ b/receiver/windowsperfcountersreceiver/factory.go @@ -19,6 +19,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" + "go.opentelemetry.io/collector/receiver" "go.opentelemetry.io/collector/receiver/scraperhelper" ) @@ -32,11 +33,11 @@ const ( ) // NewFactory creates a new factory for windows perf counters receiver. -func NewFactory() component.ReceiverFactory { - return component.NewReceiverFactory( +func NewFactory() receiver.Factory { + return receiver.NewFactory( typeStr, createDefaultConfig, - component.WithMetricsReceiver(createMetricsReceiver, stability)) + receiver.WithMetrics(createMetricsReceiver, stability)) } // createDefaultConfig creates the default configuration for receiver. diff --git a/receiver/windowsperfcountersreceiver/factory_others.go b/receiver/windowsperfcountersreceiver/factory_others.go index 08fdd11abd74f..a1f1db8574829 100644 --- a/receiver/windowsperfcountersreceiver/factory_others.go +++ b/receiver/windowsperfcountersreceiver/factory_others.go @@ -23,14 +23,15 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/consumer" + "go.opentelemetry.io/collector/receiver" ) // createMetricsReceiver creates a metrics receiver based on provided config. func createMetricsReceiver( ctx context.Context, - params component.ReceiverCreateSettings, + params receiver.CreateSettings, cfg component.Config, consumer consumer.Metrics, -) (component.MetricsReceiver, error) { +) (receiver.Metrics, error) { return nil, errors.New("the windows perf counters receiver is only supported on Windows") } diff --git a/receiver/windowsperfcountersreceiver/factory_test.go b/receiver/windowsperfcountersreceiver/factory_test.go index 155894a181107..c388c897f26b1 100644 --- a/receiver/windowsperfcountersreceiver/factory_test.go +++ b/receiver/windowsperfcountersreceiver/factory_test.go @@ -22,9 +22,10 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/consumer/consumertest" + "go.opentelemetry.io/collector/receiver/receivertest" ) -var creationParams = componenttest.NewNopReceiverCreateSettings() +var creationParams = receivertest.NewNopCreateSettings() func TestCreateDefaultConfig(t *testing.T) { factory := NewFactory() diff --git a/receiver/windowsperfcountersreceiver/factory_windows.go b/receiver/windowsperfcountersreceiver/factory_windows.go index 6ef7d7bc9f6a8..78cd27dce4647 100644 --- a/receiver/windowsperfcountersreceiver/factory_windows.go +++ b/receiver/windowsperfcountersreceiver/factory_windows.go @@ -22,16 +22,17 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/consumer" + "go.opentelemetry.io/collector/receiver" "go.opentelemetry.io/collector/receiver/scraperhelper" ) // createMetricsReceiver creates a metrics receiver based on provided config. func createMetricsReceiver( ctx context.Context, - params component.ReceiverCreateSettings, + params receiver.CreateSettings, cfg component.Config, consumer consumer.Metrics, -) (component.MetricsReceiver, error) { +) (receiver.Metrics, error) { oCfg := cfg.(*Config) scraper := newScraper(oCfg, params.TelemetrySettings) diff --git a/receiver/windowsperfcountersreceiver/go.mod b/receiver/windowsperfcountersreceiver/go.mod index dbea1a77393f9..0dbeec795bd83 100644 --- a/receiver/windowsperfcountersreceiver/go.mod +++ b/receiver/windowsperfcountersreceiver/go.mod @@ -3,14 +3,14 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/receiver/window go 1.18 require ( - github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/winperfcounters v0.66.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/winperfcounters v0.67.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector v0.67.0 + go.opentelemetry.io/collector/component v0.67.0 + go.opentelemetry.io/collector/confmap v0.67.0 + go.opentelemetry.io/collector/consumer v0.67.0 + go.opentelemetry.io/collector/pdata v1.0.0-rc1 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.24.0 ) @@ -31,7 +31,7 @@ require ( github.com/pelletier/go-toml v1.9.4 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/featuregate v0.67.0 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/receiver/windowsperfcountersreceiver/go.sum b/receiver/windowsperfcountersreceiver/go.sum index f689c3a135f36..92e097db11cb2 100644 --- a/receiver/windowsperfcountersreceiver/go.sum +++ b/receiver/windowsperfcountersreceiver/go.sum @@ -281,18 +281,18 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/component v0.67.0 h1:GCBRZAqk4yNaT4L1uwlbbwophFHrxYccLZ4Uj1Ifs/M= +go.opentelemetry.io/collector/component v0.67.0/go.mod h1:Txa2lm9oe7xsGQN8u7GdUIrRpAHFIKsTO4Qi3/CSmKk= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/receiver/zipkinreceiver/factory.go b/receiver/zipkinreceiver/factory.go index 88c70031e5bcc..2d8db8d590ecc 100644 --- a/receiver/zipkinreceiver/factory.go +++ b/receiver/zipkinreceiver/factory.go @@ -21,6 +21,7 @@ import ( "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/consumer" + "go.opentelemetry.io/collector/receiver" ) // This file implements factory for Zipkin receiver. @@ -33,11 +34,11 @@ const ( ) // NewFactory creates a new Zipkin receiver factory -func NewFactory() component.ReceiverFactory { - return component.NewReceiverFactory( +func NewFactory() receiver.Factory { + return receiver.NewFactory( typeStr, createDefaultConfig, - component.WithTracesReceiver(createTracesReceiver, stability), + receiver.WithTraces(createTracesReceiver, stability), ) } @@ -55,10 +56,10 @@ func createDefaultConfig() component.Config { // createTracesReceiver creates a trace receiver based on provided config. func createTracesReceiver( _ context.Context, - set component.ReceiverCreateSettings, + set receiver.CreateSettings, cfg component.Config, nextConsumer consumer.Traces, -) (component.TracesReceiver, error) { +) (receiver.Traces, error) { rCfg := cfg.(*Config) return newReceiver(rCfg, nextConsumer, set) } diff --git a/receiver/zipkinreceiver/factory_test.go b/receiver/zipkinreceiver/factory_test.go index 0f2628d2be2fd..b4fa0bf784796 100644 --- a/receiver/zipkinreceiver/factory_test.go +++ b/receiver/zipkinreceiver/factory_test.go @@ -21,6 +21,7 @@ import ( "github.com/stretchr/testify/assert" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/consumer/consumertest" + "go.opentelemetry.io/collector/receiver/receivertest" ) func TestCreateDefaultConfig(t *testing.T) { @@ -34,7 +35,7 @@ func TestCreateReceiver(t *testing.T) { tReceiver, err := createTracesReceiver( context.Background(), - componenttest.NewNopReceiverCreateSettings(), + receivertest.NewNopCreateSettings(), cfg, consumertest.NewNop()) assert.NoError(t, err, "receiver creation failed") @@ -42,7 +43,7 @@ func TestCreateReceiver(t *testing.T) { tReceiver, err = createTracesReceiver( context.Background(), - componenttest.NewNopReceiverCreateSettings(), + receivertest.NewNopCreateSettings(), cfg, consumertest.NewNop()) assert.NoError(t, err, "receiver creation failed") diff --git a/receiver/zipkinreceiver/go.mod b/receiver/zipkinreceiver/go.mod index afab755b77972..a8b77732c6a9f 100644 --- a/receiver/zipkinreceiver/go.mod +++ b/receiver/zipkinreceiver/go.mod @@ -4,16 +4,16 @@ go 1.18 require ( github.com/jaegertracing/jaeger v1.39.1-0.20221110195127-14c11365a856 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/zipkin v0.66.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/zipkin v0.67.0 github.com/openzipkin/zipkin-go v0.4.1 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector v0.67.0 + go.opentelemetry.io/collector/component v0.67.0 + go.opentelemetry.io/collector/confmap v0.67.0 + go.opentelemetry.io/collector/consumer v0.67.0 + go.opentelemetry.io/collector/pdata v1.0.0-rc1 + go.opentelemetry.io/collector/semconv v0.67.0 google.golang.org/protobuf v1.28.1 ) @@ -40,7 +40,7 @@ require ( github.com/uber/jaeger-client-go v2.30.0+incompatible // indirect github.com/uber/jaeger-lib v2.4.1+incompatible // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/featuregate v0.67.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect diff --git a/receiver/zipkinreceiver/go.sum b/receiver/zipkinreceiver/go.sum index 4235daa1064c0..00e6a8eca5e48 100644 --- a/receiver/zipkinreceiver/go.sum +++ b/receiver/zipkinreceiver/go.sum @@ -296,20 +296,20 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 h1:Q5L9Urod3c8as6ZYaoaqBjarx/HXxsxy34DFZIU2fO4= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/component v0.67.0 h1:GCBRZAqk4yNaT4L1uwlbbwophFHrxYccLZ4Uj1Ifs/M= +go.opentelemetry.io/collector/component v0.67.0/go.mod h1:Txa2lm9oe7xsGQN8u7GdUIrRpAHFIKsTO4Qi3/CSmKk= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= +go.opentelemetry.io/collector/semconv v0.67.0 h1:zLAvcQa6Kgow52FFLrmk7/9ZVtEYyA73+xDtCcFG78Q= +go.opentelemetry.io/collector/semconv v0.67.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 h1:aUEBEdCa6iamGzg6fuYxDA8ThxvOG240mAvWDU+XLio= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4/go.mod h1:l2MdsbKTocpPS5nQZscqTR9jd8u96VYZdcpF8Sye7mA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= diff --git a/receiver/zipkinreceiver/trace_receiver.go b/receiver/zipkinreceiver/trace_receiver.go index c22eee64bd4c9..f1538c221910d 100644 --- a/receiver/zipkinreceiver/trace_receiver.go +++ b/receiver/zipkinreceiver/trace_receiver.go @@ -29,6 +29,7 @@ import ( "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/obsreport" "go.opentelemetry.io/collector/pdata/ptrace" + "go.opentelemetry.io/collector/receiver" "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/zipkin/zipkinv1" "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/zipkin/zipkinv2" @@ -57,14 +58,14 @@ type zipkinReceiver struct { protobufUnmarshaler ptrace.Unmarshaler protobufDebugUnmarshaler ptrace.Unmarshaler - settings component.ReceiverCreateSettings + settings receiver.CreateSettings obsrecvrs map[string]*obsreport.Receiver } var _ http.Handler = (*zipkinReceiver)(nil) // newReceiver creates a new zipkinReceiver reference. -func newReceiver(config *Config, nextConsumer consumer.Traces, settings component.ReceiverCreateSettings) (*zipkinReceiver, error) { +func newReceiver(config *Config, nextConsumer consumer.Traces, settings receiver.CreateSettings) (*zipkinReceiver, error) { if nextConsumer == nil { return nil, component.ErrNilNextConsumer } diff --git a/receiver/zipkinreceiver/trace_receiver_test.go b/receiver/zipkinreceiver/trace_receiver_test.go index 6f4279e5ed26c..ef82a3c4de192 100644 --- a/receiver/zipkinreceiver/trace_receiver_test.go +++ b/receiver/zipkinreceiver/trace_receiver_test.go @@ -38,6 +38,7 @@ import ( "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/consumer/consumertest" + "go.opentelemetry.io/collector/receiver/receivertest" conventions "go.opentelemetry.io/collector/semconv/v1.6.1" ) @@ -79,7 +80,7 @@ func TestNew(t *testing.T) { Endpoint: tt.args.address, }, } - got, err := newReceiver(cfg, tt.args.nextConsumer, componenttest.NewNopReceiverCreateSettings()) + got, err := newReceiver(cfg, tt.args.nextConsumer, receivertest.NewNopCreateSettings()) require.Equal(t, tt.wantErr, err) if tt.wantErr == nil { require.NotNil(t, got) @@ -102,7 +103,7 @@ func TestZipkinReceiverPortAlreadyInUse(t *testing.T) { Endpoint: "localhost:" + portStr, }, } - traceReceiver, err := newReceiver(cfg, consumertest.NewNop(), componenttest.NewNopReceiverCreateSettings()) + traceReceiver, err := newReceiver(cfg, consumertest.NewNop(), receivertest.NewNopCreateSettings()) require.NoError(t, err, "Failed to create receiver: %v", err) err = traceReceiver.Start(context.Background(), componenttest.NewNopHost()) require.Error(t, err) @@ -151,7 +152,7 @@ func TestStartTraceReception(t *testing.T) { Endpoint: "localhost:0", }, } - zr, err := newReceiver(cfg, sink, componenttest.NewNopReceiverCreateSettings()) + zr, err := newReceiver(cfg, sink, receivertest.NewNopCreateSettings()) require.Nil(t, err) require.NotNil(t, zr) @@ -245,7 +246,7 @@ func TestReceiverContentTypes(t *testing.T) { Endpoint: "", }, } - zr, err := newReceiver(cfg, next, componenttest.NewNopReceiverCreateSettings()) + zr, err := newReceiver(cfg, next, receivertest.NewNopCreateSettings()) require.NoError(t, err) req := httptest.NewRecorder() @@ -273,7 +274,7 @@ func TestReceiverInvalidContentType(t *testing.T) { Endpoint: "", }, } - zr, err := newReceiver(cfg, consumertest.NewNop(), componenttest.NewNopReceiverCreateSettings()) + zr, err := newReceiver(cfg, consumertest.NewNop(), receivertest.NewNopCreateSettings()) require.NoError(t, err) req := httptest.NewRecorder() @@ -296,7 +297,7 @@ func TestReceiverConsumerError(t *testing.T) { Endpoint: "localhost:9411", }, } - zr, err := newReceiver(cfg, consumertest.NewErr(errors.New("consumer error")), componenttest.NewNopReceiverCreateSettings()) + zr, err := newReceiver(cfg, consumertest.NewErr(errors.New("consumer error")), receivertest.NewNopCreateSettings()) require.NoError(t, err) req := httptest.NewRecorder() @@ -386,7 +387,7 @@ func TestReceiverConvertsStringsToTypes(t *testing.T) { }, ParseStringTags: true, } - zr, err := newReceiver(cfg, next, componenttest.NewNopReceiverCreateSettings()) + zr, err := newReceiver(cfg, next, receivertest.NewNopCreateSettings()) require.NoError(t, err) req := httptest.NewRecorder() @@ -428,7 +429,7 @@ func TestFromBytesWithNoTimestamp(t *testing.T) { }, ParseStringTags: true, } - zi, err := newReceiver(cfg, consumertest.NewNop(), componenttest.NewNopReceiverCreateSettings()) + zi, err := newReceiver(cfg, consumertest.NewNop(), receivertest.NewNopCreateSettings()) require.NoError(t, err) hdr := make(http.Header) diff --git a/receiver/zookeeperreceiver/factory.go b/receiver/zookeeperreceiver/factory.go index 114161d20132f..03282c3f5aeaa 100644 --- a/receiver/zookeeperreceiver/factory.go +++ b/receiver/zookeeperreceiver/factory.go @@ -22,6 +22,7 @@ import ( "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confignet" "go.opentelemetry.io/collector/consumer" + "go.opentelemetry.io/collector/receiver" "go.opentelemetry.io/collector/receiver/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zookeeperreceiver/internal/metadata" @@ -35,11 +36,11 @@ const ( defaultTimeout = 10 * time.Second ) -func NewFactory() component.ReceiverFactory { - return component.NewReceiverFactory( +func NewFactory() receiver.Factory { + return receiver.NewFactory( typeStr, createDefaultConfig, - component.WithMetricsReceiver(createMetricsReceiver, stability), + receiver.WithMetrics(createMetricsReceiver, stability), ) } @@ -60,10 +61,10 @@ func createDefaultConfig() component.Config { // CreateMetricsReceiver creates zookeeper (metrics) receiver. func createMetricsReceiver( _ context.Context, - params component.ReceiverCreateSettings, + params receiver.CreateSettings, config component.Config, consumer consumer.Metrics, -) (component.MetricsReceiver, error) { +) (receiver.Metrics, error) { rConfig := config.(*Config) zms, err := newZookeeperMetricsScraper(params, rConfig) if err != nil { diff --git a/receiver/zookeeperreceiver/factory_test.go b/receiver/zookeeperreceiver/factory_test.go index 4e6cf17f65c46..92359bb9f1aa6 100644 --- a/receiver/zookeeperreceiver/factory_test.go +++ b/receiver/zookeeperreceiver/factory_test.go @@ -22,9 +22,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config/confignet" "go.opentelemetry.io/collector/consumer/consumertest" + "go.opentelemetry.io/collector/receiver/receivertest" ) func TestFactory(t *testing.T) { @@ -68,7 +68,7 @@ func TestFactory(t *testing.T) { t.Run(test.name, func(t *testing.T) { r, err := f.CreateMetricsReceiver( context.Background(), - componenttest.NewNopReceiverCreateSettings(), + receivertest.NewNopCreateSettings(), test.config, consumertest.NewNop(), ) diff --git a/receiver/zookeeperreceiver/go.mod b/receiver/zookeeperreceiver/go.mod index 5a1027ce1ae3e..d637c3caae738 100644 --- a/receiver/zookeeperreceiver/go.mod +++ b/receiver/zookeeperreceiver/go.mod @@ -3,15 +3,15 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zookee go 1.18 require ( - github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest v0.66.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest v0.67.0 github.com/stretchr/testify v1.8.1 github.com/testcontainers/testcontainers-go v0.15.0 - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector v0.67.0 + go.opentelemetry.io/collector/component v0.67.0 + go.opentelemetry.io/collector/confmap v0.67.0 + go.opentelemetry.io/collector/consumer v0.67.0 + go.opentelemetry.io/collector/pdata v1.0.0-rc1 go.uber.org/zap v1.24.0 ) @@ -53,7 +53,7 @@ require ( github.com/rogpeppe/go-internal v1.6.1 // indirect github.com/sirupsen/logrus v1.8.1 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/featuregate v0.67.0 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/receiver/zookeeperreceiver/go.sum b/receiver/zookeeperreceiver/go.sum index f4c6e9a42badd..90a491a35cc96 100644 --- a/receiver/zookeeperreceiver/go.sum +++ b/receiver/zookeeperreceiver/go.sum @@ -821,18 +821,18 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/component v0.67.0 h1:GCBRZAqk4yNaT4L1uwlbbwophFHrxYccLZ4Uj1Ifs/M= +go.opentelemetry.io/collector/component v0.67.0/go.mod h1:Txa2lm9oe7xsGQN8u7GdUIrRpAHFIKsTO4Qi3/CSmKk= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/receiver/zookeeperreceiver/internal/metadata/generated_metrics.go b/receiver/zookeeperreceiver/internal/metadata/generated_metrics.go index 7bb560edf7a32..ecfc9d76ff057 100644 --- a/receiver/zookeeperreceiver/internal/metadata/generated_metrics.go +++ b/receiver/zookeeperreceiver/internal/metadata/generated_metrics.go @@ -9,6 +9,7 @@ import ( "go.opentelemetry.io/collector/confmap" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" + "go.opentelemetry.io/collector/receiver" ) // MetricSettings provides common settings for a particular metric. @@ -952,7 +953,7 @@ func WithStartTime(startTime pcommon.Timestamp) metricBuilderOption { } } -func NewMetricsBuilder(ms MetricsSettings, settings component.ReceiverCreateSettings, options ...metricBuilderOption) *MetricsBuilder { +func NewMetricsBuilder(ms MetricsSettings, settings receiver.CreateSettings, options ...metricBuilderOption) *MetricsBuilder { mb := &MetricsBuilder{ startTime: pcommon.NewTimestampFromTime(time.Now()), metricsBuffer: pmetric.NewMetrics(), diff --git a/receiver/zookeeperreceiver/internal/metadata/generated_metrics_test.go b/receiver/zookeeperreceiver/internal/metadata/generated_metrics_test.go index 78369a3a3bdad..2833a58726114 100644 --- a/receiver/zookeeperreceiver/internal/metadata/generated_metrics_test.go +++ b/receiver/zookeeperreceiver/internal/metadata/generated_metrics_test.go @@ -7,9 +7,9 @@ import ( "testing" "github.com/stretchr/testify/assert" - "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" + "go.opentelemetry.io/collector/receiver/receivertest" "go.uber.org/zap" "go.uber.org/zap/zaptest/observer" ) @@ -17,7 +17,7 @@ import ( func TestDefaultMetrics(t *testing.T) { start := pcommon.Timestamp(1_000_000_000) ts := pcommon.Timestamp(1_000_001_000) - mb := NewMetricsBuilder(DefaultMetricsSettings(), componenttest.NewNopReceiverCreateSettings(), WithStartTime(start)) + mb := NewMetricsBuilder(DefaultMetricsSettings(), receivertest.NewNopCreateSettings(), WithStartTime(start)) enabledMetrics := make(map[string]bool) enabledMetrics["zookeeper.connection.active"] = true @@ -101,7 +101,7 @@ func TestAllMetrics(t *testing.T) { ZookeeperZnodeCount: MetricSettings{Enabled: true}, } observedZapCore, observedLogs := observer.New(zap.WarnLevel) - settings := componenttest.NewNopReceiverCreateSettings() + settings := receivertest.NewNopCreateSettings() settings.Logger = zap.New(observedZapCore) mb := NewMetricsBuilder(metricsSettings, settings, WithStartTime(start)) @@ -364,7 +364,7 @@ func TestNoMetrics(t *testing.T) { ZookeeperZnodeCount: MetricSettings{Enabled: false}, } observedZapCore, observedLogs := observer.New(zap.WarnLevel) - settings := componenttest.NewNopReceiverCreateSettings() + settings := receivertest.NewNopCreateSettings() settings.Logger = zap.New(observedZapCore) mb := NewMetricsBuilder(metricsSettings, settings, WithStartTime(start)) diff --git a/receiver/zookeeperreceiver/scraper.go b/receiver/zookeeperreceiver/scraper.go index 0bf3c2f117342..b2238095a8278 100644 --- a/receiver/zookeeperreceiver/scraper.go +++ b/receiver/zookeeperreceiver/scraper.go @@ -24,9 +24,9 @@ import ( "strconv" "time" - "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" + "go.opentelemetry.io/collector/receiver" "go.uber.org/zap" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zookeeperreceiver/internal/metadata" @@ -54,7 +54,7 @@ func (z *zookeeperMetricsScraper) Name() string { return typeStr } -func newZookeeperMetricsScraper(settings component.ReceiverCreateSettings, config *Config) (*zookeeperMetricsScraper, error) { +func newZookeeperMetricsScraper(settings receiver.CreateSettings, config *Config) (*zookeeperMetricsScraper, error) { _, _, err := net.SplitHostPort(config.TCPAddr.Endpoint) if err != nil { return nil, err diff --git a/receiver/zookeeperreceiver/scraper_test.go b/receiver/zookeeperreceiver/scraper_test.go index 1d4f972860087..c0cb60f4956c0 100644 --- a/receiver/zookeeperreceiver/scraper_test.go +++ b/receiver/zookeeperreceiver/scraper_test.go @@ -27,8 +27,8 @@ import ( "time" "github.com/stretchr/testify/require" - "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/pdata/pmetric" + "go.opentelemetry.io/collector/receiver/receivertest" "go.uber.org/zap" "go.uber.org/zap/zapcore" "go.uber.org/zap/zaptest/observer" @@ -227,7 +227,7 @@ func TestZookeeperMetricsScraperScrape(t *testing.T) { } core, observedLogs := observer.New(zap.DebugLevel) - settings := componenttest.NewNopReceiverCreateSettings() + settings := receivertest.NewNopCreateSettings() settings.Logger = zap.New(core) z, err := newZookeeperMetricsScraper(settings, cfg) require.NoError(t, err) @@ -277,7 +277,7 @@ func TestZookeeperMetricsScraperScrape(t *testing.T) { func TestZookeeperShutdownBeforeScrape(t *testing.T) { cfg := createDefaultConfig().(*Config) - z, err := newZookeeperMetricsScraper(componenttest.NewNopReceiverCreateSettings(), cfg) + z, err := newZookeeperMetricsScraper(receivertest.NewNopCreateSettings(), cfg) require.NoError(t, err) require.NoError(t, z.shutdown(context.Background())) } diff --git a/receiver/zookeeperreceiver/zk_e2e_test.go b/receiver/zookeeperreceiver/zk_e2e_test.go index 5341e3773302a..a50ec43019c01 100644 --- a/receiver/zookeeperreceiver/zk_e2e_test.go +++ b/receiver/zookeeperreceiver/zk_e2e_test.go @@ -27,8 +27,8 @@ import ( testcontainers "github.com/testcontainers/testcontainers-go" "github.com/testcontainers/testcontainers-go/wait" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/consumer/consumertest" + "go.opentelemetry.io/collector/receiver/receivertest" ) type testHost struct { @@ -107,7 +107,7 @@ func TestIntegration(t *testing.T) { consumer := new(consumertest.MetricsSink) - rcvr, err := f.CreateMetricsReceiver(context.Background(), componenttest.NewNopReceiverCreateSettings(), cfg, consumer) + rcvr, err := f.CreateMetricsReceiver(context.Background(), receivertest.NewNopCreateSettings(), cfg, consumer) require.NoError(t, err, "failed creating metrics receiver") require.NoError(t, rcvr.Start(context.Background(), &testHost{t: t})) diff --git a/testbed/datareceivers/carbon.go b/testbed/datareceivers/carbon.go index 55b7c02b638d5..044a5289aedfd 100644 --- a/testbed/datareceivers/carbon.go +++ b/testbed/datareceivers/carbon.go @@ -18,10 +18,11 @@ import ( "context" "fmt" - "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config/confignet" "go.opentelemetry.io/collector/consumer" + "go.opentelemetry.io/collector/receiver" + "go.opentelemetry.io/collector/receiver/receivertest" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/carbonreceiver" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/carbonreceiver/protocol" @@ -31,7 +32,7 @@ import ( // CarbonDataReceiver implements Carbon format receiver. type CarbonDataReceiver struct { testbed.DataReceiverBase - receiver component.MetricsReceiver + receiver receiver.Metrics } // Ensure CarbonDataReceiver implements MetricDataSender. @@ -56,7 +57,7 @@ func (cr *CarbonDataReceiver) Start(_ consumer.Traces, mc consumer.Metrics, _ co }, } var err error - cr.receiver, err = carbonreceiver.New(componenttest.NewNopReceiverCreateSettings(), config, mc) + cr.receiver, err = carbonreceiver.New(receivertest.NewNopCreateSettings(), config, mc) if err != nil { return err } diff --git a/testbed/datareceivers/jaeger.go b/testbed/datareceivers/jaeger.go index 83ee82a4d3d5e..ab93499c3b42e 100644 --- a/testbed/datareceivers/jaeger.go +++ b/testbed/datareceivers/jaeger.go @@ -18,11 +18,12 @@ import ( "context" "fmt" - "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config/configgrpc" "go.opentelemetry.io/collector/config/confignet" "go.opentelemetry.io/collector/consumer" + "go.opentelemetry.io/collector/receiver" + "go.opentelemetry.io/collector/receiver/receivertest" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver" "github.com/open-telemetry/opentelemetry-collector-contrib/testbed/testbed" @@ -31,7 +32,7 @@ import ( // jaegerDataReceiver implements Jaeger format receiver. type jaegerDataReceiver struct { testbed.DataReceiverBase - receiver component.TracesReceiver + receiver receiver.Traces } // NewJaegerDataReceiver creates a new Jaeger DataReceiver that will listen on the specified port after Start @@ -47,7 +48,7 @@ func (jr *jaegerDataReceiver) Start(tc consumer.Traces, _ consumer.Metrics, _ co NetAddr: confignet.NetAddr{Endpoint: fmt.Sprintf("127.0.0.1:%d", jr.Port), Transport: "tcp"}, } var err error - set := componenttest.NewNopReceiverCreateSettings() + set := receivertest.NewNopCreateSettings() jr.receiver, err = factory.CreateTracesReceiver(context.Background(), set, cfg, tc) if err != nil { return err diff --git a/testbed/datareceivers/mockawsxraydatareceiver.go b/testbed/datareceivers/mockawsxraydatareceiver.go index 73de7e7792d2d..7e6318fc97e1f 100644 --- a/testbed/datareceivers/mockawsxraydatareceiver.go +++ b/testbed/datareceivers/mockawsxraydatareceiver.go @@ -21,10 +21,11 @@ import ( "log" "os" - "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config/configtls" "go.opentelemetry.io/collector/consumer" + "go.opentelemetry.io/collector/receiver" + "go.opentelemetry.io/collector/receiver/receivertest" "github.com/open-telemetry/opentelemetry-collector-contrib/testbed/mockdatareceivers/mockawsxrayreceiver" "github.com/open-telemetry/opentelemetry-collector-contrib/testbed/testbed" @@ -33,7 +34,7 @@ import ( // MockAwsXrayDataReceiver implements AwsXray format receiver. type MockAwsXrayDataReceiver struct { testbed.DataReceiverBase - receiver component.TracesReceiver + receiver receiver.Traces } // NewMockAwsXrayDataReceiver creates a new MockDataReceiver @@ -69,7 +70,7 @@ func (ar *MockAwsXrayDataReceiver) Start(tc consumer.Traces, _ consumer.Metrics, KeyFile: "../mockdatareceivers/mockawsxrayreceiver/server.key", }, } - ar.receiver, err = mockawsxrayreceiver.New(tc, componenttest.NewNopReceiverCreateSettings(), &mockDatareceiverCFG) + ar.receiver, err = mockawsxrayreceiver.New(tc, receivertest.NewNopCreateSettings(), &mockDatareceiverCFG) if err != nil { return err diff --git a/testbed/datareceivers/opencensus.go b/testbed/datareceivers/opencensus.go index b9723efdea09c..6a554cbfe8fb8 100644 --- a/testbed/datareceivers/opencensus.go +++ b/testbed/datareceivers/opencensus.go @@ -18,10 +18,11 @@ import ( "context" "fmt" - "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config/confignet" "go.opentelemetry.io/collector/consumer" + "go.opentelemetry.io/collector/receiver" + "go.opentelemetry.io/collector/receiver/receivertest" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/opencensusreceiver" "github.com/open-telemetry/opentelemetry-collector-contrib/testbed/testbed" @@ -30,8 +31,8 @@ import ( // ocDataReceiver implements OpenCensus format receiver. type ocDataReceiver struct { testbed.DataReceiverBase - traceReceiver component.TracesReceiver - metricsReceiver component.MetricsReceiver + traceReceiver receiver.Traces + metricsReceiver receiver.Metrics } // NewOCDataReceiver creates a new ocDataReceiver that will listen on the specified port after Start @@ -45,7 +46,7 @@ func (or *ocDataReceiver) Start(tc consumer.Traces, mc consumer.Metrics, _ consu cfg := factory.CreateDefaultConfig().(*opencensusreceiver.Config) cfg.NetAddr = confignet.NetAddr{Endpoint: fmt.Sprintf("127.0.0.1:%d", or.Port), Transport: "tcp"} var err error - set := componenttest.NewNopReceiverCreateSettings() + set := receivertest.NewNopCreateSettings() if or.traceReceiver, err = factory.CreateTracesReceiver(context.Background(), set, cfg, tc); err != nil { return err } diff --git a/testbed/datareceivers/prometheus.go b/testbed/datareceivers/prometheus.go index e01cb3a1e9534..a17e4e62401b7 100644 --- a/testbed/datareceivers/prometheus.go +++ b/testbed/datareceivers/prometheus.go @@ -22,9 +22,10 @@ import ( "github.com/prometheus/common/model" promconfig "github.com/prometheus/prometheus/config" "github.com/prometheus/prometheus/discovery" - "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/consumer" + "go.opentelemetry.io/collector/receiver" + "go.opentelemetry.io/collector/receiver/receivertest" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver" "github.com/open-telemetry/opentelemetry-collector-contrib/testbed/testbed" @@ -32,7 +33,7 @@ import ( type prometheusDataReceiver struct { testbed.DataReceiverBase - receiver component.MetricsReceiver + receiver receiver.Metrics } func NewPrometheusDataReceiver(port int) testbed.DataReceiver { @@ -62,7 +63,7 @@ func (dr *prometheusDataReceiver) Start(_ consumer.Traces, mc consumer.Metrics, }}, } var err error - set := componenttest.NewNopReceiverCreateSettings() + set := receivertest.NewNopCreateSettings() dr.receiver, err = factory.CreateMetricsReceiver(context.Background(), set, cfg, mc) if err != nil { return err diff --git a/testbed/datareceivers/sapm.go b/testbed/datareceivers/sapm.go index 5494c232f2cc2..c6882789fdda4 100644 --- a/testbed/datareceivers/sapm.go +++ b/testbed/datareceivers/sapm.go @@ -18,10 +18,11 @@ import ( "context" "fmt" - "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/consumer" + "go.opentelemetry.io/collector/receiver" + "go.opentelemetry.io/collector/receiver/receivertest" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/splunk" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/sapmreceiver" @@ -31,7 +32,7 @@ import ( // SapmDataReceiver implements Sapm format receiver. type SapmDataReceiver struct { testbed.DataReceiverBase - receiver component.TracesReceiver + receiver receiver.Traces } // NewSapmDataReceiver creates a new SapmDataReceiver. @@ -48,7 +49,7 @@ func (sr *SapmDataReceiver) Start(tc consumer.Traces, _ consumer.Metrics, _ cons AccessTokenPassthroughConfig: splunk.AccessTokenPassthroughConfig{AccessTokenPassthrough: true}, } var err error - params := componenttest.NewNopReceiverCreateSettings() + params := receivertest.NewNopCreateSettings() sr.receiver, err = sapmreceiver.NewFactory().CreateTracesReceiver(context.Background(), params, &sapmCfg, tc) if err != nil { return err diff --git a/testbed/datareceivers/signalfx.go b/testbed/datareceivers/signalfx.go index 5900192ef17c6..0fa6fab8a76b5 100644 --- a/testbed/datareceivers/signalfx.go +++ b/testbed/datareceivers/signalfx.go @@ -18,10 +18,11 @@ import ( "context" "fmt" - "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/consumer" + "go.opentelemetry.io/collector/receiver" + "go.opentelemetry.io/collector/receiver/receivertest" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/signalfxreceiver" "github.com/open-telemetry/opentelemetry-collector-contrib/testbed/testbed" @@ -30,7 +31,7 @@ import ( // SFxMetricsDataReceiver implements SignalFx format receiver. type SFxMetricsDataReceiver struct { testbed.DataReceiverBase - receiver component.MetricsReceiver + receiver receiver.Metrics } // Ensure SFxMetricsDataReceiver implements MetricDataSender. @@ -51,7 +52,7 @@ func (sr *SFxMetricsDataReceiver) Start(_ consumer.Traces, mc consumer.Metrics, } var err error f := signalfxreceiver.NewFactory() - sr.receiver, err = f.CreateMetricsReceiver(context.Background(), componenttest.NewNopReceiverCreateSettings(), &config, mc) + sr.receiver, err = f.CreateMetricsReceiver(context.Background(), receivertest.NewNopCreateSettings(), &config, mc) if err != nil { return err } diff --git a/testbed/datareceivers/splunk.go b/testbed/datareceivers/splunk.go index b9a3be0fca8c2..b29cc22aba8eb 100644 --- a/testbed/datareceivers/splunk.go +++ b/testbed/datareceivers/splunk.go @@ -18,10 +18,11 @@ import ( "context" "fmt" - "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/consumer" + "go.opentelemetry.io/collector/receiver" + "go.opentelemetry.io/collector/receiver/receivertest" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/splunkhecreceiver" "github.com/open-telemetry/opentelemetry-collector-contrib/testbed/testbed" @@ -30,7 +31,7 @@ import ( // SplunkHECDataReceiver implements Splunk HEC format receiver. type SplunkHECDataReceiver struct { testbed.DataReceiverBase - receiver component.LogsReceiver + receiver receiver.Logs } // Ensure SplunkHECDataReceiver implements LogDataSender. @@ -51,7 +52,7 @@ func (sr *SplunkHECDataReceiver) Start(_ consumer.Traces, _ consumer.Metrics, lc } var err error f := splunkhecreceiver.NewFactory() - sr.receiver, err = f.CreateLogsReceiver(context.Background(), componenttest.NewNopReceiverCreateSettings(), &config, lc) + sr.receiver, err = f.CreateLogsReceiver(context.Background(), receivertest.NewNopCreateSettings(), &config, lc) if err != nil { return err } diff --git a/testbed/datareceivers/zipkin.go b/testbed/datareceivers/zipkin.go index be70055238829..a6282100fa7c3 100644 --- a/testbed/datareceivers/zipkin.go +++ b/testbed/datareceivers/zipkin.go @@ -18,9 +18,10 @@ import ( "context" "fmt" - "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/consumer" + "go.opentelemetry.io/collector/receiver" + "go.opentelemetry.io/collector/receiver/receivertest" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver" "github.com/open-telemetry/opentelemetry-collector-contrib/testbed/testbed" @@ -29,7 +30,7 @@ import ( // zipkinDataReceiver implements Zipkin format receiver. type zipkinDataReceiver struct { testbed.DataReceiverBase - receiver component.TracesReceiver + receiver receiver.Traces } // NewZipkinDataReceiver creates a new Zipkin DataReceiver that will listen on the specified port after Start @@ -43,7 +44,7 @@ func (zr *zipkinDataReceiver) Start(tc consumer.Traces, _ consumer.Metrics, _ co cfg := factory.CreateDefaultConfig().(*zipkinreceiver.Config) cfg.Endpoint = fmt.Sprintf("127.0.0.1:%d", zr.Port) - set := componenttest.NewNopReceiverCreateSettings() + set := receivertest.NewNopCreateSettings() var err error zr.receiver, err = factory.CreateTracesReceiver(context.Background(), set, cfg, tc) diff --git a/testbed/datasenders/carbon.go b/testbed/datasenders/carbon.go index 419da1da573ab..9de9e18cd02af 100644 --- a/testbed/datasenders/carbon.go +++ b/testbed/datasenders/carbon.go @@ -20,9 +20,9 @@ import ( "time" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer" + "go.opentelemetry.io/collector/exporter/exportertest" "go.uber.org/zap" "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/carbonexporter" @@ -57,7 +57,7 @@ func (cs *CarbonDataSender) Start() error { Endpoint: cs.GetEndpoint().String(), Timeout: 5 * time.Second, } - params := componenttest.NewNopExporterCreateSettings() + params := exportertest.NewNopCreateSettings() params.Logger = zap.L() exporter, err := factory.CreateMetricsExporter(context.Background(), params, cfg) diff --git a/testbed/datasenders/jaeger.go b/testbed/datasenders/jaeger.go index ccf07ae2dc326..081da73b671ff 100644 --- a/testbed/datasenders/jaeger.go +++ b/testbed/datasenders/jaeger.go @@ -21,6 +21,7 @@ import ( "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config/configtls" "go.opentelemetry.io/collector/consumer" + "go.opentelemetry.io/collector/exporter/exportertest" "go.uber.org/zap" "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/jaegerexporter" @@ -55,7 +56,7 @@ func (je *jaegerGRPCDataSender) Start() error { cfg.TLSSetting = configtls.TLSClientSetting{ Insecure: true, } - params := componenttest.NewNopExporterCreateSettings() + params := exportertest.NewNopCreateSettings() params.Logger = zap.L() exp, err := factory.CreateTracesExporter(context.Background(), params, cfg) diff --git a/testbed/datasenders/opencensus.go b/testbed/datasenders/opencensus.go index 1c35417a60d95..623b8debfb4f7 100644 --- a/testbed/datasenders/opencensus.go +++ b/testbed/datasenders/opencensus.go @@ -21,6 +21,7 @@ import ( "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config/configtls" "go.opentelemetry.io/collector/consumer" + "go.opentelemetry.io/collector/exporter/exportertest" "go.uber.org/zap" "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/opencensusexporter" @@ -72,7 +73,7 @@ func NewOCTraceDataSender(host string, port int) testbed.TraceDataSender { func (ote *ocTracesDataSender) Start() error { factory := opencensusexporter.NewFactory() cfg := ote.fillConfig(factory.CreateDefaultConfig().(*opencensusexporter.Config)) - params := componenttest.NewNopExporterCreateSettings() + params := exportertest.NewNopCreateSettings() params.Logger = zap.L() exp, err := factory.CreateTracesExporter(context.Background(), params, cfg) @@ -106,7 +107,7 @@ func NewOCMetricDataSender(host string, port int) testbed.MetricDataSender { func (ome *ocMetricsDataSender) Start() error { factory := opencensusexporter.NewFactory() cfg := ome.fillConfig(factory.CreateDefaultConfig().(*opencensusexporter.Config)) - params := componenttest.NewNopExporterCreateSettings() + params := exportertest.NewNopCreateSettings() params.Logger = zap.L() exp, err := factory.CreateMetricsExporter(context.Background(), params, cfg) diff --git a/testbed/datasenders/prometheus.go b/testbed/datasenders/prometheus.go index 5ffb814c05bce..be2cf2635c4f0 100644 --- a/testbed/datasenders/prometheus.go +++ b/testbed/datasenders/prometheus.go @@ -20,6 +20,7 @@ import ( "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/consumer" + "go.opentelemetry.io/collector/exporter/exportertest" "go.uber.org/zap" "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusexporter" @@ -48,7 +49,7 @@ func (pds *prometheusDataSender) Start() error { cfg := factory.CreateDefaultConfig().(*prometheusexporter.Config) cfg.Endpoint = pds.GetEndpoint().String() cfg.Namespace = pds.namespace - params := componenttest.NewNopExporterCreateSettings() + params := exportertest.NewNopCreateSettings() params.Logger = zap.L() exp, err := factory.CreateMetricsExporter(context.Background(), params, cfg) diff --git a/testbed/datasenders/sapm.go b/testbed/datasenders/sapm.go index a27bd4426ed0d..86c68f1147313 100644 --- a/testbed/datasenders/sapm.go +++ b/testbed/datasenders/sapm.go @@ -19,9 +19,9 @@ import ( "fmt" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer" + "go.opentelemetry.io/collector/exporter/exportertest" "go.uber.org/zap" "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/sapmexporter" @@ -57,7 +57,7 @@ func (je *SapmDataSender) Start() error { DisableCompression: true, AccessToken: "MyToken", } - params := componenttest.NewNopExporterCreateSettings() + params := exportertest.NewNopCreateSettings() params.Logger = zap.L() exporter, err := factory.CreateTracesExporter(context.Background(), params, cfg) diff --git a/testbed/datasenders/signalfx.go b/testbed/datasenders/signalfx.go index 49d2ee4e2056d..808424ff9f02d 100644 --- a/testbed/datasenders/signalfx.go +++ b/testbed/datasenders/signalfx.go @@ -19,9 +19,9 @@ import ( "fmt" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer" + "go.opentelemetry.io/collector/exporter/exportertest" "go.uber.org/zap" "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/signalfxexporter" @@ -57,7 +57,7 @@ func (sf *SFxMetricsDataSender) Start() error { APIURL: "http://127.0.0.1", AccessToken: "access_token", } - params := componenttest.NewNopExporterCreateSettings() + params := exportertest.NewNopCreateSettings() params.Logger = zap.L() exporter, err := factory.CreateMetricsExporter(context.Background(), params, cfg) diff --git a/testbed/datasenders/zipkin.go b/testbed/datasenders/zipkin.go index d2caae935fe22..a730860ef71b7 100644 --- a/testbed/datasenders/zipkin.go +++ b/testbed/datasenders/zipkin.go @@ -20,6 +20,7 @@ import ( "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/consumer" + "go.opentelemetry.io/collector/exporter/exportertest" "go.uber.org/zap" "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/zipkinexporter" @@ -51,7 +52,7 @@ func (zs *zipkinDataSender) Start() error { cfg.RetrySettings.Enabled = false // Disable sending queue, we should push data from the caller goroutine. cfg.QueueSettings.Enabled = false - params := componenttest.NewNopExporterCreateSettings() + params := exportertest.NewNopCreateSettings() params.Logger = zap.L() exp, err := factory.CreateTracesExporter(context.Background(), params, cfg) diff --git a/testbed/go.mod b/testbed/go.mod index 1dc435a79785a..b13a7da388910 100644 --- a/testbed/go.mod +++ b/testbed/go.mod @@ -4,43 +4,43 @@ go 1.18 require ( github.com/fluent/fluent-logger-golang v1.9.0 - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/carbonexporter v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/jaegerexporter v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/opencensusexporter v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusexporter v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/sapmexporter v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/signalfxexporter v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/zipkinexporter v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/splunk v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/carbonreceiver v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/opencensusreceiver v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/sapmreceiver v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/signalfxreceiver v0.0.0-00010101000000-000000000000 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/splunkhecreceiver v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/testbed/mockdatareceivers/mockawsxrayreceiver v0.66.0 + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/carbonexporter v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/jaegerexporter v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/opencensusexporter v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusexporter v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/sapmexporter v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/signalfxexporter v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/zipkinexporter v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/splunk v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/carbonreceiver v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/opencensusreceiver v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/sapmreceiver v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/signalfxreceiver v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/splunkhecreceiver v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/testbed/mockdatareceivers/mockawsxrayreceiver v0.67.0 github.com/prometheus/common v0.37.0 github.com/prometheus/prometheus v0.40.5 github.com/shirou/gopsutil/v3 v3.22.10 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/exporter/loggingexporter v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/exporter/otlpexporter v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/exporter/otlphttpexporter v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/extension/ballastextension v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/extension/zpagesextension v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/receiver/otlpreceiver v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector v0.67.0 + go.opentelemetry.io/collector/component v0.67.0 + go.opentelemetry.io/collector/confmap v0.67.0 + go.opentelemetry.io/collector/consumer v0.67.0 + go.opentelemetry.io/collector/exporter/loggingexporter v0.67.0 + go.opentelemetry.io/collector/exporter/otlpexporter v0.67.0 + go.opentelemetry.io/collector/exporter/otlphttpexporter v0.67.0 + go.opentelemetry.io/collector/extension/ballastextension v0.67.0 + go.opentelemetry.io/collector/extension/zpagesextension v0.67.0 + go.opentelemetry.io/collector/pdata v1.0.0-rc1 + go.opentelemetry.io/collector/processor/batchprocessor v0.67.0 + go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.67.0 + go.opentelemetry.io/collector/receiver/otlpreceiver v0.67.0 + go.opentelemetry.io/collector/semconv v0.67.0 go.uber.org/atomic v1.10.0 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.24.0 @@ -152,15 +152,15 @@ require ( github.com/mostynb/go-grpc-compression v1.1.17 // indirect github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchperresourceattr v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/experimentalmetricmetadata v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheus v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/signalfx v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/zipkin v0.66.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchperresourceattr v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/experimentalmetricmetadata v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheus v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/signalfx v0.67.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/zipkin v0.67.0 // indirect github.com/opencontainers/go-digest v1.0.0 // indirect github.com/opencontainers/image-spec v1.0.2 // indirect github.com/opentracing/opentracing-go v1.2.0 // indirect @@ -194,7 +194,7 @@ require ( github.com/vultr/govultr/v2 v2.17.2 // indirect github.com/yusufpapurcu/wmi v1.2.2 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/featuregate v0.67.0 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 // indirect go.opentelemetry.io/contrib/propagators/b3 v1.11.1 // indirect diff --git a/testbed/go.sum b/testbed/go.sum index 18baca42c791b..6c33e98a364d9 100644 --- a/testbed/go.sum +++ b/testbed/go.sum @@ -1652,60 +1652,45 @@ go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= go.opentelemetry.io/collector v0.57.2/go.mod h1:9TwWyMRhbFNzaaGLtm/6poWNDJw+etvQMS6Fy+8/8Xs= go.opentelemetry.io/collector v0.64.1/go.mod h1:RxdEKzwxTEhBAgzC4wzyJEwSFgjWU73CHnLjKUKQDyo= -go.opentelemetry.io/collector v0.65.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/component v0.65.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/consumer v0.65.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/exporter/loggingexporter v0.66.1-0.20221202005155-1c54042beb70 h1:/C637mgJY6I0l/KFLXmL9I1foefM53aob20WF2Yh/0Y= -go.opentelemetry.io/collector/exporter/loggingexporter v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:xxkHO5NrxffTV22dhCy3K8XZThGJ1ak7LZ1ctoiJp5k= -go.opentelemetry.io/collector/exporter/otlpexporter v0.66.1-0.20221202005155-1c54042beb70 h1:m9GPfziw/079Xt7/Pfby/5obJhtqR19WKkgQQ/VxNZo= -go.opentelemetry.io/collector/exporter/otlpexporter v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:bCD3trc7OqeEVCgyQdO3kwGgogZMjcMu2tX49SFv1lU= -go.opentelemetry.io/collector/exporter/otlphttpexporter v0.66.1-0.20221202005155-1c54042beb70 h1:7rDNCZS1qfqZxnCLaBWItnX/TweYKC6NyULpelzXl4g= -go.opentelemetry.io/collector/exporter/otlphttpexporter v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:vkFlRP0DDfDfSDVl96Gvy5Ah8L8sMcVAxMZn+0af2ew= -go.opentelemetry.io/collector/extension/ballastextension v0.66.1-0.20221202005155-1c54042beb70 h1:pSGZDMMURLRp7iSxeNlDNDxDgFQJqCYt+Fv7bZxC0JU= -go.opentelemetry.io/collector/extension/ballastextension v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:+YdyZisEXLDE8rhZE7Ce4wli0ZVE164SFN0qg2mPjDU= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/component v0.67.0 h1:GCBRZAqk4yNaT4L1uwlbbwophFHrxYccLZ4Uj1Ifs/M= +go.opentelemetry.io/collector/component v0.67.0/go.mod h1:Txa2lm9oe7xsGQN8u7GdUIrRpAHFIKsTO4Qi3/CSmKk= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/exporter/loggingexporter v0.67.0 h1:09dH5PKxcqKuvxzCVf/j+oEgDYC2LBTgDhaDxujdEO8= +go.opentelemetry.io/collector/exporter/loggingexporter v0.67.0/go.mod h1:8sHgDw0tYsBQTunEBZojJ/L43CyaKVPAvT6eqGlo7xo= +go.opentelemetry.io/collector/exporter/otlpexporter v0.67.0 h1:AxejzV7pxCQjdIsIBLQPbeub2SqbyAsu09TA1BG0jcs= +go.opentelemetry.io/collector/exporter/otlpexporter v0.67.0/go.mod h1:urludZR9ya0gUNf7JXzKL06gX2Anu4BDa6UfCvI61Hw= +go.opentelemetry.io/collector/exporter/otlphttpexporter v0.67.0 h1:B91LfbKa0Khqc8SX2aVd5D2g9aDpeCEJ+jDjNb894mA= +go.opentelemetry.io/collector/exporter/otlphttpexporter v0.67.0/go.mod h1:o7HgN765fAq2cuATsQF2BLhbXiFJ+fK0NIbfcmw2Pa8= +go.opentelemetry.io/collector/extension/ballastextension v0.67.0 h1:fqwrpnAZ/4B5Ghs3vkAZiBnW5b9ro8dbhNa1kw61IXA= +go.opentelemetry.io/collector/extension/ballastextension v0.67.0/go.mod h1:aLm/LXcYAfRW+VWPczi5DKgCcajYPve0Z+fcPLw0w3U= go.opentelemetry.io/collector/extension/zpagesextension v0.64.1/go.mod h1:XenhQAUbOHgqNq5YQ/vQIcDHRcPUaDgZQxDC2qoI4Bc= -go.opentelemetry.io/collector/extension/zpagesextension v0.65.0/go.mod h1:+IPas7AeffG0GMIXhZr8IzpTNhH1Ri/6S/9YFqbLsmQ= -go.opentelemetry.io/collector/extension/zpagesextension v0.66.0/go.mod h1:+IPas7AeffG0GMIXhZr8IzpTNhH1Ri/6S/9YFqbLsmQ= -go.opentelemetry.io/collector/extension/zpagesextension v0.66.1-0.20221202005155-1c54042beb70 h1:+vq59gRJpiAcUshBVxhqhc9aXOc/8Z5wuWlyng5Hfm4= -go.opentelemetry.io/collector/extension/zpagesextension v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tejEMB1pDXsmEeyg7UHB+S++4Lvgtki7N5CVWk5rI4A= -go.opentelemetry.io/collector/featuregate v0.65.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/extension/zpagesextension v0.67.0 h1:TRW8vZwE+/h2vJqqMDmyQO9X0sxcYCSXf5MyXozSLas= +go.opentelemetry.io/collector/extension/zpagesextension v0.67.0/go.mod h1:let/Bt3vTou1cVKhfv+z6FTSk3JaYV11z9C4O/PDPrA= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= go.opentelemetry.io/collector/pdata v0.56.0/go.mod h1:mYcCREWiIJyHss0dbU+GSiz2tmGZ6u09vtfkKTciog4= go.opentelemetry.io/collector/pdata v0.57.2/go.mod h1:RU9I8lwBUxucwOsSYzHEcHi15M9QaX78hgQ2PRdSxV0= go.opentelemetry.io/collector/pdata v0.64.1/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= -go.opentelemetry.io/collector/pdata v0.65.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= go.opentelemetry.io/collector/processor/batchprocessor v0.64.1/go.mod h1:qVl0+aYokPfiq5y+JVAvlII2rrUFBDEqqiDbTSnax78= -go.opentelemetry.io/collector/processor/batchprocessor v0.65.0/go.mod h1:XhGTsC1B/bq4gpg8IZ/QYBLXkzE4Gw3r7Xu2+ik8A1Q= -go.opentelemetry.io/collector/processor/batchprocessor v0.66.0/go.mod h1:XhGTsC1B/bq4gpg8IZ/QYBLXkzE4Gw3r7Xu2+ik8A1Q= -go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221202005155-1c54042beb70 h1:Y4e8NnVevonnAgmjX9Z7QIMA32yMqHAOnAlh8SzTS8c= -go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:Pi1CsKDQFoDrUP1i3+VdE6s2Xuji7bOGFBgqHK0J32E= -go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.66.1-0.20221202005155-1c54042beb70 h1:l0005D1ERsXKno9Ax5Gr2A8FaysF7n40yer6r5qAMHQ= -go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:9CBysimj8fH0weF6Wu8S8nW7cG/XRanrMU1BWlIXeN4= +go.opentelemetry.io/collector/processor/batchprocessor v0.67.0 h1:Qn4Ytth3q1trwTSAYYTzIRs4SBh9rz0xBou1nZB+Dko= +go.opentelemetry.io/collector/processor/batchprocessor v0.67.0/go.mod h1:+ZXCkUG9tlwbbVLi+PT9DjQ7vz+lfFSQqvW45snLYno= +go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.67.0 h1:m3GK5/lZIznGFzzvSPuQo5jxvEn43efv4VkvPtZwDI8= +go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.67.0/go.mod h1:YYjx8ouKYP6AZJ4f4PQPo8cuzcE8n4atn7gOoB890FQ= go.opentelemetry.io/collector/receiver/otlpreceiver v0.64.1/go.mod h1:4rwNi9SeCKBP9XGLWNRFKPsWUV5NK4iqMvdj2WRMksQ= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.66.1-0.20221202005155-1c54042beb70 h1:KBbbPVDV7o5w857g6ePphdu4MV87jrcQevFYDA1okUk= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:0Py8RNjNiFRH6/F+vM2uptdaw9hMj1FBdv0ySntM2gE= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.67.0 h1:pMluLYSSAH7n8zkPWYkWGY/pALrVxG9rHX8J/WDrcx0= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.67.0/go.mod h1:GIJc0eu4N2oJB420N3NhSFJ1IhAgCwvlTCMGWxKhXgg= go.opentelemetry.io/collector/semconv v0.56.0/go.mod h1:EH1wbDvTyqKpKBBpoMIe0KQk2plCcFS66Mo17WtR7CQ= go.opentelemetry.io/collector/semconv v0.57.2/go.mod h1:84YnUjmm+nhGu4YTDLnHCbxnL74ooWpismPG79tFD7w= go.opentelemetry.io/collector/semconv v0.64.1/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= -go.opentelemetry.io/collector/semconv v0.65.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= -go.opentelemetry.io/collector/semconv v0.66.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 h1:Q5L9Urod3c8as6ZYaoaqBjarx/HXxsxy34DFZIU2fO4= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector/semconv v0.67.0 h1:zLAvcQa6Kgow52FFLrmk7/9ZVtEYyA73+xDtCcFG78Q= +go.opentelemetry.io/collector/semconv v0.67.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.33.0/go.mod h1:y/SlJpJQPd2UzfBCj0E9Flk9FDCtTyqUmaCB41qFrWI= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4 h1:PRXhsszxTt5bbPriTjmaweWUsAnJYeWBhUMLRetUgBU= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4/go.mod h1:05eWWy6ZWzmpeImD3UowLTB3VjDMU1yxQ+ENuVWDM3c= diff --git a/testbed/mockdatareceivers/mockawsxrayreceiver/factory.go b/testbed/mockdatareceivers/mockawsxrayreceiver/factory.go index 272ed5de4b9be..22197f91c416f 100644 --- a/testbed/mockdatareceivers/mockawsxrayreceiver/factory.go +++ b/testbed/mockdatareceivers/mockawsxrayreceiver/factory.go @@ -20,6 +20,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer" + "go.opentelemetry.io/collector/receiver" ) // This file implements factory for awsxray receiver. @@ -35,11 +36,11 @@ const ( ) // NewFactory creates a factory for SAPM receiver. -func NewFactory() component.ReceiverFactory { - return component.NewReceiverFactory( +func NewFactory() receiver.Factory { + return receiver.NewFactory( typeStr, createDefaultConfig, - component.WithTracesReceiver(createTracesReceiver, stability)) + receiver.WithTraces(createTracesReceiver, stability)) } // CreateDefaultConfig creates the default configuration for Jaeger receiver. @@ -53,10 +54,10 @@ func createDefaultConfig() component.Config { // CreateTracesReceiver creates a trace receiver based on provided config. func createTracesReceiver( ctx context.Context, - params component.ReceiverCreateSettings, + params receiver.CreateSettings, cfg component.Config, nextConsumer consumer.Traces, -) (component.TracesReceiver, error) { +) (receiver.Traces, error) { rCfg := cfg.(*Config) return New(nextConsumer, params, rCfg) } diff --git a/testbed/mockdatareceivers/mockawsxrayreceiver/go.mod b/testbed/mockdatareceivers/mockawsxrayreceiver/go.mod index 282c1bf0cf274..f5ecca46dedb4 100644 --- a/testbed/mockdatareceivers/mockawsxrayreceiver/go.mod +++ b/testbed/mockdatareceivers/mockawsxrayreceiver/go.mod @@ -4,10 +4,10 @@ go 1.18 require ( github.com/gorilla/mux v1.8.0 - go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector v0.67.0 + go.opentelemetry.io/collector/component v0.67.0 + go.opentelemetry.io/collector/consumer v0.67.0 + go.opentelemetry.io/collector/pdata v1.0.0-rc1 go.uber.org/zap v1.24.0 ) @@ -24,8 +24,8 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pelletier/go-toml v1.9.4 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/confmap v0.67.0 // indirect + go.opentelemetry.io/collector/featuregate v0.67.0 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/testbed/mockdatareceivers/mockawsxrayreceiver/go.sum b/testbed/mockdatareceivers/mockawsxrayreceiver/go.sum index 58bbf1a4559eb..84f4c88d52c2b 100644 --- a/testbed/mockdatareceivers/mockawsxrayreceiver/go.sum +++ b/testbed/mockdatareceivers/mockawsxrayreceiver/go.sum @@ -278,18 +278,18 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= -go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= -go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= -go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.67.0 h1:o4fDFi2WXGUHsVPzkC3Us4UDA9lQ473aAwoc31hvTzg= +go.opentelemetry.io/collector v0.67.0/go.mod h1:VPN6R31Quq4ARfs5YCsMJVpp8sc+1hFcAiyKQHd84dM= +go.opentelemetry.io/collector/component v0.67.0 h1:GCBRZAqk4yNaT4L1uwlbbwophFHrxYccLZ4Uj1Ifs/M= +go.opentelemetry.io/collector/component v0.67.0/go.mod h1:Txa2lm9oe7xsGQN8u7GdUIrRpAHFIKsTO4Qi3/CSmKk= +go.opentelemetry.io/collector/confmap v0.67.0 h1:P8ZvoODl1fnOLSeQX+XX6GaRJe3e7hA/pRSnsX4+CJo= +go.opentelemetry.io/collector/confmap v0.67.0/go.mod h1:RD35X4ZRcpkNVyWxqC5of8PWbeCtIHhU8GYZrPv46Ho= +go.opentelemetry.io/collector/consumer v0.67.0 h1:kjA23kxtC8Vt7u9YjpQwQkNj6Oe5O2ur1b9JbUFYuEI= +go.opentelemetry.io/collector/consumer v0.67.0/go.mod h1:2Osu8k+Egw1tHopZRh+Wi2a70AkjeugUcXZyGZhAJFE= +go.opentelemetry.io/collector/featuregate v0.67.0 h1:vq5zv0ztjdl2S00ENX0wGo7s9aAKzPL936B8+xScmM4= +go.opentelemetry.io/collector/featuregate v0.67.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v1.0.0-rc1 h1:/eu/EGIuVAac/kdFrfYrOoHB3SmVyydo7Yh3wP6zJ6g= +go.opentelemetry.io/collector/pdata v1.0.0-rc1/go.mod h1:wrkdk9IIdBXJZ/LLL6KOSk4SZPXBkJxf7VLX0HyMaWA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/testbed/mockdatareceivers/mockawsxrayreceiver/trace_receiver.go b/testbed/mockdatareceivers/mockawsxrayreceiver/trace_receiver.go index 9872e50948355..3ec0b1f376457 100644 --- a/testbed/mockdatareceivers/mockawsxrayreceiver/trace_receiver.go +++ b/testbed/mockdatareceivers/mockawsxrayreceiver/trace_receiver.go @@ -29,6 +29,7 @@ import ( "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/obsreport" "go.opentelemetry.io/collector/pdata/ptrace" + "go.opentelemetry.io/collector/receiver" "go.uber.org/zap" ) @@ -48,7 +49,7 @@ type MockAwsXrayReceiver struct { // New creates a new awsxrayreceiver.MockAwsXrayReceiver reference. func New( nextConsumer consumer.Traces, - params component.ReceiverCreateSettings, + params receiver.CreateSettings, config *Config) (*MockAwsXrayReceiver, error) { if nextConsumer == nil { return nil, component.ErrNilNextConsumer diff --git a/testbed/testbed/components.go b/testbed/testbed/components.go index c0eebc4265a26..c0cbc4ca17d72 100644 --- a/testbed/testbed/components.go +++ b/testbed/testbed/components.go @@ -16,6 +16,7 @@ package testbed // import "github.com/open-telemetry/opentelemetry-collector-con import ( "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/exporter" "go.opentelemetry.io/collector/exporter/loggingexporter" "go.opentelemetry.io/collector/exporter/otlpexporter" "go.opentelemetry.io/collector/exporter/otlphttpexporter" @@ -24,6 +25,7 @@ import ( "go.opentelemetry.io/collector/extension/zpagesextension" "go.opentelemetry.io/collector/processor/batchprocessor" "go.opentelemetry.io/collector/processor/memorylimiterprocessor" + "go.opentelemetry.io/collector/receiver" "go.opentelemetry.io/collector/receiver/otlpreceiver" "go.uber.org/multierr" @@ -48,7 +50,7 @@ func Components() ( ) errs = multierr.Append(errs, err) - receivers, err := component.MakeReceiverFactoryMap( + receivers, err := receiver.MakeFactoryMap( jaegerreceiver.NewFactory(), opencensusreceiver.NewFactory(), otlpreceiver.NewFactory(), @@ -56,7 +58,7 @@ func Components() ( ) errs = multierr.Append(errs, err) - exporters, err := component.MakeExporterFactoryMap( + exporters, err := exporter.MakeFactoryMap( jaegerexporter.NewFactory(), loggingexporter.NewFactory(), opencensusexporter.NewFactory(), diff --git a/testbed/testbed/in_process_collector.go b/testbed/testbed/in_process_collector.go index 02aaf6613455b..dbc913611c4ec 100644 --- a/testbed/testbed/in_process_collector.go +++ b/testbed/testbed/in_process_collector.go @@ -25,6 +25,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/confmap" "go.opentelemetry.io/collector/confmap/provider/fileprovider" + "go.opentelemetry.io/collector/otelcol" "go.opentelemetry.io/collector/service" ) @@ -103,9 +104,9 @@ func (ipp *inProcessCollector) Start(args StartParams) error { for { switch state := ipp.svc.GetState(); state { - case service.StateStarting: + case otelcol.StateStarting: time.Sleep(time.Second) - case service.StateRunning: + case otelcol.StateRunning: return nil default: return fmt.Errorf("unable to start, otelcol state is %d", state) diff --git a/testbed/testbed/receivers.go b/testbed/testbed/receivers.go index 78087598780e2..9304da6b15115 100644 --- a/testbed/testbed/receivers.go +++ b/testbed/testbed/receivers.go @@ -18,11 +18,12 @@ import ( "context" "fmt" - "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config/confignet" "go.opentelemetry.io/collector/consumer" + "go.opentelemetry.io/collector/receiver" "go.opentelemetry.io/collector/receiver/otlpreceiver" + "go.opentelemetry.io/collector/receiver/receivertest" ) // DataReceiver allows to receive traces or metrics. This is an interface that must @@ -59,9 +60,9 @@ type BaseOTLPDataReceiver struct { DataReceiverBase // One of the "otlp" for OTLP over gRPC or "otlphttp" for OTLP over HTTP. exporterType string - traceReceiver component.TracesReceiver - metricsReceiver component.MetricsReceiver - logReceiver component.LogsReceiver + traceReceiver receiver.Traces + metricsReceiver receiver.Metrics + logReceiver receiver.Logs compression string } @@ -76,7 +77,7 @@ func (bor *BaseOTLPDataReceiver) Start(tc consumer.Traces, mc consumer.Metrics, cfg.GRPC = nil } var err error - set := componenttest.NewNopReceiverCreateSettings() + set := receivertest.NewNopCreateSettings() if bor.traceReceiver, err = factory.CreateTracesReceiver(context.Background(), set, cfg, tc); err != nil { return err } diff --git a/testbed/testbed/senders.go b/testbed/testbed/senders.go index 1609b8b342722..024a185208c9f 100644 --- a/testbed/testbed/senders.go +++ b/testbed/testbed/senders.go @@ -22,6 +22,7 @@ import ( "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config/configtls" "go.opentelemetry.io/collector/consumer" + "go.opentelemetry.io/collector/exporter/exportertest" "go.opentelemetry.io/collector/exporter/otlpexporter" "go.opentelemetry.io/collector/exporter/otlphttpexporter" "go.uber.org/zap" @@ -135,7 +136,7 @@ func NewOTLPHTTPTraceDataSender(host string, port int) TraceDataSender { func (ote *otlpHTTPTraceDataSender) Start() error { factory := otlphttpexporter.NewFactory() cfg := ote.fillConfig(factory.CreateDefaultConfig().(*otlphttpexporter.Config)) - params := componenttest.NewNopExporterCreateSettings() + params := exportertest.NewNopCreateSettings() params.Logger = zap.L() exp, err := factory.CreateTracesExporter(context.Background(), params, cfg) @@ -169,7 +170,7 @@ func NewOTLPHTTPMetricDataSender(host string, port int) MetricDataSender { func (ome *otlpHTTPMetricsDataSender) Start() error { factory := otlphttpexporter.NewFactory() cfg := ome.fillConfig(factory.CreateDefaultConfig().(*otlphttpexporter.Config)) - params := componenttest.NewNopExporterCreateSettings() + params := exportertest.NewNopCreateSettings() params.Logger = zap.L() exp, err := factory.CreateMetricsExporter(context.Background(), params, cfg) @@ -203,7 +204,7 @@ func NewOTLPHTTPLogsDataSender(host string, port int) LogDataSender { func (olds *otlpHTTPLogsDataSender) Start() error { factory := otlphttpexporter.NewFactory() cfg := olds.fillConfig(factory.CreateDefaultConfig().(*otlphttpexporter.Config)) - params := componenttest.NewNopExporterCreateSettings() + params := exportertest.NewNopCreateSettings() params.Logger = zap.L() exp, err := factory.CreateLogsExporter(context.Background(), params, cfg) @@ -265,7 +266,7 @@ func NewOTLPTraceDataSender(host string, port int) TraceDataSender { func (ote *otlpTraceDataSender) Start() error { factory := otlpexporter.NewFactory() cfg := ote.fillConfig(factory.CreateDefaultConfig().(*otlpexporter.Config)) - params := componenttest.NewNopExporterCreateSettings() + params := exportertest.NewNopCreateSettings() params.Logger = zap.L() exp, err := factory.CreateTracesExporter(context.Background(), params, cfg) @@ -299,7 +300,7 @@ func NewOTLPMetricDataSender(host string, port int) MetricDataSender { func (ome *otlpMetricsDataSender) Start() error { factory := otlpexporter.NewFactory() cfg := ome.fillConfig(factory.CreateDefaultConfig().(*otlpexporter.Config)) - params := componenttest.NewNopExporterCreateSettings() + params := exportertest.NewNopCreateSettings() params.Logger = zap.L() exp, err := factory.CreateMetricsExporter(context.Background(), params, cfg) @@ -333,7 +334,7 @@ func NewOTLPLogsDataSender(host string, port int) LogDataSender { func (olds *otlpLogsDataSender) Start() error { factory := otlpexporter.NewFactory() cfg := olds.fillConfig(factory.CreateDefaultConfig().(*otlpexporter.Config)) - params := componenttest.NewNopExporterCreateSettings() + params := exportertest.NewNopCreateSettings() params.Logger = zap.L() exp, err := factory.CreateLogsExporter(context.Background(), params, cfg) diff --git a/versions.yaml b/versions.yaml index 53ec500b87005..d6d7e72afe4cb 100644 --- a/versions.yaml +++ b/versions.yaml @@ -14,7 +14,7 @@ module-sets: contrib-base: - version: v0.66.0 + version: v0.67.0 modules: - github.com/open-telemetry/opentelemetry-collector-contrib - github.com/open-telemetry/opentelemetry-collector-contrib/cmd/configschema