Skip to content

Commit 2bd62ab

Browse files
djaglowskicodeboten
authored and
f7o
committed
[chore] Update test expectation to include processorhelper metrics (open-telemetry#35073)
This updates collector modules and fixes a test that was broken by open-telemetry/opentelemetry-collector#10910 --------- Signed-off-by: Dan Jaglowski <[email protected]> Signed-off-by: Alex Boten <[email protected]> Co-authored-by: Alex Boten <[email protected]>
1 parent 183681c commit 2bd62ab

File tree

595 files changed

+13386
-13394
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

595 files changed

+13386
-13394
lines changed

‎cmd/githubgen/go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ go 1.22.0
44

55
require (
66
github.com/google/go-github/v63 v63.0.0
7-
go.opentelemetry.io/collector/confmap v1.14.2-0.20240904075637-48b11ba1c5f8
8-
go.opentelemetry.io/collector/confmap/provider/fileprovider v0.108.2-0.20240904075637-48b11ba1c5f8
7+
go.opentelemetry.io/collector/confmap v1.14.2-0.20240909182537-32cff9f7f331
8+
go.opentelemetry.io/collector/confmap/provider/fileprovider v0.108.2-0.20240909182537-32cff9f7f331
99
gopkg.in/yaml.v3 v3.0.1
1010
)
1111

‎cmd/githubgen/go.sum‎

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎cmd/opampsupervisor/go.mod‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ require (
1212
github.com/knadh/koanf/v2 v2.1.1
1313
github.com/open-telemetry/opamp-go v0.15.0
1414
github.com/stretchr/testify v1.9.0
15-
go.opentelemetry.io/collector/config/configopaque v1.14.2-0.20240904075637-48b11ba1c5f8
16-
go.opentelemetry.io/collector/config/configtls v1.14.2-0.20240904075637-48b11ba1c5f8
17-
go.opentelemetry.io/collector/semconv v0.108.2-0.20240904075637-48b11ba1c5f8
15+
go.opentelemetry.io/collector/config/configopaque v1.14.2-0.20240909182537-32cff9f7f331
16+
go.opentelemetry.io/collector/config/configtls v1.14.2-0.20240909182537-32cff9f7f331
17+
go.opentelemetry.io/collector/semconv v0.108.2-0.20240909182537-32cff9f7f331
1818
go.uber.org/goleak v1.3.0
1919
go.uber.org/zap v1.27.0
2020
golang.org/x/sys v0.24.0

‎cmd/opampsupervisor/go.sum‎

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎cmd/otelcontribcol/builder-config.yaml‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ dist:
1414
otelcol_version: 0.108.1
1515

1616
extensions:
17-
- gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.108.2-0.20240904075637-48b11ba1c5f8
17+
- gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.108.2-0.20240909182537-32cff9f7f331
1818
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/ackextension v0.108.0
1919
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/asapauthextension v0.108.0
2020
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/awsproxy v0.108.0
@@ -53,10 +53,10 @@ extensions:
5353
import: github.com/open-telemetry/opentelemetry-collector-contrib/extension/encoding/zipkinencodingextension
5454

5555
exporters:
56-
- gomod: go.opentelemetry.io/collector/exporter/debugexporter v0.108.2-0.20240904075637-48b11ba1c5f8
57-
- gomod: go.opentelemetry.io/collector/exporter/nopexporter v0.108.2-0.20240904075637-48b11ba1c5f8
58-
- gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.108.2-0.20240904075637-48b11ba1c5f8
59-
- gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.108.2-0.20240904075637-48b11ba1c5f8
56+
- gomod: go.opentelemetry.io/collector/exporter/debugexporter v0.108.2-0.20240909182537-32cff9f7f331
57+
- gomod: go.opentelemetry.io/collector/exporter/nopexporter v0.108.2-0.20240909182537-32cff9f7f331
58+
- gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.108.2-0.20240909182537-32cff9f7f331
59+
- gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.108.2-0.20240909182537-32cff9f7f331
6060
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/alertmanagerexporter v0.108.0
6161
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/alibabacloudlogserviceexporter v0.108.0
6262
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awscloudwatchlogsexporter v0.108.0
@@ -103,8 +103,8 @@ exporters:
103103
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/zipkinexporter v0.108.0
104104

105105
processors:
106-
- gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.108.2-0.20240904075637-48b11ba1c5f8
107-
- gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.108.2-0.20240904075637-48b11ba1c5f8
106+
- gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.108.2-0.20240909182537-32cff9f7f331
107+
- gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.108.2-0.20240909182537-32cff9f7f331
108108
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor v0.108.0
109109
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/cumulativetodeltaprocessor v0.108.0
110110
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/deltatocumulativeprocessor v0.108.0
@@ -130,8 +130,8 @@ processors:
130130
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/remotetapprocessor v0.108.0
131131

132132
receivers:
133-
- gomod: go.opentelemetry.io/collector/receiver/nopreceiver v0.108.2-0.20240904075637-48b11ba1c5f8
134-
- gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.108.2-0.20240904075637-48b11ba1c5f8
133+
- gomod: go.opentelemetry.io/collector/receiver/nopreceiver v0.108.2-0.20240909182537-32cff9f7f331
134+
- gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.108.2-0.20240909182537-32cff9f7f331
135135
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/activedirectorydsreceiver v0.108.0
136136
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/aerospikereceiver v0.108.0
137137
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/apachereceiver v0.108.0
@@ -223,7 +223,7 @@ receivers:
223223
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zookeeperreceiver v0.108.0
224224

225225
connectors:
226-
- gomod: go.opentelemetry.io/collector/connector/forwardconnector v0.108.2-0.20240904075637-48b11ba1c5f8
226+
- gomod: go.opentelemetry.io/collector/connector/forwardconnector v0.108.2-0.20240909182537-32cff9f7f331
227227
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/countconnector v0.108.0
228228
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/datadogconnector v0.108.0
229229
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/exceptionsconnector v0.108.0
@@ -236,11 +236,11 @@ connectors:
236236
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/spanmetricsconnector v0.108.0
237237

238238
providers:
239-
- gomod: go.opentelemetry.io/collector/confmap/provider/envprovider v0.108.2-0.20240904075637-48b11ba1c5f8
240-
- gomod: go.opentelemetry.io/collector/confmap/provider/fileprovider v0.108.2-0.20240904075637-48b11ba1c5f8
241-
- gomod: go.opentelemetry.io/collector/confmap/provider/httpprovider v0.108.2-0.20240904075637-48b11ba1c5f8
242-
- gomod: go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.108.2-0.20240904075637-48b11ba1c5f8
243-
- gomod: go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.108.2-0.20240904075637-48b11ba1c5f8
239+
- gomod: go.opentelemetry.io/collector/confmap/provider/envprovider v0.108.2-0.20240909182537-32cff9f7f331
240+
- gomod: go.opentelemetry.io/collector/confmap/provider/fileprovider v0.108.2-0.20240909182537-32cff9f7f331
241+
- gomod: go.opentelemetry.io/collector/confmap/provider/httpprovider v0.108.2-0.20240909182537-32cff9f7f331
242+
- gomod: go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.108.2-0.20240909182537-32cff9f7f331
243+
- gomod: go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.108.2-0.20240909182537-32cff9f7f331
244244
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/confmap/provider/s3provider v0.108.0
245245
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/confmap/provider/secretsmanagerprovider v0.108.0
246246

‎cmd/otelcontribcol/components.go‎

Lines changed: 10 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)