From 211db7e388fb3e45cf66a9fb3179d606b1cc3788 Mon Sep 17 00:00:00 2001 From: Tomaz Muraus Date: Fri, 23 Jun 2023 15:44:25 +0200 Subject: [PATCH] Per PR review, add "map" suffix to the function names. --- exporter/datasetexporter/logs_exporter.go | 12 +-- .../datasetexporter/logs_exporter_test.go | 88 +++++++++---------- 2 files changed, 50 insertions(+), 50 deletions(-) diff --git a/exporter/datasetexporter/logs_exporter.go b/exporter/datasetexporter/logs_exporter.go index 627f582ac29c..f3b3a379ed1b 100644 --- a/exporter/datasetexporter/logs_exporter.go +++ b/exporter/datasetexporter/logs_exporter.go @@ -82,7 +82,7 @@ func buildBody(attrs map[string]interface{}, value pcommon.Value) string { } // Function maps OTel severity on the LogRecord to DataSet severity level (number) -func otelSeverityToDataSetSeverity(log plog.LogRecord) int { +func mapOtelSeverityToDataSetSeverity(log plog.LogRecord) int { // This function maps OTel severity level to DataSet severity levels // // Valid OTel levels - https://opentelemetry.io/docs/specs/otel/logs/data-model/#field-severitynumber @@ -93,11 +93,11 @@ func otelSeverityToDataSetSeverity(log plog.LogRecord) int { dataSetSeverity := defaultDataSetSeverityLevel if sevNum > 0 { - dataSetSeverity = logRecordSevNumToDataSetSeverity(sevNum) + dataSetSeverity = mapLogRecordSevNumToDataSetSeverity(sevNum) } else if sevText != "" { // Per docs, SeverityNumber is optional so if it's not present we fall back to SeverityText // https://opentelemetry.io/docs/specs/otel/logs/data-model/#field-severitytext - dataSetSeverity = logRecordSeverityTextToDataSetSeverity(sevText) + dataSetSeverity = mapLogRecordSeverityTextToDataSetSeverity(sevText) } // TODO: We should log in case we see invalid severity, but right now, afaik, we / OTEL @@ -108,7 +108,7 @@ func otelSeverityToDataSetSeverity(log plog.LogRecord) int { return dataSetSeverity } -func logRecordSevNumToDataSetSeverity(sevNum plog.SeverityNumber) int { +func mapLogRecordSevNumToDataSetSeverity(sevNum plog.SeverityNumber) int { // Maps LogRecord.SeverityNumber field value to DataSet severity value. dataSetSeverity := defaultDataSetSeverityLevel @@ -142,7 +142,7 @@ func logRecordSevNumToDataSetSeverity(sevNum plog.SeverityNumber) int { return dataSetSeverity } -func logRecordSeverityTextToDataSetSeverity(sevText string) int { +func mapLogRecordSeverityTextToDataSetSeverity(sevText string) int { // Maps LogRecord.SeverityText field value to DataSet severity value. dataSetSeverity := defaultDataSetSeverityLevel @@ -181,7 +181,7 @@ func buildEventFromLog( observedTs := log.ObservedTimestamp().AsTime() - event.Sev = otelSeverityToDataSetSeverity(log) + event.Sev = mapOtelSeverityToDataSetSeverity(log) if timestamp := log.Timestamp().AsTime(); !timestamp.Equal(time.Unix(0, 0)) { event.Ts = strconv.FormatInt(timestamp.UnixNano(), 10) diff --git a/exporter/datasetexporter/logs_exporter_test.go b/exporter/datasetexporter/logs_exporter_test.go index 7ad7545df1e3..c52b284ce9a5 100644 --- a/exporter/datasetexporter/logs_exporter_test.go +++ b/exporter/datasetexporter/logs_exporter_test.go @@ -406,101 +406,101 @@ func TestOtelSeverityToDataSetSeverityWithSeverityNumberNoSeverityText(t *testin // invalid values ld.SetSeverityNumber(0) - assert.Equal(t, defaultDataSetSeverityLevel, otelSeverityToDataSetSeverity(ld)) + assert.Equal(t, defaultDataSetSeverityLevel, mapOtelSeverityToDataSetSeverity(ld)) ld.SetSeverityNumber(-1) - assert.Equal(t, defaultDataSetSeverityLevel, otelSeverityToDataSetSeverity(ld)) + assert.Equal(t, defaultDataSetSeverityLevel, mapOtelSeverityToDataSetSeverity(ld)) ld.SetSeverityNumber(100) - assert.Equal(t, defaultDataSetSeverityLevel, otelSeverityToDataSetSeverity(ld)) + assert.Equal(t, defaultDataSetSeverityLevel, mapOtelSeverityToDataSetSeverity(ld)) // trace ld.SetSeverityNumber(1) - assert.Equal(t, dataSetLogLevelTrace, otelSeverityToDataSetSeverity(ld)) + assert.Equal(t, dataSetLogLevelTrace, mapOtelSeverityToDataSetSeverity(ld)) ld.SetSeverityNumber(2) - assert.Equal(t, dataSetLogLevelTrace, otelSeverityToDataSetSeverity(ld)) + assert.Equal(t, dataSetLogLevelTrace, mapOtelSeverityToDataSetSeverity(ld)) ld.SetSeverityNumber(3) - assert.Equal(t, dataSetLogLevelTrace, otelSeverityToDataSetSeverity(ld)) + assert.Equal(t, dataSetLogLevelTrace, mapOtelSeverityToDataSetSeverity(ld)) ld.SetSeverityNumber(4) - assert.Equal(t, dataSetLogLevelTrace, otelSeverityToDataSetSeverity(ld)) + assert.Equal(t, dataSetLogLevelTrace, mapOtelSeverityToDataSetSeverity(ld)) // debug ld.SetSeverityNumber(5) - assert.Equal(t, dataSetLogLevelDebug, otelSeverityToDataSetSeverity(ld)) + assert.Equal(t, dataSetLogLevelDebug, mapOtelSeverityToDataSetSeverity(ld)) ld.SetSeverityNumber(6) - assert.Equal(t, dataSetLogLevelDebug, otelSeverityToDataSetSeverity(ld)) + assert.Equal(t, dataSetLogLevelDebug, mapOtelSeverityToDataSetSeverity(ld)) ld.SetSeverityNumber(7) - assert.Equal(t, dataSetLogLevelDebug, otelSeverityToDataSetSeverity(ld)) + assert.Equal(t, dataSetLogLevelDebug, mapOtelSeverityToDataSetSeverity(ld)) ld.SetSeverityNumber(8) - assert.Equal(t, dataSetLogLevelDebug, otelSeverityToDataSetSeverity(ld)) + assert.Equal(t, dataSetLogLevelDebug, mapOtelSeverityToDataSetSeverity(ld)) // info ld.SetSeverityNumber(9) - assert.Equal(t, dataSetLogLevelInfo, otelSeverityToDataSetSeverity(ld)) + assert.Equal(t, dataSetLogLevelInfo, mapOtelSeverityToDataSetSeverity(ld)) ld.SetSeverityNumber(10) - assert.Equal(t, dataSetLogLevelInfo, otelSeverityToDataSetSeverity(ld)) + assert.Equal(t, dataSetLogLevelInfo, mapOtelSeverityToDataSetSeverity(ld)) ld.SetSeverityNumber(11) - assert.Equal(t, dataSetLogLevelInfo, otelSeverityToDataSetSeverity(ld)) + assert.Equal(t, dataSetLogLevelInfo, mapOtelSeverityToDataSetSeverity(ld)) ld.SetSeverityNumber(12) - assert.Equal(t, dataSetLogLevelInfo, otelSeverityToDataSetSeverity(ld)) + assert.Equal(t, dataSetLogLevelInfo, mapOtelSeverityToDataSetSeverity(ld)) // warn ld.SetSeverityNumber(13) - assert.Equal(t, dataSetLogLevelWarn, otelSeverityToDataSetSeverity(ld)) + assert.Equal(t, dataSetLogLevelWarn, mapOtelSeverityToDataSetSeverity(ld)) ld.SetSeverityNumber(14) - assert.Equal(t, dataSetLogLevelWarn, otelSeverityToDataSetSeverity(ld)) + assert.Equal(t, dataSetLogLevelWarn, mapOtelSeverityToDataSetSeverity(ld)) ld.SetSeverityNumber(15) - assert.Equal(t, dataSetLogLevelWarn, otelSeverityToDataSetSeverity(ld)) + assert.Equal(t, dataSetLogLevelWarn, mapOtelSeverityToDataSetSeverity(ld)) ld.SetSeverityNumber(16) - assert.Equal(t, dataSetLogLevelWarn, otelSeverityToDataSetSeverity(ld)) + assert.Equal(t, dataSetLogLevelWarn, mapOtelSeverityToDataSetSeverity(ld)) // error ld.SetSeverityNumber(17) - assert.Equal(t, dataSetLogLevelError, otelSeverityToDataSetSeverity(ld)) + assert.Equal(t, dataSetLogLevelError, mapOtelSeverityToDataSetSeverity(ld)) ld.SetSeverityNumber(18) - assert.Equal(t, dataSetLogLevelError, otelSeverityToDataSetSeverity(ld)) + assert.Equal(t, dataSetLogLevelError, mapOtelSeverityToDataSetSeverity(ld)) ld.SetSeverityNumber(19) - assert.Equal(t, dataSetLogLevelError, otelSeverityToDataSetSeverity(ld)) + assert.Equal(t, dataSetLogLevelError, mapOtelSeverityToDataSetSeverity(ld)) ld.SetSeverityNumber(20) - assert.Equal(t, dataSetLogLevelError, otelSeverityToDataSetSeverity(ld)) + assert.Equal(t, dataSetLogLevelError, mapOtelSeverityToDataSetSeverity(ld)) // fatal ld.SetSeverityNumber(21) - assert.Equal(t, dataSetLogLevelFatal, otelSeverityToDataSetSeverity(ld)) + assert.Equal(t, dataSetLogLevelFatal, mapOtelSeverityToDataSetSeverity(ld)) ld.SetSeverityNumber(22) - assert.Equal(t, dataSetLogLevelFatal, otelSeverityToDataSetSeverity(ld)) + assert.Equal(t, dataSetLogLevelFatal, mapOtelSeverityToDataSetSeverity(ld)) ld.SetSeverityNumber(22) - assert.Equal(t, dataSetLogLevelFatal, otelSeverityToDataSetSeverity(ld)) + assert.Equal(t, dataSetLogLevelFatal, mapOtelSeverityToDataSetSeverity(ld)) ld.SetSeverityNumber(24) - assert.Equal(t, dataSetLogLevelFatal, otelSeverityToDataSetSeverity(ld)) + assert.Equal(t, dataSetLogLevelFatal, mapOtelSeverityToDataSetSeverity(ld)) // Invalid values get mapped to info (3) ld.SetSeverityNumber(0) - assert.Equal(t, defaultDataSetSeverityLevel, otelSeverityToDataSetSeverity(ld)) + assert.Equal(t, defaultDataSetSeverityLevel, mapOtelSeverityToDataSetSeverity(ld)) ld.SetSeverityNumber(-1) - assert.Equal(t, defaultDataSetSeverityLevel, otelSeverityToDataSetSeverity(ld)) + assert.Equal(t, defaultDataSetSeverityLevel, mapOtelSeverityToDataSetSeverity(ld)) ld.SetSeverityNumber(25) - assert.Equal(t, 3, otelSeverityToDataSetSeverity(ld)) + assert.Equal(t, 3, mapOtelSeverityToDataSetSeverity(ld)) } @@ -511,46 +511,46 @@ func TestOtelSeverityToDataSetSeverityWithSeverityTextNoSeverityNumber(t *testin // invalid values ld.SetSeverityText("a") - assert.Equal(t, defaultDataSetSeverityLevel, otelSeverityToDataSetSeverity(ld)) + assert.Equal(t, defaultDataSetSeverityLevel, mapOtelSeverityToDataSetSeverity(ld)) ld.SetSeverityText("infofoo") - assert.Equal(t, defaultDataSetSeverityLevel, otelSeverityToDataSetSeverity(ld)) + assert.Equal(t, defaultDataSetSeverityLevel, mapOtelSeverityToDataSetSeverity(ld)) // trace ld.SetSeverityText("trace") - assert.Equal(t, dataSetLogLevelTrace, otelSeverityToDataSetSeverity(ld)) + assert.Equal(t, dataSetLogLevelTrace, mapOtelSeverityToDataSetSeverity(ld)) // debug ld.SetSeverityText("debug") - assert.Equal(t, dataSetLogLevelDebug, otelSeverityToDataSetSeverity(ld)) + assert.Equal(t, dataSetLogLevelDebug, mapOtelSeverityToDataSetSeverity(ld)) // info ld.SetSeverityText("info") - assert.Equal(t, dataSetLogLevelInfo, otelSeverityToDataSetSeverity(ld)) + assert.Equal(t, dataSetLogLevelInfo, mapOtelSeverityToDataSetSeverity(ld)) ld.SetSeverityText("informational") - assert.Equal(t, dataSetLogLevelInfo, otelSeverityToDataSetSeverity(ld)) + assert.Equal(t, dataSetLogLevelInfo, mapOtelSeverityToDataSetSeverity(ld)) // warn ld.SetSeverityText("warn") - assert.Equal(t, dataSetLogLevelWarn, otelSeverityToDataSetSeverity(ld)) + assert.Equal(t, dataSetLogLevelWarn, mapOtelSeverityToDataSetSeverity(ld)) ld.SetSeverityText("warning") - assert.Equal(t, dataSetLogLevelWarn, otelSeverityToDataSetSeverity(ld)) + assert.Equal(t, dataSetLogLevelWarn, mapOtelSeverityToDataSetSeverity(ld)) // error ld.SetSeverityText("error") - assert.Equal(t, dataSetLogLevelError, otelSeverityToDataSetSeverity(ld)) + assert.Equal(t, dataSetLogLevelError, mapOtelSeverityToDataSetSeverity(ld)) // fatal ld.SetSeverityText("fatal") - assert.Equal(t, dataSetLogLevelFatal, otelSeverityToDataSetSeverity(ld)) + assert.Equal(t, dataSetLogLevelFatal, mapOtelSeverityToDataSetSeverity(ld)) ld.SetSeverityText("critical") - assert.Equal(t, dataSetLogLevelFatal, otelSeverityToDataSetSeverity(ld)) + assert.Equal(t, dataSetLogLevelFatal, mapOtelSeverityToDataSetSeverity(ld)) ld.SetSeverityText("emergency") - assert.Equal(t, dataSetLogLevelFatal, otelSeverityToDataSetSeverity(ld)) + assert.Equal(t, dataSetLogLevelFatal, mapOtelSeverityToDataSetSeverity(ld)) } func TestOtelSeverityToDataSetSeverityWithSeverityNumberAndSeverityTextSeverityNumberHasPriority(t *testing.T) { @@ -560,10 +560,10 @@ func TestOtelSeverityToDataSetSeverityWithSeverityNumberAndSeverityTextSeverityN ld.SetSeverityNumber(3) ld.SetSeverityText("debug") - assert.Equal(t, 1, otelSeverityToDataSetSeverity(ld)) + assert.Equal(t, 1, mapOtelSeverityToDataSetSeverity(ld)) ld.SetSeverityNumber(22) ld.SetSeverityText("info") - assert.Equal(t, 6, otelSeverityToDataSetSeverity(ld)) + assert.Equal(t, 6, mapOtelSeverityToDataSetSeverity(ld)) }