Skip to content
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

Jump to bottom

[chore] Update otel #34789

Merged
merged 9 commits into from
Aug 21, 2024
Merged

[chore] Update otel #34789

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
74f53f2
[chore] multimod update stable modules
TylerHelmuth Aug 21, 2024
fd5010b
[chore] multimod update beta modules
TylerHelmuth Aug 21, 2024
910a011
make gotidy
TylerHelmuth Aug 21, 2024
3905426
Update builder configs
TylerHelmuth Aug 21, 2024
9eb652a
Update another dep
TylerHelmuth Aug 21, 2024
4c2b397
[extension/healthcheckv2] Handle extensions with InstanceID changes
mwear Aug 21, 2024
5572f6e
Fix lint
TylerHelmuth Aug 21, 2024
225ff48
Merge branch 'update-otel' into hcv2-ext-updates
TylerHelmuth Aug 21, 2024
105bdc3
Merge pull request #19 from mwear/hcv2-ext-updates
TylerHelmuth Aug 21, 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
  •  
  •  
  •  
7 changes: 2 additions & 5 deletions cmd/githubgen/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,19 @@ go 1.22.0

require (
github.com/google/go-github/v63 v63.0.0
go.opentelemetry.io/collector/confmap v0.107.1-0.20240816132030-9fd84668bb02
go.opentelemetry.io/collector/confmap/provider/fileprovider v0.107.1-0.20240816132030-9fd84668bb02
go.opentelemetry.io/collector/confmap v0.107.1-0.20240821120936-6764622672bc
go.opentelemetry.io/collector/confmap/provider/fileprovider v0.107.1-0.20240821120936-6764622672bc
gopkg.in/yaml.v3 v3.0.1
)

require (
github.com/go-viper/mapstructure/v2 v2.1.0 // indirect
github.com/google/go-querystring v1.1.0 // indirect
github.com/hashicorp/go-version v1.7.0 // indirect
github.com/knadh/koanf/maps v0.1.1 // indirect
github.com/knadh/koanf/providers/confmap v0.1.0 // indirect
github.com/knadh/koanf/v2 v2.1.1 // indirect
github.com/mitchellh/copystructure v1.2.0 // indirect
github.com/mitchellh/reflectwalk v1.0.2 // indirect
go.opentelemetry.io/collector/featuregate v1.13.1-0.20240816132030-9fd84668bb02 // indirect
go.opentelemetry.io/collector/internal/globalgates v0.107.1-0.20240816132030-9fd84668bb02 // indirect
go.uber.org/multierr v1.11.0 // indirect
go.uber.org/zap v1.27.0 // indirect
)
14 changes: 4 additions & 10 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.13.1-0.20240816132030-9fd84668bb02
go.opentelemetry.io/collector/config/configtls v1.13.1-0.20240816132030-9fd84668bb02
go.opentelemetry.io/collector/semconv v0.107.1-0.20240816132030-9fd84668bb02
go.opentelemetry.io/collector/config/configopaque v1.13.1-0.20240821120936-6764622672bc
go.opentelemetry.io/collector/config/configtls v1.13.1-0.20240821120936-6764622672bc
go.opentelemetry.io/collector/semconv v0.107.1-0.20240821120936-6764622672bc
go.uber.org/goleak v1.3.0
go.uber.org/zap v1.27.0
golang.org/x/sys v0.21.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.107.0

extensions:
- gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.107.1-0.20240816132030-9fd84668bb02
- gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.107.1-0.20240821120936-6764622672bc
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/ackextension v0.107.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/asapauthextension v0.107.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/awsproxy v0.107.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.107.1-0.20240816132030-9fd84668bb02
- gomod: go.opentelemetry.io/collector/exporter/nopexporter v0.107.1-0.20240816132030-9fd84668bb02
- gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.107.1-0.20240816132030-9fd84668bb02
- gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.107.1-0.20240816132030-9fd84668bb02
- gomod: go.opentelemetry.io/collector/exporter/debugexporter v0.107.1-0.20240821120936-6764622672bc
- gomod: go.opentelemetry.io/collector/exporter/nopexporter v0.107.1-0.20240821120936-6764622672bc
- gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.107.1-0.20240821120936-6764622672bc
- gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.107.1-0.20240821120936-6764622672bc
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/alertmanagerexporter v0.107.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/alibabacloudlogserviceexporter v0.107.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awscloudwatchlogsexporter v0.107.0
Expand Down Expand Up @@ -103,8 +103,8 @@ exporters:
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/zipkinexporter v0.107.0

processors:
- gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.107.1-0.20240816132030-9fd84668bb02
- gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.107.1-0.20240816132030-9fd84668bb02
- gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.107.1-0.20240821120936-6764622672bc
- gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.107.1-0.20240821120936-6764622672bc
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor v0.107.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/cumulativetodeltaprocessor v0.107.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/deltatocumulativeprocessor v0.107.0
Expand All @@ -128,8 +128,8 @@ processors:
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/remotetapprocessor v0.107.0

receivers:
- gomod: go.opentelemetry.io/collector/receiver/nopreceiver v0.107.1-0.20240816132030-9fd84668bb02
- gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.107.1-0.20240816132030-9fd84668bb02
- gomod: go.opentelemetry.io/collector/receiver/nopreceiver v0.107.1-0.20240821120936-6764622672bc
- gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.107.1-0.20240821120936-6764622672bc
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/activedirectorydsreceiver v0.107.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/aerospikereceiver v0.107.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/apachereceiver v0.107.0
Expand Down Expand Up @@ -220,7 +220,7 @@ receivers:
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zookeeperreceiver v0.107.0

connectors:
- gomod: go.opentelemetry.io/collector/connector/forwardconnector v0.107.1-0.20240816132030-9fd84668bb02
- gomod: go.opentelemetry.io/collector/connector/forwardconnector v0.107.1-0.20240821120936-6764622672bc
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/countconnector v0.107.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/datadogconnector v0.107.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/exceptionsconnector v0.107.0
Expand All @@ -233,11 +233,11 @@ connectors:
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/spanmetricsconnector v0.107.0

providers:
- gomod: go.opentelemetry.io/collector/confmap/provider/envprovider v0.107.1-0.20240816132030-9fd84668bb02
- gomod: go.opentelemetry.io/collector/confmap/provider/fileprovider v0.107.1-0.20240816132030-9fd84668bb02
- gomod: go.opentelemetry.io/collector/confmap/provider/httpprovider v0.107.1-0.20240816132030-9fd84668bb02
- gomod: go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.107.1-0.20240816132030-9fd84668bb02
- gomod: go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.107.1-0.20240816132030-9fd84668bb02
- gomod: go.opentelemetry.io/collector/confmap/provider/envprovider v0.107.1-0.20240821120936-6764622672bc
- gomod: go.opentelemetry.io/collector/confmap/provider/fileprovider v0.107.1-0.20240821120936-6764622672bc
- gomod: go.opentelemetry.io/collector/confmap/provider/httpprovider v0.107.1-0.20240821120936-6764622672bc
- gomod: go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.107.1-0.20240821120936-6764622672bc
- gomod: go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.107.1-0.20240821120936-6764622672bc
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/confmap/provider/s3provider v0.107.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/confmap/provider/secretsmanagerprovider v0.107.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
Loading