Merge branch 'main' into main

Author: sv-splunk

.chloggen/add-profile-value-type-paths.yaml

@@ -0,0 +1,27 @@
+# Use this changelog template to create an entry for release notes.
+
+# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
+change_type: enhancement
+
+# The name of the component, or a single word describing the area of concern, (e.g. receiver/filelog)
+component: pkg/ottl
+
+# A brief description of the change.  Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: Add `unit` and `type` subpaths for `profile.sample_type` and `profile.period_type`.
+
+# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
+issues: [43723]
+
+# (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:
+
+# If your change doesn't affect end users or the exported elements of any package,
+# you should instead start your pull request title with [chore] or use the "Skip Changelog" label.
+# 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: []

.chloggen/trim-suffix-prefix.yaml

@@ -0,0 +1,27 @@
+# Use this changelog template to create an entry for release notes.
+
+# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
+change_type: enhancement
+
+# The name of the component, or a single word describing the area of concern, (e.g. receiver/filelog)
+component: pkg/ottl
+
+# A brief description of the change.  Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: Add TrimPrefix and TrimSuffix to OTTL
+
+# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
+issues: [43883]
+
+# (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: This is a much optimal way to remove prefix/suffix compare with `replace_pattern(name, "^prefixed", "")`
+
+# If your change doesn't affect end users or the exported elements of any package,
+# you should instead start your pull request title with [chore] or use the "Skip Changelog" label.
+# 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: [user]

cmd/telemetrygen/internal/common/validate.go renamed to cmd/telemetrygen/internal/validate/validate.go

@@ -1,7 +1,7 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
-package common
+package validate
 
 import (
 	"encoding/hex"
@@ -15,7 +15,7 @@ var (
 	errInvalidSpanID        = errors.New("failed to create SpanID byte array from the given SpanID, make sure the SpanID is a hex representation of a [8]byte, like: '5828fa4960140870'")
 )
 
-func ValidateTraceID(traceID string) error {
+func TraceID(traceID string) error {
 	if len(traceID) != 32 {
 		return errInvalidTraceIDLength
 	}
@@ -28,7 +28,7 @@ func ValidateTraceID(traceID string) error {
 	return nil
 }
 
-func ValidateSpanID(spanID string) error {
+func SpanID(spanID string) error {
 	if len(spanID) != 16 {
 		return errInvalidSpanIDLength
 	}

cmd/telemetrygen/internal/common/validate_test.go renamed to cmd/telemetrygen/internal/validate/validate_test.go

@@ -1,7 +1,7 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
-package common
+package validate
 
 import (
 	"testing"
@@ -33,7 +33,7 @@ func TestValidateTraceID(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			err := ValidateTraceID(tt.traceID)
+			err := TraceID(tt.traceID)
 			assert.ErrorIs(t, err, tt.expected)
 		})
 	}
@@ -63,7 +63,7 @@ func TestValidateSpanID(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			err := ValidateSpanID(tt.spanID)
+			err := SpanID(tt.spanID)
 			assert.ErrorIs(t, err, tt.expected)
 		})
 	}

cmd/telemetrygen/pkg/logs/config.go

@@ -10,6 +10,7 @@ import (
 	"github.com/spf13/pflag"
 
 	"github.com/open-telemetry/opentelemetry-collector-contrib/cmd/telemetrygen/internal/common"
+	"github.com/open-telemetry/opentelemetry-collector-contrib/cmd/telemetrygen/internal/validate"
 	types "github.com/open-telemetry/opentelemetry-collector-contrib/cmd/telemetrygen/pkg"
 )
 
@@ -70,13 +71,13 @@ func (c *Config) Validate() error {
 	}
 
 	if c.TraceID != "" {
-		if err := common.ValidateTraceID(c.TraceID); err != nil {
+		if err := validate.TraceID(c.TraceID); err != nil {
 			return err
 		}
 	}
 
 	if c.SpanID != "" {
-		if err := common.ValidateSpanID(c.SpanID); err != nil {
+		if err := validate.SpanID(c.SpanID); err != nil {
 			return err
 		}
 	}

cmd/telemetrygen/pkg/metrics/config.go

@@ -12,6 +12,7 @@ import (
 	"go.opentelemetry.io/otel/sdk/metric/metricdata"
 
 	"github.com/open-telemetry/opentelemetry-collector-contrib/cmd/telemetrygen/internal/common"
+	"github.com/open-telemetry/opentelemetry-collector-contrib/cmd/telemetrygen/internal/validate"
 	types "github.com/open-telemetry/opentelemetry-collector-contrib/cmd/telemetrygen/pkg"
 )
 
@@ -86,13 +87,13 @@ func (c *Config) Validate() error {
 	}
 
 	if c.TraceID != "" {
-		if err := common.ValidateTraceID(c.TraceID); err != nil {
+		if err := validate.TraceID(c.TraceID); err != nil {
 			return err
 		}
 	}
 
 	if c.SpanID != "" {
-		if err := common.ValidateSpanID(c.SpanID); err != nil {
+		if err := validate.SpanID(c.SpanID); err != nil {
 			return err
 		}
 	}

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"`