Skip to content
Open
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
28 changes: 22 additions & 6 deletions influx2otel/metrics.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,27 @@ import (
"github.com/influxdata/influxdb-observability/common"
)

type LineProtocolToOtelMetricsConfig struct {
Logger common.Logger
NameSeparator string
}

func DefaultLineProtocolToOtelMetricsConfig() *LineProtocolToOtelMetricsConfig {
return &LineProtocolToOtelMetricsConfig{
Logger: new(common.NoopLogger),
NameSeparator: "_",
}
}

type LineProtocolToOtelMetrics struct {
logger common.Logger
logger common.Logger
nameSeparator string
}

func NewLineProtocolToOtelMetrics(logger common.Logger) (*LineProtocolToOtelMetrics, error) {
func NewLineProtocolToOtelMetrics(config *LineProtocolToOtelMetricsConfig) (*LineProtocolToOtelMetrics, error) {
return &LineProtocolToOtelMetrics{
logger: logger,
logger: config.Logger,
nameSeparator: config.NameSeparator,
}, nil
}

Expand All @@ -33,7 +47,8 @@ func (c *LineProtocolToOtelMetrics) NewBatch() *MetricsBatch {
histogramDataPointsByMDPK: make(map[pmetric.Metric]map[dataPointKey]pmetric.HistogramDataPoint),
summaryDataPointsByMDPK: make(map[pmetric.Metric]map[dataPointKey]pmetric.SummaryDataPoint),

logger: c.logger,
logger: c.logger,
nameSeparator: c.nameSeparator,
}
}

Expand All @@ -44,7 +59,8 @@ type MetricsBatch struct {
histogramDataPointsByMDPK map[pmetric.Metric]map[dataPointKey]pmetric.HistogramDataPoint
summaryDataPointsByMDPK map[pmetric.Metric]map[dataPointKey]pmetric.SummaryDataPoint

logger common.Logger
logger common.Logger
nameSeparator string
}

// measurement - metric name
Expand Down Expand Up @@ -235,7 +251,7 @@ func (b *MetricsBatch) addPointWithUnknownSchema(measurement string, tags map[st
continue
}

metricName := fmt.Sprintf("%s_%s", measurement, k)
metricName := fmt.Sprintf("%s%s%s", measurement, b.nameSeparator, k)
metric, attributes, err := b.lookupMetric(metricName, tags, common.InfluxMetricValueTypeGauge)
if err != nil {
return err
Expand Down
18 changes: 12 additions & 6 deletions influx2otel/metrics_statsd_schema_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@ import (
)

func TestStatsdTimingSchema(t *testing.T) {
c, err := influx2otel.NewLineProtocolToOtelMetrics(new(common.NoopLogger))
config := influx2otel.DefaultLineProtocolToOtelMetricsConfig()
c, err := influx2otel.NewLineProtocolToOtelMetrics(config)
require.NoError(t, err)

b := c.NewBatch()
Expand Down Expand Up @@ -106,7 +107,8 @@ func TestStatsdTimingSchema(t *testing.T) {
}

func TestStatsCounter(t *testing.T) {
c, err := influx2otel.NewLineProtocolToOtelMetrics(new(common.NoopLogger))
config := influx2otel.DefaultLineProtocolToOtelMetricsConfig()
c, err := influx2otel.NewLineProtocolToOtelMetrics(config)
require.NoError(t, err)

// statsd metric:
Expand Down Expand Up @@ -142,7 +144,8 @@ func TestStatsCounter(t *testing.T) {
}

func TestStatsDeltaCounter(t *testing.T) {
c, err := influx2otel.NewLineProtocolToOtelMetrics(new(common.NoopLogger))
config := influx2otel.DefaultLineProtocolToOtelMetricsConfig()
c, err := influx2otel.NewLineProtocolToOtelMetrics(config)
require.NoError(t, err)

// statsd metric:
Expand Down Expand Up @@ -179,7 +182,8 @@ func TestStatsDeltaCounter(t *testing.T) {
}

func TestStatsGauge(t *testing.T) {
c, err := influx2otel.NewLineProtocolToOtelMetrics(new(common.NoopLogger))
config := influx2otel.DefaultLineProtocolToOtelMetricsConfig()
c, err := influx2otel.NewLineProtocolToOtelMetrics(config)
require.NoError(t, err)

// statsd metric:
Expand Down Expand Up @@ -214,7 +218,8 @@ func TestStatsGauge(t *testing.T) {
}

func TestStatsdSetsSchema(t *testing.T) {
c, err := influx2otel.NewLineProtocolToOtelMetrics(new(common.NoopLogger))
config := influx2otel.DefaultLineProtocolToOtelMetricsConfig()
c, err := influx2otel.NewLineProtocolToOtelMetrics(config)
require.NoError(t, err)

// statsd metric:
Expand Down Expand Up @@ -249,7 +254,8 @@ func TestStatsdSetsSchema(t *testing.T) {
}

func TestDeltaTemporalityStatsdCounter(t *testing.T) {
c, err := influx2otel.NewLineProtocolToOtelMetrics(new(common.NoopLogger))
config := influx2otel.DefaultLineProtocolToOtelMetricsConfig()
c, err := influx2otel.NewLineProtocolToOtelMetrics(config)
require.NoError(t, err)

// statsd metric:
Expand Down
4 changes: 2 additions & 2 deletions influx2otel/metrics_telegraf_prometheus_v1.go
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ func (b *MetricsBatch) convertGaugeV1(measurement string, tags map[string]string
continue
}

metricName := fmt.Sprintf("%s_%s", measurement, k)
metricName := fmt.Sprintf("%s%s%s", measurement, b.nameSeparator, k)
metric, attributes, err := b.lookupMetric(metricName, tags, common.InfluxMetricValueTypeGauge)
if err != nil {
return err
Expand Down Expand Up @@ -220,7 +220,7 @@ func (b *MetricsBatch) convertSumV1(measurement string, tags map[string]string,
continue
}

metricName := fmt.Sprintf("%s_%s", measurement, k)
metricName := fmt.Sprintf("%s%s%s", measurement, b.nameSeparator, k)
metric, attributes, err := b.lookupMetric(metricName, tags, common.InfluxMetricValueTypeSum)
if err != nil {
return err
Expand Down
Loading