Skip to content

Commit

Permalink
more deprecations
Browse files Browse the repository at this point in the history
  • Loading branch information
@songy23
songy23 committed Dec 16, 2024
1 parent ee0ef07 commit 825cb7b
Show file tree
Hide file tree
Showing 14 changed files with 45 additions and 90 deletions.
6 changes: 0 additions & 6 deletions connector/datadogconnector/go.sum
View file

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

3 changes: 0 additions & 3 deletions exporter/datadogexporter/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -341,7 +341,6 @@ require (
go.opentelemetry.io/collector/confmap/provider/yamlprovider v1.21.1-0.20241216091623-8ac40a01a5ff // indirect
go.opentelemetry.io/collector/connector/connectortest v0.115.1-0.20241216091623-8ac40a01a5ff // indirect
go.opentelemetry.io/collector/connector/xconnector v0.0.0-20241215143820-6147243aaaa1 // indirect
go.opentelemetry.io/collector/consumer/consumerprofiles v0.115.1-0.20241216091623-8ac40a01a5ff // indirect
go.opentelemetry.io/collector/consumer/consumertest v0.115.1-0.20241216091623-8ac40a01a5ff // indirect
go.opentelemetry.io/collector/consumer/xconsumer v0.0.0-20241215143820-6147243aaaa1 // indirect
go.opentelemetry.io/collector/exporter/xexporter v0.0.0-20241215143820-6147243aaaa1 // indirect
Expand All @@ -358,9 +357,7 @@ require (
go.opentelemetry.io/collector/pdata/testdata v0.115.1-0.20241216091623-8ac40a01a5ff // indirect
go.opentelemetry.io/collector/pipeline v0.115.1-0.20241216091623-8ac40a01a5ff // indirect
go.opentelemetry.io/collector/pipeline/xpipeline v0.0.0-20241215143820-6147243aaaa1 // indirect
go.opentelemetry.io/collector/processor/processorhelper/processorhelperprofiles v0.115.1-0.20241216091623-8ac40a01a5ff // indirect
go.opentelemetry.io/collector/processor/processorhelper/xprocessorhelper v0.0.0-20241215143820-6147243aaaa1 // indirect
go.opentelemetry.io/collector/processor/processorprofiles v0.115.1-0.20241216091623-8ac40a01a5ff // indirect
go.opentelemetry.io/collector/processor/processortest v0.115.1-0.20241216091623-8ac40a01a5ff // indirect
go.opentelemetry.io/collector/processor/xprocessor v0.0.0-20241215143820-6147243aaaa1 // indirect
go.opentelemetry.io/collector/receiver/receivertest v0.115.1-0.20241216091623-8ac40a01a5ff // indirect
Expand Down
6 changes: 0 additions & 6 deletions exporter/datadogexporter/go.sum
View file

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

6 changes: 0 additions & 6 deletions exporter/datadogexporter/integrationtest/go.sum
View file

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

4 changes: 2 additions & 2 deletions exporter/fileexporter/encoding_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ import (
"github.com/stretchr/testify/require"
"go.opentelemetry.io/collector/component"
"go.opentelemetry.io/collector/component/componenttest"
"go.opentelemetry.io/collector/exporter/exporterprofiles"
"go.opentelemetry.io/collector/exporter/exportertest"
"go.opentelemetry.io/collector/exporter/xexporter"
"go.opentelemetry.io/collector/extension/extensiontest"
"go.opentelemetry.io/collector/pdata/pcommon"
"go.opentelemetry.io/collector/pdata/plog"
Expand Down Expand Up @@ -53,7 +53,7 @@ func TestEncoding(t *testing.T) {
require.NoError(t, err)
le, err := f.CreateLogs(context.Background(), exportertest.NewNopSettings(), cfg)
require.NoError(t, err)
pe, err := f.(exporterprofiles.Factory).CreateProfiles(context.Background(), exportertest.NewNopSettings(), cfg)
pe, err := f.(xexporter.Factory).CreateProfiles(context.Background(), exportertest.NewNopSettings(), cfg)
require.NoError(t, err)
host := hostWithEncoding{
map[component.ID]component.Component{id: ext},
Expand Down
18 changes: 9 additions & 9 deletions exporter/fileexporter/factory.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ import (
"go.opentelemetry.io/collector/consumer"
"go.opentelemetry.io/collector/exporter"
"go.opentelemetry.io/collector/exporter/exporterhelper"
"go.opentelemetry.io/collector/exporter/exporterhelper/exporterhelperprofiles"
"go.opentelemetry.io/collector/exporter/exporterprofiles"
"go.opentelemetry.io/collector/exporter/exporterhelper/xexporterhelper"
"go.opentelemetry.io/collector/exporter/xexporter"
"go.opentelemetry.io/collector/pdata/plog"
"go.opentelemetry.io/collector/pdata/pmetric"
"go.opentelemetry.io/collector/pdata/pprofile"
Expand Down Expand Up @@ -52,13 +52,13 @@ type FileExporter interface {

// NewFactory creates a factory for OTLP exporter.
func NewFactory() exporter.Factory {
return exporterprofiles.NewFactory(
return xexporter.NewFactory(
metadata.Type,
createDefaultConfig,
exporterprofiles.WithTraces(createTracesExporter, metadata.TracesStability),
exporterprofiles.WithMetrics(createMetricsExporter, metadata.MetricsStability),
exporterprofiles.WithLogs(createLogsExporter, metadata.LogsStability),
exporterprofiles.WithProfiles(createProfilesExporter, metadata.ProfilesStability))
xexporter.WithTraces(createTracesExporter, metadata.TracesStability),
xexporter.WithMetrics(createMetricsExporter, metadata.MetricsStability),
xexporter.WithLogs(createLogsExporter, metadata.LogsStability),
xexporter.WithProfiles(createProfilesExporter, metadata.ProfilesStability))
}

func createDefaultConfig() component.Config {
Expand Down Expand Up @@ -127,9 +127,9 @@ func createProfilesExporter(
ctx context.Context,
set exporter.Settings,
cfg component.Config,
) (exporterprofiles.Profiles, error) {
) (xexporter.Profiles, error) {
fe := getOrCreateFileExporter(cfg, set.Logger)
return exporterhelperprofiles.NewProfilesExporter(
return xexporterhelper.NewProfilesExporter(
ctx,
set,
cfg,
Expand Down
6 changes: 2 additions & 4 deletions exporter/fileexporter/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ require (
go.opentelemetry.io/collector/consumer v1.21.1-0.20241216091623-8ac40a01a5ff
go.opentelemetry.io/collector/consumer/consumererror v0.115.1-0.20241216091623-8ac40a01a5ff
go.opentelemetry.io/collector/exporter v0.115.1-0.20241216091623-8ac40a01a5ff
go.opentelemetry.io/collector/exporter/exporterhelper/exporterhelperprofiles v0.115.1-0.20241216091623-8ac40a01a5ff
go.opentelemetry.io/collector/exporter/exporterprofiles v0.115.1-0.20241216091623-8ac40a01a5ff
go.opentelemetry.io/collector/exporter/exporterhelper/xexporterhelper v0.0.0-20241215143820-6147243aaaa1
go.opentelemetry.io/collector/exporter/exportertest v0.115.1-0.20241216091623-8ac40a01a5ff
go.opentelemetry.io/collector/exporter/xexporter v0.0.0-20241215143820-6147243aaaa1
go.opentelemetry.io/collector/extension/extensiontest v0.115.1-0.20241216091623-8ac40a01a5ff
go.opentelemetry.io/collector/pdata v1.21.1-0.20241216091623-8ac40a01a5ff
go.opentelemetry.io/collector/pdata/pprofile v0.115.1-0.20241216091623-8ac40a01a5ff
Expand Down Expand Up @@ -51,8 +51,6 @@ require (
go.opentelemetry.io/collector/consumer/consumererror/xconsumererror v0.0.0-20241215143820-6147243aaaa1 // indirect
go.opentelemetry.io/collector/consumer/consumertest v0.115.1-0.20241216091623-8ac40a01a5ff // indirect
go.opentelemetry.io/collector/consumer/xconsumer v0.0.0-20241215143820-6147243aaaa1 // indirect
go.opentelemetry.io/collector/exporter/exporterhelper/xexporterhelper v0.0.0-20241215143820-6147243aaaa1 // indirect
go.opentelemetry.io/collector/exporter/xexporter v0.0.0-20241215143820-6147243aaaa1 // indirect
go.opentelemetry.io/collector/extension v0.115.1-0.20241216091623-8ac40a01a5ff // indirect
go.opentelemetry.io/collector/extension/experimental/storage v0.115.1-0.20241216091623-8ac40a01a5ff // indirect
go.opentelemetry.io/collector/featuregate v1.21.1-0.20241216091623-8ac40a01a5ff // indirect
Expand Down
4 changes: 0 additions & 4 deletions exporter/fileexporter/go.sum
View file

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

Loading

0 comments on commit 825cb7b

Please sign in to comment.