[chore] Address comments.

open-telemetry · Aug 16, 2022 · 9486cf0 · 9486cf0
1 parent 7ec10c2
commit 9486cf0
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 37 deletions.
diff --git a/processor/k8sattributesprocessor/config_test.go b/processor/k8sattributesprocessor/config_test.go
@@ -18,11 +18,10 @@ import (
 	"path/filepath"
 	"testing"
 
-	"go.opentelemetry.io/collector/confmap/confmaptest"
-
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"go.opentelemetry.io/collector/config"
+	"go.opentelemetry.io/collector/confmap/confmaptest"
 
 	"github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig"
 	"github.com/open-telemetry/opentelemetry-collector-contrib/processor/k8sattributesprocessor/internal/kube"

diff --git a/processor/logstransformprocessor/config_test.go b/processor/logstransformprocessor/config_test.go
@@ -19,11 +19,10 @@ import (
 	"testing"
 	"time"
 
-	"github.com/stretchr/testify/require"
-	"go.opentelemetry.io/collector/confmap/confmaptest"
-
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 	"go.opentelemetry.io/collector/config"
+	"go.opentelemetry.io/collector/confmap/confmaptest"
 
 	"github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/adapter"
 )

diff --git a/processor/logstransformprocessor/testdata/config.yaml b/processor/logstransformprocessor/testdata/config.yaml
@@ -5,4 +5,4 @@ operators:
       parse_from: attributes.time
       layout: '%Y-%m-%d %H:%M:%S'
     severity:
-      parse_from: attributes.sev
+      parse_from: attributes.sev
diff --git a/processor/metricsgenerationprocessor/config_test.go b/processor/metricsgenerationprocessor/config_test.go
@@ -19,11 +19,10 @@ import (
 	"path/filepath"
 	"testing"
 
-	"go.opentelemetry.io/collector/confmap/confmaptest"
-
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"go.opentelemetry.io/collector/config"
+	"go.opentelemetry.io/collector/confmap/confmaptest"
 )
 
 func TestLoadConfig(t *testing.T) {
@@ -99,12 +98,12 @@ func TestLoadConfig(t *testing.T) {
 			require.NoError(t, err)
 			require.NoError(t, config.UnmarshalProcessor(sub, cfg))
 
-			if tt.expected != nil {
-				assert.NoError(t, cfg.Validate())
-				assert.Equal(t, tt.expected, cfg)
-			} else {
+			if tt.expected == nil {
 				assert.EqualError(t, cfg.Validate(), tt.errorMessage)
+				return
 			}
+			assert.NoError(t, cfg.Validate())
+			assert.Equal(t, tt.expected, cfg)
 		})
 	}
 }
diff --git a/processor/metricsgenerationprocessor/factory_test.go b/processor/metricsgenerationprocessor/factory_test.go
@@ -17,16 +17,14 @@ package metricsgenerationprocessor
 import (
 	"context"
 	"path/filepath"
-	"strings"
 	"testing"
 
-	"github.com/stretchr/testify/require"
-	"go.opentelemetry.io/collector/confmap/confmaptest"
-
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 	"go.opentelemetry.io/collector/component/componenttest"
 	"go.opentelemetry.io/collector/config"
 	"go.opentelemetry.io/collector/config/configtest"
+	"go.opentelemetry.io/collector/confmap/confmaptest"
 	"go.opentelemetry.io/collector/consumer/consumertest"
 )
 
@@ -58,12 +56,7 @@ func TestCreateProcessors(t *testing.T) {
 			factory := NewFactory()
 			cfg := factory.CreateDefaultConfig()
 
-			var id string
-			parts := strings.Split(k, "/")
-			if len(parts) > 1 {
-				id = parts[1]
-			}
-			sub, err := cm.Sub(config.NewComponentIDWithName(typeStr, id).String())
+			sub, err := cm.Sub(k)
 			require.NoError(t, err)
 			require.NoError(t, config.UnmarshalProcessor(sub, cfg))
 

diff --git a/processor/metricstransformprocessor/config_test.go b/processor/metricstransformprocessor/config_test.go
@@ -18,11 +18,10 @@ import (
 	"path/filepath"
 	"testing"
 
-	"go.opentelemetry.io/collector/confmap/confmaptest"
-
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"go.opentelemetry.io/collector/config"
+	"go.opentelemetry.io/collector/confmap/confmaptest"
 )
 
 func TestLoadConfig(t *testing.T) {

diff --git a/processor/metricstransformprocessor/factory_test.go b/processor/metricstransformprocessor/factory_test.go
@@ -19,16 +19,14 @@ import (
 	"fmt"
 	"path/filepath"
 	"reflect"
-	"strings"
 	"testing"
 
-	"github.com/stretchr/testify/require"
-	"go.opentelemetry.io/collector/confmap/confmaptest"
-
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 	"go.opentelemetry.io/collector/component/componenttest"
 	"go.opentelemetry.io/collector/config"
 	"go.opentelemetry.io/collector/config/configtest"
+	"go.opentelemetry.io/collector/confmap/confmaptest"
 	"go.opentelemetry.io/collector/consumer/consumertest"
 )
 
@@ -131,12 +129,7 @@ func TestCreateProcessors(t *testing.T) {
 				factory := NewFactory()
 				cfg := factory.CreateDefaultConfig()
 
-				var id string
-				parts := strings.Split(k, "/")
-				if len(parts) > 1 {
-					id = parts[1]
-				}
-				sub, err := cm.Sub(config.NewComponentIDWithName(typeStr, id).String())
+				sub, err := cm.Sub(k)
 				require.NoError(t, err)
 				require.NoError(t, config.UnmarshalProcessor(sub, cfg))
 

diff --git a/processor/probabilisticsamplerprocessor/testdata/config.yaml b/processor/probabilisticsamplerprocessor/testdata/config.yaml
@@ -20,4 +20,4 @@ probabilistic_sampler:
   # intended.
   hash_seed: 22
 
-probabilistic_sampler/empty:
+probabilistic_sampler/empty:
diff --git a/processor/redactionprocessor/config_test.go b/processor/redactionprocessor/config_test.go
@@ -18,11 +18,10 @@ import (
 	"path/filepath"
 	"testing"
 
-	"go.opentelemetry.io/collector/confmap/confmaptest"
-
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"go.opentelemetry.io/collector/config"
+	"go.opentelemetry.io/collector/confmap/confmaptest"
 )
 
 func TestLoadConfig(t *testing.T) {