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 core libs #35373

Merged
merged 2 commits into from
Sep 23, 2024
Merged

[chore] update core libs #35373

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
29b634e
update core libs
TylerHelmuth Sep 23, 2024
56335d9
make gotidy
TylerHelmuth Sep 23, 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/v65 v65.0.0
go.opentelemetry.io/collector/confmap v1.15.1-0.20240920203249-d17559b6e89a
go.opentelemetry.io/collector/confmap/provider/fileprovider v1.15.1-0.20240920203249-d17559b6e89a
go.opentelemetry.io/collector/confmap v1.15.1-0.20240923174701-20f73e2294b5
go.opentelemetry.io/collector/confmap/provider/fileprovider v1.15.1-0.20240923174701-20f73e2294b5
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.15.1-0.20240920203249-d17559b6e89a
go.opentelemetry.io/collector/config/configtls v1.15.1-0.20240920203249-d17559b6e89a
go.opentelemetry.io/collector/semconv v0.109.1-0.20240920203249-d17559b6e89a
go.opentelemetry.io/collector/config/configopaque v1.15.1-0.20240923174701-20f73e2294b5
go.opentelemetry.io/collector/config/configtls v1.15.1-0.20240923174701-20f73e2294b5
go.opentelemetry.io/collector/semconv v0.109.1-0.20240923174701-20f73e2294b5
go.uber.org/goleak v1.3.0
go.uber.org/zap v1.27.0
golang.org/x/sys v0.25.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.109.0

extensions:
- gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.109.1-0.20240920203249-d17559b6e89a
- gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.109.1-0.20240923174701-20f73e2294b5
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/ackextension v0.109.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/asapauthextension v0.109.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/awsproxy v0.109.0
Expand Down Expand Up @@ -50,10 +50,10 @@ extensions:
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/encoding/zipkinencodingextension v0.109.0

exporters:
- gomod: go.opentelemetry.io/collector/exporter/debugexporter v0.109.1-0.20240920203249-d17559b6e89a
- gomod: go.opentelemetry.io/collector/exporter/nopexporter v0.109.1-0.20240920203249-d17559b6e89a
- gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.109.1-0.20240920203249-d17559b6e89a
- gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.109.1-0.20240920203249-d17559b6e89a
- gomod: go.opentelemetry.io/collector/exporter/debugexporter v0.109.1-0.20240923174701-20f73e2294b5
- gomod: go.opentelemetry.io/collector/exporter/nopexporter v0.109.1-0.20240923174701-20f73e2294b5
- gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.109.1-0.20240923174701-20f73e2294b5
- gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.109.1-0.20240923174701-20f73e2294b5
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/alertmanagerexporter v0.109.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/alibabacloudlogserviceexporter v0.109.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awscloudwatchlogsexporter v0.109.0
Expand Down Expand Up @@ -100,8 +100,8 @@ exporters:
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/zipkinexporter v0.109.0

processors:
- gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.109.1-0.20240920203249-d17559b6e89a
- gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.109.1-0.20240920203249-d17559b6e89a
- gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.109.1-0.20240923174701-20f73e2294b5
- gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.109.1-0.20240923174701-20f73e2294b5
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor v0.109.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/cumulativetodeltaprocessor v0.109.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/deltatocumulativeprocessor v0.109.0
Expand All @@ -127,8 +127,8 @@ processors:
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/remotetapprocessor v0.109.0

receivers:
- gomod: go.opentelemetry.io/collector/receiver/nopreceiver v0.109.1-0.20240920203249-d17559b6e89a
- gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.109.1-0.20240920203249-d17559b6e89a
- gomod: go.opentelemetry.io/collector/receiver/nopreceiver v0.109.1-0.20240923174701-20f73e2294b5
- gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.109.1-0.20240923174701-20f73e2294b5
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/activedirectorydsreceiver v0.109.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/aerospikereceiver v0.109.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/apachereceiver v0.109.0
Expand Down Expand Up @@ -220,7 +220,7 @@ receivers:
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zookeeperreceiver v0.109.0

connectors:
- gomod: go.opentelemetry.io/collector/connector/forwardconnector v0.109.1-0.20240920203249-d17559b6e89a
- gomod: go.opentelemetry.io/collector/connector/forwardconnector v0.109.1-0.20240923174701-20f73e2294b5
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/countconnector v0.109.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/datadogconnector v0.109.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/exceptionsconnector v0.109.0
Expand All @@ -233,11 +233,11 @@ connectors:
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/spanmetricsconnector v0.109.0

providers:
- gomod: go.opentelemetry.io/collector/confmap/provider/envprovider v1.15.1-0.20240920203249-d17559b6e89a
- gomod: go.opentelemetry.io/collector/confmap/provider/fileprovider v1.15.1-0.20240920203249-d17559b6e89a
- gomod: go.opentelemetry.io/collector/confmap/provider/httpprovider v0.109.1-0.20240920203249-d17559b6e89a
- gomod: go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.109.1-0.20240920203249-d17559b6e89a
- gomod: go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.109.1-0.20240920203249-d17559b6e89a
- gomod: go.opentelemetry.io/collector/confmap/provider/envprovider v1.15.1-0.20240923174701-20f73e2294b5
- gomod: go.opentelemetry.io/collector/confmap/provider/fileprovider v1.15.1-0.20240923174701-20f73e2294b5
- gomod: go.opentelemetry.io/collector/confmap/provider/httpprovider v0.109.1-0.20240923174701-20f73e2294b5
- gomod: go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.109.1-0.20240923174701-20f73e2294b5
- gomod: go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.109.1-0.20240923174701-20f73e2294b5
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/confmap/provider/s3provider v0.109.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/confmap/provider/secretsmanagerprovider v0.109.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.

5 changes: 3 additions & 2 deletions cmd/otelcontribcol/exporters_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import (
"go.opentelemetry.io/collector/pdata/plog"
"go.opentelemetry.io/collector/pdata/pmetric"
"go.opentelemetry.io/collector/pdata/ptrace"
"go.opentelemetry.io/collector/pipeline"

"github.com/open-telemetry/opentelemetry-collector-contrib/exporter/alertmanagerexporter"
"github.com/open-telemetry/opentelemetry-collector-contrib/exporter/alibabacloudlogserviceexporter"
Expand Down Expand Up @@ -608,7 +609,7 @@ func verifyExporterLifecycle(t *testing.T, factory exporter.Factory, getConfigFn
var exps []component.Component
for _, createFn := range createFns {
exp, err := createFn(ctx, expCreateSettings, cfg)
if errors.Is(err, component.ErrDataTypeIsNotSupported) {
if errors.Is(err, pipeline.ErrSignalNotSupported) {
continue
}
require.NoError(t, err)
Expand Down Expand Up @@ -699,7 +700,7 @@ func verifyExporterShutdown(tb testing.TB, factory exporter.Factory, getConfigFn

for _, createFn := range createFns {
r, err := createFn(ctx, expCreateSettings, getConfigFn())
if errors.Is(err, component.ErrDataTypeIsNotSupported) {
if errors.Is(err, pipeline.ErrSignalNotSupported) {
continue
}
if r == nil {
Expand Down
3 changes: 2 additions & 1 deletion cmd/otelcontribcol/extensions_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import (
"go.opentelemetry.io/collector/extension"
"go.opentelemetry.io/collector/extension/extensiontest"
"go.opentelemetry.io/collector/extension/zpagesextension"
"go.opentelemetry.io/collector/pipeline"

"github.com/open-telemetry/opentelemetry-collector-contrib/extension/ackextension"
"github.com/open-telemetry/opentelemetry-collector-contrib/extension/asapauthextension"
Expand Down Expand Up @@ -339,7 +340,7 @@ func verifyExtensionShutdown(tb testing.TB, factory extension.Factory, getConfig
}

e, err := factory.CreateExtension(ctx, extCreateSet, getConfigFn())
if errors.Is(err, component.ErrDataTypeIsNotSupported) {
if errors.Is(err, pipeline.ErrSignalNotSupported) {
return
}
if e == nil {
Expand Down
Loading
Loading