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

[chore] upgrade to core v0.58.0 #13124

Merged
merged 1 commit into from
Aug 11, 2022
Merged

[chore] upgrade to core v0.58.0 #13124

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
  •  
  •  
  •  
8 changes: 4 additions & 4 deletions cmd/configschema/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ require (
github.com/open-telemetry/opentelemetry-collector-contrib v0.57.2
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.57.2
github.com/stretchr/testify v1.8.0
go.opentelemetry.io/collector v0.57.2
go.opentelemetry.io/collector/pdata v0.57.2
go.opentelemetry.io/collector v0.58.0
go.opentelemetry.io/collector/pdata v0.58.0
go.uber.org/multierr v1.8.0
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4
golang.org/x/text v0.3.7
Expand Down Expand Up @@ -542,10 +542,10 @@ require (
go.mongodb.org/atlas v0.16.0 // indirect
go.mongodb.org/mongo-driver v1.10.1 // indirect
go.opencensus.io v0.23.0 // indirect
go.opentelemetry.io/collector/semconv v0.57.2 // indirect
go.opentelemetry.io/collector/semconv v0.58.0 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.34.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.34.0 // indirect
go.opentelemetry.io/contrib/zpages v0.33.0 // indirect
go.opentelemetry.io/contrib/zpages v0.34.0 // indirect
go.opentelemetry.io/otel v1.9.0 // indirect
go.opentelemetry.io/otel/metric v0.31.0 // indirect
go.opentelemetry.io/otel/sdk v1.9.0 // indirect
Expand Down
16 changes: 8 additions & 8 deletions cmd/configschema/go.sum
View file
Open in desktop

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

4 changes: 2 additions & 2 deletions cmd/mdatagen/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ require (
github.com/go-playground/universal-translator v0.18.0
github.com/go-playground/validator/v10 v10.11.0
github.com/stretchr/testify v1.8.0
go.opentelemetry.io/collector v0.57.2
go.opentelemetry.io/collector/pdata v0.57.2
go.opentelemetry.io/collector v0.58.0
go.opentelemetry.io/collector/pdata v0.58.0
)

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

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

41 changes: 20 additions & 21 deletions cmd/mdatagen/main_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ func Test_runContents(t *testing.T) {
args args
expectedDocumentation string
want string
wantErr string
wantErr bool
}{
{
name: "valid metadata",
Expand All @@ -76,7 +76,7 @@ func Test_runContents(t *testing.T) {
name: "invalid yaml",
args: args{"invalid", false},
want: "",
wantErr: "cannot unmarshal",
wantErr: true,
},
}
for _, tt := range tests {
Expand All @@ -87,29 +87,28 @@ func Test_runContents(t *testing.T) {
require.NoError(t, os.WriteFile(metadataFile, []byte(tt.args.yml), 0600))

err := run(metadataFile, tt.args.useExpGen)
if tt.wantErr {
require.Error(t, err)
return
}
require.NoError(t, err)

if tt.wantErr != "" {
require.Regexp(t, tt.wantErr, err)
} else {
require.NoError(t, err)

genFilePath := filepath.Join(tmpdir, "internal/metadata/generated_metrics.go")
if tt.args.useExpGen {
genFilePath = filepath.Join(tmpdir, "internal/metadata/generated_metrics_v2.go")
}
require.FileExists(t, genFilePath)
genFilePath := filepath.Join(tmpdir, "internal/metadata/generated_metrics.go")
if tt.args.useExpGen {
genFilePath = filepath.Join(tmpdir, "internal/metadata/generated_metrics_v2.go")
}
require.FileExists(t, genFilePath)

actualDocumentation := filepath.Join(tmpdir, "documentation.md")
require.FileExists(t, actualDocumentation)
if tt.expectedDocumentation != "" {
expectedFileBytes, err := os.ReadFile(tt.expectedDocumentation)
require.NoError(t, err)
actualDocumentation := filepath.Join(tmpdir, "documentation.md")
require.FileExists(t, actualDocumentation)
if tt.expectedDocumentation != "" {
expectedFileBytes, err := os.ReadFile(tt.expectedDocumentation)
require.NoError(t, err)

actualFileBytes, err := os.ReadFile(actualDocumentation)
require.NoError(t, err)
actualFileBytes, err := os.ReadFile(actualDocumentation)
require.NoError(t, err)

require.Equal(t, expectedFileBytes, actualFileBytes)
}
require.Equal(t, expectedFileBytes, actualFileBytes)
}
})
}
Expand Down
6 changes: 3 additions & 3 deletions exporter/alibabacloudlogserviceexporter/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ require (
github.com/gogo/protobuf v1.3.2
github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.57.2
github.com/stretchr/testify v1.8.0
go.opentelemetry.io/collector v0.57.2
go.opentelemetry.io/collector/pdata v0.57.2
go.opentelemetry.io/collector/semconv v0.57.2
go.opentelemetry.io/collector v0.58.0
go.opentelemetry.io/collector/pdata v0.58.0
go.opentelemetry.io/collector/semconv v0.58.0
go.uber.org/zap v1.22.0
)

Expand Down
14 changes: 7 additions & 7 deletions exporter/alibabacloudlogserviceexporter/go.sum
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 exporter/alibabacloudlogserviceexporter/logs_exporter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,10 @@ func newLogsExporter(set component.ExporterCreateSettings, cfg config.Exporter)
return nil, err
}

return exporterhelper.NewLogsExporter(
cfg,
return exporterhelper.NewLogsExporterWithContext(
context.TODO(),
set,
cfg,
l.pushLogsData)
}

Expand Down
5 changes: 3 additions & 2 deletions exporter/alibabacloudlogserviceexporter/metrics_exporter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,10 @@ func newMetricsExporter(set component.ExporterCreateSettings, cfg config.Exporte
return nil, err
}

return exporterhelper.NewMetricsExporter(
cfg,
return exporterhelper.NewMetricsExporterWithContext(
context.TODO(),
set,
cfg,
l.pushMetricsData)
}

Expand Down
5 changes: 3 additions & 2 deletions exporter/alibabacloudlogserviceexporter/trace_exporter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,10 @@ func newTracesExporter(set component.ExporterCreateSettings, cfg config.Exporter
return nil, err
}

return exporterhelper.NewTracesExporter(
cfg,
return exporterhelper.NewTracesExporterWithContext(
context.TODO(),
set,
cfg,
l.pushTraceData)
}

Expand Down
5 changes: 3 additions & 2 deletions exporter/awscloudwatchlogsexporter/exporter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,9 +84,10 @@ func newCwLogsExporter(config config.Exporter, params component.ExporterCreateSe
if err != nil {
return nil, err
}
return exporterhelper.NewLogsExporter(
config,
return exporterhelper.NewLogsExporterWithContext(
context.TODO(),
params,
config,
logsExporter.ConsumeLogs,
exporterhelper.WithQueue(expConfig.enforcedQueueSettings()),
exporterhelper.WithRetry(expConfig.RetrySettings),
Expand Down
4 changes: 2 additions & 2 deletions exporter/awscloudwatchlogsexporter/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ require (
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil v0.57.2
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/cwlogs v0.57.2
github.com/stretchr/testify v1.8.0
go.opentelemetry.io/collector v0.57.2
go.opentelemetry.io/collector/pdata v0.57.2
go.opentelemetry.io/collector v0.58.0
go.opentelemetry.io/collector/pdata v0.58.0
go.uber.org/zap v1.22.0
)

Expand Down
10 changes: 5 additions & 5 deletions exporter/awscloudwatchlogsexporter/go.sum
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 exporter/awsemfexporter/emf_exporter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,9 +104,10 @@ func newEmfExporter(
return nil, err
}

exporter, err := exporterhelper.NewMetricsExporter(
config,
exporter, err := exporterhelper.NewMetricsExporterWithContext(
context.TODO(),
set,
config,
exp.(*emfExporter).pushMetricsData,
exporterhelper.WithShutdown(exp.(*emfExporter).Shutdown),
)
Expand Down
6 changes: 3 additions & 3 deletions exporter/awsemfexporter/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ require (
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.57.2
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.57.2
github.com/stretchr/testify v1.8.0
go.opentelemetry.io/collector v0.57.2
go.opentelemetry.io/collector/pdata v0.57.2
go.opentelemetry.io/collector/semconv v0.57.2
go.opentelemetry.io/collector v0.58.0
go.opentelemetry.io/collector/pdata v0.58.0
go.opentelemetry.io/collector/semconv v0.58.0
go.uber.org/zap v1.22.0
google.golang.org/protobuf v1.28.1
)
Expand Down
14 changes: 7 additions & 7 deletions exporter/awsemfexporter/go.sum
View file
Open in desktop

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

15 changes: 9 additions & 6 deletions exporter/awskinesisexporter/factory.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,9 +69,10 @@ func NewTracesExporter(ctx context.Context, params component.ExporterCreateSetti
return nil, err
}
c := conf.(*Config)
return exporterhelper.NewTracesExporter(
conf,
return exporterhelper.NewTracesExporterWithContext(
ctx,
params,
conf,
exp.ConsumeTraces,
exporterhelper.WithTimeout(c.TimeoutSettings),
exporterhelper.WithRetry(c.RetrySettings),
Expand All @@ -85,9 +86,10 @@ func NewMetricsExporter(ctx context.Context, params component.ExporterCreateSett
return nil, err
}
c := conf.(*Config)
return exporterhelper.NewMetricsExporter(
c,
return exporterhelper.NewMetricsExporterWithContext(
ctx,
params,
c,
exp.ConsumeMetrics,
exporterhelper.WithTimeout(c.TimeoutSettings),
exporterhelper.WithRetry(c.RetrySettings),
Expand All @@ -101,9 +103,10 @@ func NewLogsExporter(ctx context.Context, params component.ExporterCreateSetting
return nil, err
}
c := conf.(*Config)
return exporterhelper.NewLogsExporter(
c,
return exporterhelper.NewLogsExporterWithContext(
ctx,
params,
c,
exp.ConsumeLogs,
exporterhelper.WithTimeout(c.TimeoutSettings),
exporterhelper.WithRetry(c.RetrySettings),
Expand Down
6 changes: 3 additions & 3 deletions exporter/awskinesisexporter/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@ require (
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.57.2
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/zipkin v0.57.2
github.com/stretchr/testify v1.8.0
go.opentelemetry.io/collector v0.57.2
go.opentelemetry.io/collector v0.58.0
go.uber.org/zap v1.22.0
)

require (
github.com/gogo/protobuf v1.3.2
github.com/google/uuid v1.3.0
github.com/jaegertracing/jaeger v1.37.0
go.opentelemetry.io/collector/pdata v0.57.2
go.opentelemetry.io/collector/pdata v0.58.0
go.uber.org/multierr v1.8.0
)

Expand All @@ -40,7 +40,7 @@ require (
github.com/uber/jaeger-client-go v2.30.0+incompatible // indirect
github.com/uber/jaeger-lib v2.4.1+incompatible // indirect
go.opencensus.io v0.23.0 // indirect
go.opentelemetry.io/collector/semconv v0.57.2 // indirect
go.opentelemetry.io/collector/semconv v0.58.0 // indirect
go.opentelemetry.io/otel v1.9.0 // indirect
go.opentelemetry.io/otel/metric v0.31.0 // indirect
go.opentelemetry.io/otel/trace v1.9.0 // indirect
Expand Down
Loading