diff --git a/exporter/debugexporter/README.md b/exporter/debugexporter/README.md index a4bbdcbcb0b8..dd246772af75 100644 --- a/exporter/debugexporter/README.md +++ b/exporter/debugexporter/README.md @@ -1,4 +1,4 @@ -# Logging Exporter +# Debug Exporter | Status | | | ------------------------ |-----------------------| @@ -14,10 +14,6 @@ Supported pipeline types: traces, metrics, logs The following settings are optional: -- `loglevel` (default = `info`): the log level of the logging export - (debug|info|warn|error). When set to `debug`, pipeline data is verbosely - - **Note**: This option has been deprecated in favor of `verbosity` - logged. - `verbosity` (default = `normal`): the verbosity of the logging export (detailed|normal|basic). When set to `detailed`, pipeline data is verbosely logged. @@ -28,14 +24,11 @@ The following settings are optional: docs](https://godoc.org/go.uber.org/zap/zapcore#NewSampler) for more details. on how sampling parameters impact number of messages. -### Note -`loglevel` is deprecated, use `verbosity` instead. - Example: ```yaml exporters: - logging: + debug: verbosity: detailed sampling_initial: 5 sampling_thereafter: 200 diff --git a/exporter/debugexporter/logging_exporter.go b/exporter/debugexporter/debug_exporter.go similarity index 97% rename from exporter/debugexporter/logging_exporter.go rename to exporter/debugexporter/debug_exporter.go index c0082cf91204..6ea72d2528ce 100644 --- a/exporter/debugexporter/logging_exporter.go +++ b/exporter/debugexporter/debug_exporter.go @@ -74,7 +74,7 @@ func (s *debugexporter) pushLogs(_ context.Context, ld plog.Logs) error { return nil } -func newdebugexporter(logger *zap.Logger, verbosity configtelemetry.Level) *debugexporter { +func newDebugExporter(logger *zap.Logger, verbosity configtelemetry.Level) *debugexporter { return &debugexporter{ verbosity: verbosity, logger: logger, diff --git a/exporter/debugexporter/logging_exporter_test.go b/exporter/debugexporter/debug_exporter_test.go similarity index 96% rename from exporter/debugexporter/logging_exporter_test.go rename to exporter/debugexporter/debug_exporter_test.go index 237109cb79ed..01ef4fa66d6d 100644 --- a/exporter/debugexporter/logging_exporter_test.go +++ b/exporter/debugexporter/debug_exporter_test.go @@ -58,8 +58,8 @@ func TestLoggingLogsExporterNoErrors(t *testing.T) { assert.NoError(t, lle.Shutdown(context.Background())) } -func TestdebugexporterErrors(t *testing.T) { - le := newdebugexporter(zaptest.NewLogger(t), configtelemetry.LevelDetailed) +func TestDebugExporterErrors(t *testing.T) { + le := newDebugExporter(zaptest.NewLogger(t), configtelemetry.LevelDetailed) require.NotNil(t, le) errWant := errors.New("my error") diff --git a/exporter/debugexporter/factory.go b/exporter/debugexporter/factory.go index 1d0ef744f263..17b45d6c6f36 100644 --- a/exporter/debugexporter/factory.go +++ b/exporter/debugexporter/factory.go @@ -20,7 +20,7 @@ import ( const ( // The value of "type" key in configuration. - typeStr = "logging" + typeStr = "debug" defaultSamplingInitial = 2 defaultSamplingThereafter = 500 ) @@ -50,7 +50,7 @@ func createDefaultConfig() component.Config { func createTracesExporter(ctx context.Context, set exporter.CreateSettings, config component.Config) (exporter.Traces, error) { cfg := config.(*Config) exporterLogger := createLogger(cfg, set.TelemetrySettings.Logger) - s := newdebugexporter(exporterLogger, cfg.Verbosity) + s := newDebugExporter(exporterLogger, cfg.Verbosity) return exporterhelper.NewTracesExporter(ctx, set, cfg, s.pushTraces, exporterhelper.WithCapabilities(consumer.Capabilities{MutatesData: false}), @@ -65,7 +65,7 @@ func createTracesExporter(ctx context.Context, set exporter.CreateSettings, conf func createMetricsExporter(ctx context.Context, set exporter.CreateSettings, config component.Config) (exporter.Metrics, error) { cfg := config.(*Config) exporterLogger := createLogger(cfg, set.TelemetrySettings.Logger) - s := newdebugexporter(exporterLogger, cfg.Verbosity) + s := newDebugExporter(exporterLogger, cfg.Verbosity) return exporterhelper.NewMetricsExporter(ctx, set, cfg, s.pushMetrics, exporterhelper.WithCapabilities(consumer.Capabilities{MutatesData: false}), @@ -80,7 +80,7 @@ func createMetricsExporter(ctx context.Context, set exporter.CreateSettings, con func createLogsExporter(ctx context.Context, set exporter.CreateSettings, config component.Config) (exporter.Logs, error) { cfg := config.(*Config) exporterLogger := createLogger(cfg, set.TelemetrySettings.Logger) - s := newdebugexporter(exporterLogger, cfg.Verbosity) + s := newDebugExporter(exporterLogger, cfg.Verbosity) return exporterhelper.NewLogsExporter(ctx, set, cfg, s.pushLogs, exporterhelper.WithCapabilities(consumer.Capabilities{MutatesData: false}), diff --git a/exporter/loggingexporter/factory.go b/exporter/loggingexporter/factory.go index 2cd157e6a6ab..11ec6dcbcb51 100644 --- a/exporter/loggingexporter/factory.go +++ b/exporter/loggingexporter/factory.go @@ -32,9 +32,9 @@ func NewFactory() exporter.Factory { return exporter.NewFactory( typeStr, createDefaultConfig, - exporter.WithTraces(createTracesExporter, component.StabilityLevelDevelopment), - exporter.WithMetrics(createMetricsExporter, component.StabilityLevelDevelopment), - exporter.WithLogs(createLogsExporter, component.StabilityLevelDevelopment), + exporter.WithTraces(createTracesExporter, component.StabilityLevelDeprecated), + exporter.WithMetrics(createMetricsExporter, component.StabilityLevelDeprecated), + exporter.WithLogs(createLogsExporter, component.StabilityLevelDeprecated), ) }