[connector/routing] remove internal common package (open-telemetry#43903)

The functions in the package were only used in one package, moved the
code there instead.

Signed-off-by: alex boten <[email protected]>

Author: codeboten

connector/routingconnector/internal/common/functions.go renamed to connector/routingconnector/functions.go

@@ -1,7 +1,7 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
-package common // import "github.com/open-telemetry/opentelemetry-collector-contrib/connector/routingconnector/internal/common"
+package routingconnector // import "github.com/open-telemetry/opentelemetry-collector-contrib/connector/routingconnector"
 
 import (
 	"context"
@@ -17,7 +17,7 @@ func createRouteFunction[K any](ottl.FunctionContext, ottl.Arguments) (ottl.Expr
 	}, nil
 }
 
-func StandardFunctions[K any]() map[string]ottl.Factory[K] {
+func standardFunctions[K any]() map[string]ottl.Factory[K] {
 	// standard converters do not transform data, so we can safely use them
 	funcs := ottlfuncs.StandardConverters[K]()
 
@@ -33,8 +33,8 @@ func StandardFunctions[K any]() map[string]ottl.Factory[K] {
 	return funcs
 }
 
-func SpanFunctions() map[string]ottl.Factory[ottlspan.TransformContext] {
-	funcs := StandardFunctions[ottlspan.TransformContext]()
+func spanFunctions() map[string]ottl.Factory[ottlspan.TransformContext] {
+	funcs := standardFunctions[ottlspan.TransformContext]()
 
 	isRootSpan := ottlfuncs.NewIsRootSpanFactory()
 	funcs[isRootSpan.Name()] = isRootSpan

connector/routingconnector/internal/common/functions_test.go renamed to connector/routingconnector/functions_test.go

@@ -1,7 +1,7 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
-package common
+package routingconnector
 
 import (
 	"maps"
@@ -15,11 +15,11 @@ import (
 )
 
 func TestStandardFunctions(t *testing.T) {
-	assertStandardFunctions(t, StandardFunctions[any]())
+	assertStandardFunctions(t, standardFunctions[any]())
 }
 
 func TestSpanFunctions(t *testing.T) {
-	funcs := SpanFunctions()
+	funcs := spanFunctions()
 	assertStandardFunctions(t, funcs)
 
 	isRouteFuncName := ottlfuncs.NewIsRootSpanFactory().Name()

connector/routingconnector/logs_test.go

@@ -17,7 +17,6 @@ import (
 	"go.opentelemetry.io/collector/pdata/plog"
 	"go.opentelemetry.io/collector/pipeline"
 
-	"github.com/open-telemetry/opentelemetry-collector-contrib/connector/routingconnector/internal/common"
 	"github.com/open-telemetry/opentelemetry-collector-contrib/connector/routingconnector/internal/metadata"
 	"github.com/open-telemetry/opentelemetry-collector-contrib/connector/routingconnector/internal/plogutiltest"
 	"github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl/contexts/ottllog"
@@ -437,9 +436,9 @@ func TestLogsConnectorDetailed(t *testing.T) {
 
 	// IsMap and IsString are just candidate for Standard Converter Function to prevent any unknown regressions for this component
 	isBodyString := `IsString(body) == true`
-	require.Contains(t, common.StandardFunctions[ottllog.TransformContext](), "IsString")
+	require.Contains(t, standardFunctions[ottllog.TransformContext](), "IsString")
 	isBodyMap := `IsMap(body) == true`
-	require.Contains(t, common.StandardFunctions[ottllog.TransformContext](), "IsMap")
+	require.Contains(t, standardFunctions[ottllog.TransformContext](), "IsMap")
 
 	isScopeCFromLowerContext := `instrumentation_scope.name == "scopeC"`
 	isScopeDFromLowerContext := `instrumentation_scope.name == "scopeD"`

connector/routingconnector/metrics_test.go

@@ -17,7 +17,6 @@ import (
 	"go.opentelemetry.io/collector/pdata/pmetric"
 	"go.opentelemetry.io/collector/pipeline"
 
-	"github.com/open-telemetry/opentelemetry-collector-contrib/connector/routingconnector/internal/common"
 	"github.com/open-telemetry/opentelemetry-collector-contrib/connector/routingconnector/internal/metadata"
 	"github.com/open-telemetry/opentelemetry-collector-contrib/connector/routingconnector/internal/pmetricutiltest"
 	"github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl/contexts/ottlresource"
@@ -453,9 +452,9 @@ func TestMetricsConnectorDetailed(t *testing.T) {
 
 	// IsMap and IsString are just candidate for Standard Converter Function to prevent any unknown regressions for this component
 	isResourceString := `IsString(attributes["resourceName"]) == true`
-	require.Contains(t, common.StandardFunctions[ottlresource.TransformContext](), "IsString")
+	require.Contains(t, standardFunctions[ottlresource.TransformContext](), "IsString")
 	isAttributesMap := `IsMap(attributes) == true`
-	require.Contains(t, common.StandardFunctions[ottlresource.TransformContext](), "IsMap")
+	require.Contains(t, standardFunctions[ottlresource.TransformContext](), "IsMap")
 
 	isMetricE := `name == "metricE"`
 	isMetricF := `name == "metricF"`

connector/routingconnector/router.go

@@ -12,7 +12,6 @@ import (
 	"go.opentelemetry.io/collector/pipeline"
 	"go.uber.org/zap"
 
-	"github.com/open-telemetry/opentelemetry-collector-contrib/connector/routingconnector/internal/common"
 	"github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl"
 	"github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl/contexts/ottldatapoint"
 	"github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl/contexts/ottllog"
@@ -102,7 +101,7 @@ func (r *router[C]) buildParsers(table []RoutingTableItem, settings component.Te
 	var errs error
 	if buildResource {
 		parser, err := ottlresource.NewParser(
-			common.StandardFunctions[ottlresource.TransformContext](),
+			standardFunctions[ottlresource.TransformContext](),
 			settings,
 		)
 		if err == nil {
@@ -113,7 +112,7 @@ func (r *router[C]) buildParsers(table []RoutingTableItem, settings component.Te
 	}
 	if buildSpan {
 		parser, err := ottlspan.NewParser(
-			common.SpanFunctions(),
+			spanFunctions(),
 			settings,
 		)
 		if err == nil {
@@ -124,7 +123,7 @@ func (r *router[C]) buildParsers(table []RoutingTableItem, settings component.Te
 	}
 	if buildMetric {
 		parser, err := ottlmetric.NewParser(
-			common.StandardFunctions[ottlmetric.TransformContext](),
+			standardFunctions[ottlmetric.TransformContext](),
 			settings,
 		)
 		if err == nil {
@@ -135,7 +134,7 @@ func (r *router[C]) buildParsers(table []RoutingTableItem, settings component.Te
 	}
 	if buildDataPoint {
 		parser, err := ottldatapoint.NewParser(
-			common.StandardFunctions[ottldatapoint.TransformContext](),
+			standardFunctions[ottldatapoint.TransformContext](),
 			settings,
 		)
 		if err == nil {
@@ -146,7 +145,7 @@ func (r *router[C]) buildParsers(table []RoutingTableItem, settings component.Te
 	}
 	if buildLog {
 		parser, err := ottllog.NewParser(
-			common.StandardFunctions[ottllog.TransformContext](),
+			standardFunctions[ottllog.TransformContext](),
 			settings,
 		)
 		if err == nil {

connector/routingconnector/traces_test.go

@@ -17,7 +17,6 @@ import (
 	"go.opentelemetry.io/collector/pdata/ptrace"
 	"go.opentelemetry.io/collector/pipeline"
 
-	"github.com/open-telemetry/opentelemetry-collector-contrib/connector/routingconnector/internal/common"
 	"github.com/open-telemetry/opentelemetry-collector-contrib/connector/routingconnector/internal/metadata"
 	"github.com/open-telemetry/opentelemetry-collector-contrib/connector/routingconnector/internal/ptraceutiltest"
 )
@@ -410,9 +409,9 @@ func TestTracesConnectorDetailed(t *testing.T) {
 
 	// IsMap and IsString are just candidate for Standard Converter Function to prevent any unknown regressions for this component
 	isResourceString := `IsString(attributes["resourceName"]) == true`
-	require.Contains(t, common.SpanFunctions(), "IsString")
+	require.Contains(t, spanFunctions(), "IsString")
 	isAttributesMap := `IsMap(attributes) == true`
-	require.Contains(t, common.SpanFunctions(), "IsMap")
+	require.Contains(t, spanFunctions(), "IsMap")
 
 	isSpanE := `name == "spanE"`
 	isSpanF := `name == "spanF"`