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.

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][receiver/otlpjsonfile] rename rvcr import #26308

Merged
merged 1 commit into from
Aug 30, 2023
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
[chore][receiver/otlpjsonfile] rename rvcr import
  • Loading branch information
atoulme committed Aug 30, 2023

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
commit d3b8ab3020b3a8ecf171ec7eca71df9249138489
1 change: 0 additions & 1 deletion cmd/checkapi/allowlist.txt
Original file line number Diff line number Diff line change
@@ -37,7 +37,6 @@ receiver/mongodbatlasreceiver
receiver/mongodbreceiver
receiver/mysqlreceiver
receiver/nsxtreceiver
receiver/otlpjsonfilereceiver
receiver/podmanreceiver
receiver/pulsarreceiver
receiver/statsdreceiver
30 changes: 15 additions & 15 deletions receiver/otlpjsonfilereceiver/file.go
Original file line number Diff line number Diff line change
@@ -12,7 +12,7 @@ import (
"go.opentelemetry.io/collector/pdata/plog"
"go.opentelemetry.io/collector/pdata/pmetric"
"go.opentelemetry.io/collector/pdata/ptrace"
rcvr "go.opentelemetry.io/collector/receiver"
"go.opentelemetry.io/collector/receiver"

"github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/adapter"
"github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/fileconsumer"
@@ -24,13 +24,13 @@ const (
)

// NewFactory creates a factory for file receiver
func NewFactory() rcvr.Factory {
return rcvr.NewFactory(
func NewFactory() receiver.Factory {
return receiver.NewFactory(
metadata.Type,
createDefaultConfig,
rcvr.WithMetrics(createMetricsReceiver, metadata.MetricsStability),
rcvr.WithLogs(createLogsReceiver, metadata.LogsStability),
rcvr.WithTraces(createTracesReceiver, metadata.TracesStability))
receiver.WithMetrics(createMetricsReceiver, metadata.MetricsStability),
receiver.WithLogs(createLogsReceiver, metadata.LogsStability),
receiver.WithTraces(createTracesReceiver, metadata.TracesStability))
}

type Config struct {
@@ -44,25 +44,25 @@ func createDefaultConfig() component.Config {
}
}

type receiver struct {
type otlpjsonfilereceiver struct {
input *fileconsumer.Manager
id component.ID
storageID *component.ID
}

func (f *receiver) Start(ctx context.Context, host component.Host) error {
func (f *otlpjsonfilereceiver) Start(ctx context.Context, host component.Host) error {
storageClient, err := adapter.GetStorageClient(ctx, host, f.storageID, f.id)
if err != nil {
return err
}
return f.input.Start(storageClient)
}

func (f *receiver) Shutdown(_ context.Context) error {
func (f *otlpjsonfilereceiver) Shutdown(_ context.Context) error {
return f.input.Stop()
}

func createLogsReceiver(_ context.Context, settings rcvr.CreateSettings, configuration component.Config, logs consumer.Logs) (rcvr.Logs, error) {
func createLogsReceiver(_ context.Context, settings receiver.CreateSettings, configuration component.Config, logs consumer.Logs) (receiver.Logs, error) {
logsUnmarshaler := &plog.JSONUnmarshaler{}
obsrecv, err := obsreport.NewReceiver(obsreport.ReceiverSettings{
ReceiverID: settings.ID,
@@ -91,10 +91,10 @@ func createLogsReceiver(_ context.Context, settings rcvr.CreateSettings, configu
return nil, err
}

return &receiver{input: input, id: settings.ID, storageID: cfg.StorageID}, nil
return &otlpjsonfilereceiver{input: input, id: settings.ID, storageID: cfg.StorageID}, nil
}

func createMetricsReceiver(_ context.Context, settings rcvr.CreateSettings, configuration component.Config, metrics consumer.Metrics) (rcvr.Metrics, error) {
func createMetricsReceiver(_ context.Context, settings receiver.CreateSettings, configuration component.Config, metrics consumer.Metrics) (receiver.Metrics, error) {
metricsUnmarshaler := &pmetric.JSONUnmarshaler{}
obsrecv, err := obsreport.NewReceiver(obsreport.ReceiverSettings{
ReceiverID: settings.ID,
@@ -123,10 +123,10 @@ func createMetricsReceiver(_ context.Context, settings rcvr.CreateSettings, conf
return nil, err
}

return &receiver{input: input, id: settings.ID, storageID: cfg.StorageID}, nil
return &otlpjsonfilereceiver{input: input, id: settings.ID, storageID: cfg.StorageID}, nil
}

func createTracesReceiver(_ context.Context, settings rcvr.CreateSettings, configuration component.Config, traces consumer.Traces) (rcvr.Traces, error) {
func createTracesReceiver(_ context.Context, settings receiver.CreateSettings, configuration component.Config, traces consumer.Traces) (receiver.Traces, error) {
tracesUnmarshaler := &ptrace.JSONUnmarshaler{}
obsrecv, err := obsreport.NewReceiver(obsreport.ReceiverSettings{
ReceiverID: settings.ID,
@@ -155,5 +155,5 @@ func createTracesReceiver(_ context.Context, settings rcvr.CreateSettings, confi
return nil, err
}

return &receiver{input: input, id: settings.ID, storageID: cfg.StorageID}, nil
return &otlpjsonfilereceiver{input: input, id: settings.ID, storageID: cfg.StorageID}, nil
}