Skip to content

Commit

Permalink
Upgrade OCB components to v0.112.0 (#256)
Browse files Browse the repository at this point in the history 
* upgrade OCB components to v0.112.0

* fix lint error due to deprecated methods
  • Loading branch information
@jj22ee
jj22ee authored Nov 15, 2024
1 parent 1bf0ac6 commit 27e5c0d
Show file tree
Hide file tree
Showing 8 changed files with 177 additions and 174 deletions.
2 changes: 1 addition & 1 deletion exporter/awsemfexporter/factory.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ func createMetricsExporter(ctx context.Context, params exporter.Settings, config
return nil, err
}

exporter, err := exporterhelper.NewMetricsExporter(
exporter, err := exporterhelper.NewMetrics(
ctx,
params,
config,
Expand Down
8 changes: 4 additions & 4 deletions exporter/awsemfexporter/factory_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ func TestCreateDefaultConfig(t *testing.T) {
assert.NotNil(t, cfg.(*Config).logger)
}

func TestCreateTracesExporter(t *testing.T) {
func TestCreateTraces(t *testing.T) {
cm, err := confmaptest.LoadConf(filepath.Join("testdata", "config.yaml"))
require.NoError(t, err)
factory := NewFactory()
Expand All @@ -37,12 +37,12 @@ func TestCreateTracesExporter(t *testing.T) {
require.NoError(t, sub.Unmarshal(cfg))

ctx := context.Background()
exporter, err := factory.CreateTracesExporter(ctx, exportertest.NewNopSettings(), cfg)
exporter, err := factory.CreateTraces(ctx, exportertest.NewNopSettings(), cfg)
assert.Error(t, err)
assert.Nil(t, exporter)
}

func TestCreateMetricsExporter(t *testing.T) {
func TestCreateMetrics(t *testing.T) {
cm, err := confmaptest.LoadConf(filepath.Join("testdata", "config.yaml"))
require.NoError(t, err)
factory := NewFactory()
Expand All @@ -53,7 +53,7 @@ func TestCreateMetricsExporter(t *testing.T) {
require.NoError(t, sub.Unmarshal(cfg))

ctx := context.Background()
exporter, err := factory.CreateMetricsExporter(ctx, exportertest.NewNopSettings(), cfg)
exporter, err := factory.CreateMetrics(ctx, exportertest.NewNopSettings(), cfg)
assert.NoError(t, err)
assert.NotNil(t, exporter)
}
61 changes: 31 additions & 30 deletions exporter/awsemfexporter/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,21 +7,22 @@ require (
github.com/aws/aws-sdk-go v1.53.11
github.com/google/uuid v1.6.0
github.com/jellydator/ttlcache/v3 v3.2.0
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil v0.111.0
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/cwlogs v0.111.0
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/metrics v0.111.0
github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.111.0
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.111.0
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil v0.112.0
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/cwlogs v0.112.0
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/metrics v0.112.0
github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.112.0
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.112.0
github.com/stretchr/testify v1.9.0
go.opentelemetry.io/collector/component v0.111.0
go.opentelemetry.io/collector/confmap v1.17.0
go.opentelemetry.io/collector/consumer v0.111.0
go.opentelemetry.io/collector/exporter v0.111.0
go.opentelemetry.io/collector/featuregate v1.17.0
go.opentelemetry.io/collector/pdata v1.17.0
go.opentelemetry.io/collector/semconv v0.111.0
go.opentelemetry.io/otel/metric v1.30.0
go.opentelemetry.io/otel/trace v1.30.0
go.opentelemetry.io/collector/component v0.112.0
go.opentelemetry.io/collector/confmap v1.18.0
go.opentelemetry.io/collector/consumer/consumererror v0.112.0
go.opentelemetry.io/collector/exporter v0.112.0
go.opentelemetry.io/collector/exporter/exportertest v0.112.0
go.opentelemetry.io/collector/featuregate v1.18.0
go.opentelemetry.io/collector/pdata v1.18.0
go.opentelemetry.io/collector/semconv v0.112.0
go.opentelemetry.io/otel/metric v1.31.0
go.opentelemetry.io/otel/trace v1.31.0
go.uber.org/multierr v1.11.0
go.uber.org/zap v1.27.0
golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842
Expand All @@ -35,7 +36,7 @@ require (
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/go-logr/logr v1.4.2 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/go-viper/mapstructure/v2 v2.1.0 // indirect
github.com/go-viper/mapstructure/v2 v2.2.1 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/hashicorp/go-version v1.7.0 // indirect
github.com/jmespath/go-jmespath v0.4.0 // indirect
Expand All @@ -49,21 +50,21 @@ require (
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/stretchr/objx v0.5.2 // indirect
go.opentelemetry.io/collector/config/configretry v1.17.0 // indirect
go.opentelemetry.io/collector/config/configtelemetry v0.111.0 // indirect
go.opentelemetry.io/collector/consumer/consumerprofiles v0.111.0 // indirect
go.opentelemetry.io/collector/consumer/consumertest v0.111.0 // indirect
go.opentelemetry.io/collector/exporter/exporterprofiles v0.111.0 // indirect
go.opentelemetry.io/collector/extension v0.111.0 // indirect
go.opentelemetry.io/collector/extension/experimental/storage v0.111.0 // indirect
go.opentelemetry.io/collector/internal/globalsignal v0.111.0 // indirect
go.opentelemetry.io/collector/pdata/pprofile v0.111.0 // indirect
go.opentelemetry.io/collector/pipeline v0.111.0 // indirect
go.opentelemetry.io/collector/receiver v0.111.0 // indirect
go.opentelemetry.io/collector/receiver/receiverprofiles v0.111.0 // indirect
go.opentelemetry.io/otel v1.30.0 // indirect
go.opentelemetry.io/otel/sdk v1.30.0 // indirect
go.opentelemetry.io/otel/sdk/metric v1.30.0 // indirect
go.opentelemetry.io/collector/config/configretry v1.18.0 // indirect
go.opentelemetry.io/collector/config/configtelemetry v0.112.0 // indirect
go.opentelemetry.io/collector/consumer v0.112.0 // indirect
go.opentelemetry.io/collector/consumer/consumerprofiles v0.112.0 // indirect
go.opentelemetry.io/collector/consumer/consumertest v0.112.0 // indirect
go.opentelemetry.io/collector/exporter/exporterprofiles v0.112.0 // indirect
go.opentelemetry.io/collector/extension v0.112.0 // indirect
go.opentelemetry.io/collector/extension/experimental/storage v0.112.0 // indirect
go.opentelemetry.io/collector/pdata/pprofile v0.112.0 // indirect
go.opentelemetry.io/collector/pipeline v0.112.0 // indirect
go.opentelemetry.io/collector/receiver v0.112.0 // indirect
go.opentelemetry.io/collector/receiver/receiverprofiles v0.112.0 // indirect
go.opentelemetry.io/otel v1.31.0 // indirect
go.opentelemetry.io/otel/sdk v1.31.0 // indirect
go.opentelemetry.io/otel/sdk/metric v1.31.0 // indirect
golang.org/x/net v0.28.0 // indirect
golang.org/x/sync v0.8.0 // indirect
golang.org/x/sys v0.26.0 // indirect
Expand Down
106 changes: 54 additions & 52 deletions exporter/awsemfexporter/go.sum
View file

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

12 changes: 6 additions & 6 deletions internal/aws/cwlogs/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ go 1.22.4
require (
github.com/aws/aws-sdk-go v1.53.11
github.com/stretchr/testify v1.9.0
go.opentelemetry.io/collector/component v0.111.0
go.opentelemetry.io/collector/component v0.112.0
go.uber.org/goleak v1.3.0
go.uber.org/zap v1.27.0
)
Expand All @@ -16,11 +16,11 @@ require (
github.com/jmespath/go-jmespath v0.4.0 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/stretchr/objx v0.5.2 // indirect
go.opentelemetry.io/collector/config/configtelemetry v0.111.0 // indirect
go.opentelemetry.io/collector/pdata v1.17.0 // indirect
go.opentelemetry.io/otel v1.30.0 // indirect
go.opentelemetry.io/otel/metric v1.30.0 // indirect
go.opentelemetry.io/otel/trace v1.30.0 // indirect
go.opentelemetry.io/collector/config/configtelemetry v0.112.0 // indirect
go.opentelemetry.io/collector/pdata v1.18.0 // indirect
go.opentelemetry.io/otel v1.31.0 // indirect
go.opentelemetry.io/otel/metric v1.31.0 // indirect
go.opentelemetry.io/otel/trace v1.31.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
golang.org/x/net v0.28.0 // indirect
golang.org/x/sys v0.26.0 // indirect
Expand Down
Loading

0 comments on commit 27e5c0d

Please sign in to comment.