Skip to content
Merged
Show file tree
Hide file tree
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
25 changes: 25 additions & 0 deletions .chloggen/mx-psi_move-exporterhelper-experimental-stuff.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
# Use this changelog template to create an entry for release notes.

# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
change_type: deprecation

# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver)
component: exporterhelper

# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
note: Deprecate all experimental symbols in exporterhelper and move them to xexporterhelper

# One or more tracking issues or pull requests related to the change
issues: [11143]

# (Optional) One or more lines of additional information to render under the primary note.
# These lines will be padded with 2 spaces and then inserted directly into the document.
# Use pipe (|) for multiline entries.
subtext:

# Optional: The change log or logs in which this entry should be included.
# e.g. '[user]' or '[user, api]'
# Include 'user' if the change is relevant to end users.
# Include 'api' if there is a change to a library API.
# Default: '[user]'
change_logs: [api]
8 changes: 0 additions & 8 deletions exporter/exporterhelper/constants.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,18 +12,10 @@ var (
errNilConfig = errors.New("nil config")
// errNilLogger is returned when a logger is nil
errNilLogger = errors.New("nil logger")
// errNilConsumeRequest is returned when a nil PushTraces is given.
errNilConsumeRequest = errors.New("nil RequestConsumeFunc")
// errNilPushTraces is returned when a nil PushTraces is given.
errNilPushTraces = errors.New("nil PushTraces")
// errNilPushMetrics is returned when a nil PushMetrics is given.
errNilPushMetrics = errors.New("nil PushMetrics")
// errNilPushLogs is returned when a nil PushLogs is given.
errNilPushLogs = errors.New("nil PushLogs")
// errNilTracesConverter is returned when a nil RequestFromTracesFunc is given.
errNilTracesConverter = errors.New("nil RequestFromTracesFunc")
// errNilMetricsConverter is returned when a nil RequestFromMetricsFunc is given.
errNilMetricsConverter = errors.New("nil RequestFromMetricsFunc")
// errNilLogsConverter is returned when a nil RequestFromLogsFunc is given.
errNilLogsConverter = errors.New("nil RequestFromLogsFunc")
)
19 changes: 19 additions & 0 deletions exporter/exporterhelper/internal/constants.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
// Copyright The OpenTelemetry Authors
// SPDX-License-Identifier: Apache-2.0

package internal // import "go.opentelemetry.io/collector/exporter/exporterhelper/internal"

import "errors"

var (
// errNilLogger is returned when a logger is nil
errNilLogger = errors.New("nil logger")
// errNilConsumeRequest is returned when a nil PushTraces is given.
errNilConsumeRequest = errors.New("nil RequestConsumeFunc")
// errNilTracesConverter is returned when a nil RequestFromTracesFunc is given.
errNilTracesConverter = errors.New("nil RequestFromTracesFunc")
// errNilMetricsConverter is returned when a nil RequestFromMetricsFunc is given.
errNilMetricsConverter = errors.New("nil RequestFromMetricsFunc")
// errNilLogsConverter is returned when a nil RequestFromLogsFunc is given.
errNilLogsConverter = errors.New("nil RequestFromLogsFunc")
)
178 changes: 178 additions & 0 deletions exporter/exporterhelper/internal/new_request.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,178 @@
// Copyright The OpenTelemetry Authors
// SPDX-License-Identifier: Apache-2.0

package internal // import "go.opentelemetry.io/collector/exporter/exporterhelper/internal"

import (
"context"

"go.uber.org/zap"

"go.opentelemetry.io/collector/consumer"
"go.opentelemetry.io/collector/consumer/consumererror"
"go.opentelemetry.io/collector/exporter"
"go.opentelemetry.io/collector/exporter/exporterhelper/internal/request"
"go.opentelemetry.io/collector/pdata/plog"
"go.opentelemetry.io/collector/pdata/pmetric"
"go.opentelemetry.io/collector/pdata/ptrace"
"go.opentelemetry.io/collector/pipeline"
)

type logsExporter struct {
*BaseExporter
consumer.Logs
}

// NewLogsRequest creates new logs exporter based on custom LogsConverter and Sender.
// Experimental: This API is at the early stage of development and may change without backward compatibility
// until https://github.com/open-telemetry/opentelemetry-collector/issues/8122 is resolved.
func NewLogsRequest(
_ context.Context,
set exporter.Settings,
converter request.RequestConverterFunc[plog.Logs],
pusher request.RequestConsumeFunc,
options ...Option,
) (exporter.Logs, error) {
if set.Logger == nil {
return nil, errNilLogger
}

if converter == nil {
return nil, errNilLogsConverter
}

if pusher == nil {
return nil, errNilConsumeRequest
}

be, err := NewBaseExporter(set, pipeline.SignalLogs, pusher, options...)
if err != nil {
return nil, err
}

lc, err := consumer.NewLogs(newConsumeLogs(converter, be, set.Logger), be.ConsumerOptions...)
if err != nil {
return nil, err
}

return &logsExporter{BaseExporter: be, Logs: lc}, nil
}

func newConsumeLogs(converter request.RequestConverterFunc[plog.Logs], be *BaseExporter, logger *zap.Logger) consumer.ConsumeLogsFunc {
return func(ctx context.Context, ld plog.Logs) error {
req, err := converter(ctx, ld)
if err != nil {
logger.Error("Failed to convert logs. Dropping data.",
zap.Int("dropped_log_records", ld.LogRecordCount()),
zap.Error(err))
return consumererror.NewPermanent(err)
}
return be.Send(ctx, req)
}
}

type tracesExporter struct {
*BaseExporter
consumer.Traces
}

// NewTracesRequest creates a new traces exporter based on a custom TracesConverter and Sender.
// Experimental: This API is at the early stage of development and may change without backward compatibility
// until https://github.com/open-telemetry/opentelemetry-collector/issues/8122 is resolved.
func NewTracesRequest(
_ context.Context,
set exporter.Settings,
converter request.RequestConverterFunc[ptrace.Traces],
pusher request.RequestConsumeFunc,
options ...Option,
) (exporter.Traces, error) {
if set.Logger == nil {
return nil, errNilLogger
}

if converter == nil {
return nil, errNilTracesConverter
}

if pusher == nil {
return nil, errNilConsumeRequest
}

be, err := NewBaseExporter(set, pipeline.SignalTraces, pusher, options...)
if err != nil {
return nil, err
}

tc, err := consumer.NewTraces(newConsumeTraces(converter, be, set.Logger), be.ConsumerOptions...)
if err != nil {
return nil, err
}

return &tracesExporter{BaseExporter: be, Traces: tc}, nil
}

func newConsumeTraces(converter request.RequestConverterFunc[ptrace.Traces], be *BaseExporter, logger *zap.Logger) consumer.ConsumeTracesFunc {
return func(ctx context.Context, td ptrace.Traces) error {
req, err := converter(ctx, td)
if err != nil {
logger.Error("Failed to convert traces. Dropping data.",
zap.Int("dropped_spans", td.SpanCount()),
zap.Error(err))
return consumererror.NewPermanent(err)
}
return be.Send(ctx, req)
}
}

type metricsExporter struct {
*BaseExporter
consumer.Metrics
}

// NewMetricsRequest creates a new metrics exporter based on a custom MetricsConverter and Sender.
// Experimental: This API is at the early stage of development and may change without backward compatibility
// until https://github.com/open-telemetry/opentelemetry-collector/issues/8122 is resolved.
func NewMetricsRequest(
_ context.Context,
set exporter.Settings,
converter request.RequestConverterFunc[pmetric.Metrics],
pusher request.RequestConsumeFunc,
options ...Option,
) (exporter.Metrics, error) {
if set.Logger == nil {
return nil, errNilLogger
}

if converter == nil {
return nil, errNilMetricsConverter
}

if pusher == nil {
return nil, errNilConsumeRequest
}

be, err := NewBaseExporter(set, pipeline.SignalMetrics, pusher, options...)
if err != nil {
return nil, err
}

mc, err := consumer.NewMetrics(newConsumeMetrics(converter, be, set.Logger), be.ConsumerOptions...)
if err != nil {
return nil, err
}

return &metricsExporter{BaseExporter: be, Metrics: mc}, nil
}

func newConsumeMetrics(converter request.RequestConverterFunc[pmetric.Metrics], be *BaseExporter, logger *zap.Logger) consumer.ConsumeMetricsFunc {
return func(ctx context.Context, md pmetric.Metrics) error {
req, err := converter(ctx, md)
if err != nil {
logger.Error("Failed to convert metrics. Dropping data.",
zap.Int("dropped_data_points", md.DataPointCount()),
zap.Error(err))
return consumererror.NewPermanent(err)
}
return be.Send(ctx, req)
}
}
Loading