Skip to content

Commit 6575f8a

Browse files
codebotencodeboten
authored
update core to e014c1e (#33956)
This unblocks contrib tests in core by also updating the code in the geoipreceiver that was causing build failures --------- Signed-off-by: Alex Boten <[email protected]>
1 parent 52a1313 commit 6575f8a

File tree

511 files changed

+19984
-19132
lines changed

Some content is hidden

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

511 files changed

+19984
-19132
lines changed

‎cmd/githubgen/go.mod‎

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

55
require (
66
github.com/google/go-github/v62 v62.0.0
7-
go.opentelemetry.io/collector/confmap v0.104.0
8-
go.opentelemetry.io/collector/confmap/provider/fileprovider v0.104.0
7+
go.opentelemetry.io/collector/confmap v0.104.1-0.20240705135726-e014c1ed756c
8+
go.opentelemetry.io/collector/confmap/provider/fileprovider v0.104.1-0.20240705135726-e014c1ed756c
99
gopkg.in/yaml.v3 v3.0.1
1010
)
1111

@@ -18,7 +18,7 @@ require (
1818
github.com/knadh/koanf/v2 v2.1.1 // indirect
1919
github.com/mitchellh/copystructure v1.2.0 // indirect
2020
github.com/mitchellh/reflectwalk v1.0.2 // indirect
21-
go.opentelemetry.io/collector/featuregate v1.11.0 // indirect
21+
go.opentelemetry.io/collector/featuregate v1.11.1-0.20240705135726-e014c1ed756c // indirect
2222
go.uber.org/multierr v1.11.0 // indirect
2323
go.uber.org/zap v1.27.0 // indirect
2424
)

‎cmd/githubgen/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/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.11.0
16-
go.opentelemetry.io/collector/config/configtls v0.104.0
17-
go.opentelemetry.io/collector/semconv v0.104.0
15+
go.opentelemetry.io/collector/config/configopaque v1.11.1-0.20240705135726-e014c1ed756c
16+
go.opentelemetry.io/collector/config/configtls v0.104.1-0.20240705135726-e014c1ed756c
17+
go.opentelemetry.io/collector/semconv v0.104.1-0.20240705135726-e014c1ed756c
1818
go.uber.org/goleak v1.3.0
1919
go.uber.org/zap v1.27.0
2020
google.golang.org/protobuf v1.34.2

‎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: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ dist:
1414
otelcol_version: 0.104.0
1515

1616
extensions:
17-
- gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.104.0
18-
- gomod: go.opentelemetry.io/collector/extension/ballastextension v0.104.0
17+
- gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.104.1-0.20240705135726-e014c1ed756c
18+
- gomod: go.opentelemetry.io/collector/extension/ballastextension v0.104.1-0.20240705135726-e014c1ed756c
1919
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/ackextension v0.104.0
2020
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/asapauthextension v0.104.0
2121
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/awsproxy v0.104.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.104.0
57-
- gomod: go.opentelemetry.io/collector/exporter/nopexporter v0.104.0
58-
- gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.104.0
59-
- gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.104.0
56+
- gomod: go.opentelemetry.io/collector/exporter/debugexporter v0.104.1-0.20240705135726-e014c1ed756c
57+
- gomod: go.opentelemetry.io/collector/exporter/nopexporter v0.104.1-0.20240705135726-e014c1ed756c
58+
- gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.104.1-0.20240705135726-e014c1ed756c
59+
- gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.104.1-0.20240705135726-e014c1ed756c
6060
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/alertmanagerexporter v0.104.0
6161
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/alibabacloudlogserviceexporter v0.104.0
6262
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awscloudwatchlogsexporter v0.104.0
@@ -103,8 +103,8 @@ exporters:
103103
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/zipkinexporter v0.104.0
104104

105105
processors:
106-
- gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.104.0
107-
- gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.104.0
106+
- gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.104.1-0.20240705135726-e014c1ed756c
107+
- gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.104.1-0.20240705135726-e014c1ed756c
108108
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor v0.104.0
109109
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/cumulativetodeltaprocessor v0.104.0
110110
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/deltatorateprocessor v0.104.0
@@ -127,8 +127,8 @@ processors:
127127
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/remotetapprocessor v0.104.0
128128

129129
receivers:
130-
- gomod: go.opentelemetry.io/collector/receiver/nopreceiver v0.104.0
131-
- gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.104.0
130+
- gomod: go.opentelemetry.io/collector/receiver/nopreceiver v0.104.1-0.20240705135726-e014c1ed756c
131+
- gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.104.1-0.20240705135726-e014c1ed756c
132132
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/activedirectorydsreceiver v0.104.0
133133
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/aerospikereceiver v0.104.0
134134
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/apachereceiver v0.104.0
@@ -219,7 +219,7 @@ receivers:
219219
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zookeeperreceiver v0.104.0
220220

221221
connectors:
222-
- gomod: go.opentelemetry.io/collector/connector/forwardconnector v0.104.0
222+
- gomod: go.opentelemetry.io/collector/connector/forwardconnector v0.104.1-0.20240705135726-e014c1ed756c
223223
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/countconnector v0.104.0
224224
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/datadogconnector v0.104.0
225225
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/exceptionsconnector v0.104.0
@@ -231,13 +231,13 @@ connectors:
231231
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/spanmetricsconnector v0.104.0
232232

233233
providers:
234-
- gomod: go.opentelemetry.io/collector/confmap/provider/envprovider v0.104.0
235-
- gomod: go.opentelemetry.io/collector/confmap/provider/fileprovider v0.104.0
236-
- gomod: go.opentelemetry.io/collector/confmap/provider/httpprovider v0.104.0
237-
- gomod: go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.104.0
238-
- gomod: go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.104.0
239-
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/confmap/provider/s3provider v0.104.0
240-
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/confmap/provider/secretsmanagerprovider v0.104.0
234+
- gomod: go.opentelemetry.io/collector/confmap/provider/envprovider v0.104.1-0.20240705135726-e014c1ed756c
235+
- gomod: go.opentelemetry.io/collector/confmap/provider/fileprovider v0.104.1-0.20240705135726-e014c1ed756c
236+
- gomod: go.opentelemetry.io/collector/confmap/provider/httpprovider v0.104.1-0.20240705135726-e014c1ed756c
237+
- gomod: go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.104.1-0.20240705135726-e014c1ed756c
238+
- gomod: go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.104.1-0.20240705135726-e014c1ed756c
239+
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/confmap/provider/s3provider v0.104.1-0.20240705135726-e014c1ed756c
240+
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/confmap/provider/secretsmanagerprovider v0.104.1-0.20240705135726-e014c1ed756c
241241

242242
replaces:
243243
- github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage => ../../extension/storage

0 commit comments

Comments
 (0)