Skip to content

[chore] update core to pull in telemetry settings changes #34930

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 11 commits into from
Aug 30, 2024
Merged

[chore] update core to pull in telemetry settings changes #34930

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
e2bd473
[chore] multimod update stable modules
codeboten Aug 29, 2024
41cf9aa
[chore] multimod update beta modules
codeboten Aug 29, 2024
189c859
tidy
codeboten Aug 29, 2024
fc42748
make generate
codeboten Aug 29, 2024
f207cd1
genotelcontrib & oteltestbed
codeboten Aug 29, 2024
929262d
update uses of TelemetrySettings
codeboten Aug 29, 2024
9dc8ac1
tidy
codeboten Aug 30, 2024
db25f06
fix solace receiver tests
codeboten Aug 30, 2024
119fd05
fix delta to cumulative tests
codeboten Aug 30, 2024
1155c57
fix lint
codeboten Aug 30, 2024
91bbe8c
prevent prom remote write test from testing underlying library instru…
codeboten Aug 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 2 additions & 2 deletions cmd/githubgen/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ go 1.22.0

require (
github.com/google/go-github/v63 v63.0.0
go.opentelemetry.io/collector/confmap v1.14.1
go.opentelemetry.io/collector/confmap/provider/fileprovider v0.108.1
go.opentelemetry.io/collector/confmap v1.14.2-0.20240829190554-7da6b618a7ee
go.opentelemetry.io/collector/confmap/provider/fileprovider v0.108.2-0.20240829190554-7da6b618a7ee
gopkg.in/yaml.v3 v3.0.1
)

Expand Down
8 changes: 4 additions & 4 deletions cmd/githubgen/go.sum
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions cmd/opampsupervisor/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ require (
github.com/knadh/koanf/v2 v2.1.1
github.com/open-telemetry/opamp-go v0.15.0
github.com/stretchr/testify v1.9.0
go.opentelemetry.io/collector/config/configopaque v1.14.1
go.opentelemetry.io/collector/config/configtls v1.14.1
go.opentelemetry.io/collector/semconv v0.108.1
go.opentelemetry.io/collector/config/configopaque v1.14.2-0.20240829190554-7da6b618a7ee
go.opentelemetry.io/collector/config/configtls v1.14.2-0.20240829190554-7da6b618a7ee
go.opentelemetry.io/collector/semconv v0.108.2-0.20240829190554-7da6b618a7ee
go.uber.org/goleak v1.3.0
go.uber.org/zap v1.27.0
golang.org/x/sys v0.24.0
Expand Down
12 changes: 6 additions & 6 deletions cmd/opampsupervisor/go.sum
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

30 changes: 15 additions & 15 deletions cmd/otelcontribcol/builder-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ dist:
otelcol_version: 0.108.1

extensions:
- gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.108.1
- gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.108.2-0.20240829190554-7da6b618a7ee
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/ackextension v0.108.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/asapauthextension v0.108.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/awsproxy v0.108.0
Expand Down Expand Up @@ -53,10 +53,10 @@ extensions:
import: github.com/open-telemetry/opentelemetry-collector-contrib/extension/encoding/zipkinencodingextension

exporters:
- gomod: go.opentelemetry.io/collector/exporter/debugexporter v0.108.1
- gomod: go.opentelemetry.io/collector/exporter/nopexporter v0.108.1
- gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.108.1
- gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.108.1
- gomod: go.opentelemetry.io/collector/exporter/debugexporter v0.108.2-0.20240829190554-7da6b618a7ee
- gomod: go.opentelemetry.io/collector/exporter/nopexporter v0.108.2-0.20240829190554-7da6b618a7ee
- gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.108.2-0.20240829190554-7da6b618a7ee
- gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.108.2-0.20240829190554-7da6b618a7ee
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/alertmanagerexporter v0.108.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/alibabacloudlogserviceexporter v0.108.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awscloudwatchlogsexporter v0.108.0
Expand Down Expand Up @@ -103,8 +103,8 @@ exporters:
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/zipkinexporter v0.108.0

processors:
- gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.108.1
- gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.108.1
- gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.108.2-0.20240829190554-7da6b618a7ee
- gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.108.2-0.20240829190554-7da6b618a7ee
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor v0.108.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/cumulativetodeltaprocessor v0.108.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/deltatocumulativeprocessor v0.108.0
Expand All @@ -130,8 +130,8 @@ processors:
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/remotetapprocessor v0.108.0

receivers:
- gomod: go.opentelemetry.io/collector/receiver/nopreceiver v0.108.1
- gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.108.1
- gomod: go.opentelemetry.io/collector/receiver/nopreceiver v0.108.2-0.20240829190554-7da6b618a7ee
- gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.108.2-0.20240829190554-7da6b618a7ee
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/activedirectorydsreceiver v0.108.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/aerospikereceiver v0.108.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/apachereceiver v0.108.0
Expand Down Expand Up @@ -222,7 +222,7 @@ receivers:
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zookeeperreceiver v0.108.0

connectors:
- gomod: go.opentelemetry.io/collector/connector/forwardconnector v0.108.1
- gomod: go.opentelemetry.io/collector/connector/forwardconnector v0.108.2-0.20240829190554-7da6b618a7ee
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/countconnector v0.108.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/datadogconnector v0.108.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/exceptionsconnector v0.108.0
Expand All @@ -235,11 +235,11 @@ connectors:
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/spanmetricsconnector v0.108.0

providers:
- gomod: go.opentelemetry.io/collector/confmap/provider/envprovider v0.108.1
- gomod: go.opentelemetry.io/collector/confmap/provider/fileprovider v0.108.1
- gomod: go.opentelemetry.io/collector/confmap/provider/httpprovider v0.108.1
- gomod: go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.108.1
- gomod: go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.108.1
- gomod: go.opentelemetry.io/collector/confmap/provider/envprovider v0.108.2-0.20240829190554-7da6b618a7ee
- gomod: go.opentelemetry.io/collector/confmap/provider/fileprovider v0.108.2-0.20240829190554-7da6b618a7ee
- gomod: go.opentelemetry.io/collector/confmap/provider/httpprovider v0.108.2-0.20240829190554-7da6b618a7ee
- gomod: go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.108.2-0.20240829190554-7da6b618a7ee
- gomod: go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.108.2-0.20240829190554-7da6b618a7ee
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/confmap/provider/s3provider v0.108.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/confmap/provider/secretsmanagerprovider v0.108.0

Expand Down
20 changes: 10 additions & 10 deletions cmd/otelcontribcol/components.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading