Merge branch 'main' into jmeagher-return-json-for-some-traces

Author: MovieStoreGuy

.chloggen/aggregate_labels_empty.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: bug_fix
+
+# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver)
+component: metricstransform
+
+# A brief description of the change.  Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: The previously removed functionality of aggregating against an empty label set is restored.
+
+# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
+issues: [34430]
+
+# (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/codeboten_validate-telemetrygen.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: bug_fix
+
+# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver)
+component: telemetrygen
+
+# A brief description of the change.  Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: ensure validate is called
+
+# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
+issues: [35745]
+
+# (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/main.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. filelogreceiver)
+component: 'mongodbreceiver'
+
+# A brief description of the change.  Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: Add support for MongoDB direct connection
+
+# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
+issues: [35427]
+
+# (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/routing-connector-conditions.yaml

@@ -0,0 +1,28 @@
+# 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. filelogreceiver)
+component: routingconnector
+
+# A brief description of the change.  Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: Allow routing based on OTTL Conditions
+
+# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
+issues: [35731]
+
+# (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: |
+  Each route must contain either a statement or a condition.
+
+# 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: []

cmd/telemetrygen/internal/common/validate.go

@@ -9,15 +9,15 @@ import (
 )
 
 var (
-	errInvalidTraceIDLenght = fmt.Errorf("TraceID must be a 32 character hex string, like: 'ae87dadd90e9935a4bc9660628efd569'")
-	errInvalidSpanIDLenght  = fmt.Errorf("SpanID must be a 16 character hex string, like: '5828fa4960140870'")
+	errInvalidTraceIDLength = fmt.Errorf("TraceID must be a 32 character hex string, like: 'ae87dadd90e9935a4bc9660628efd569'")
+	errInvalidSpanIDLength  = fmt.Errorf("SpanID must be a 16 character hex string, like: '5828fa4960140870'")
 	errInvalidTraceID       = fmt.Errorf("failed to create traceID byte array from the given traceID, make sure the traceID is a hex representation of a [16]byte, like: 'ae87dadd90e9935a4bc9660628efd569'")
 	errInvalidSpanID        = fmt.Errorf("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 {
 	if len(traceID) != 32 {
-		return errInvalidTraceIDLenght
+		return errInvalidTraceIDLength
 	}
 
 	_, err := hex.DecodeString(traceID)
@@ -30,7 +30,7 @@ func ValidateTraceID(traceID string) error {
 
 func ValidateSpanID(spanID string) error {
 	if len(spanID) != 16 {
-		return errInvalidSpanIDLenght
+		return errInvalidSpanIDLength
 	}
 	_, err := hex.DecodeString(spanID)
 	if err != nil {

cmd/telemetrygen/internal/common/validate_test.go

@@ -23,7 +23,7 @@ func TestValidateTraceID(t *testing.T) {
 		{
 			name:     "InvalidLength",
 			traceID:  "invalid-length",
-			expected: errInvalidTraceIDLenght,
+			expected: errInvalidTraceIDLength,
 		},
 		{
 			name:     "InvalidTraceID",
@@ -53,7 +53,7 @@ func TestValidateSpanID(t *testing.T) {
 		{
 			name:     "InvalidLength",
 			spanID:   "invalid-length",
-			expected: errInvalidSpanIDLenght,
+			expected: errInvalidSpanIDLength,
 		},
 		{
 			name:     "InvalidTraceID",

cmd/telemetrygen/internal/logs/config.go

@@ -4,6 +4,8 @@
 package logs
 
 import (
+	"fmt"
+
 	"github.com/spf13/pflag"
 
 	"github.com/open-telemetry/opentelemetry-collector-contrib/cmd/telemetrygen/internal/common"
@@ -36,6 +38,10 @@ func (c *Config) Flags(fs *pflag.FlagSet) {
 
 // Validate validates the test scenario parameters.
 func (c *Config) Validate() error {
+	if c.TotalDuration <= 0 && c.NumLogs <= 0 {
+		return fmt.Errorf("either `logs` or `duration` must be greater than 0")
+	}
+
 	if c.TraceID != "" {
 		if err := common.ValidateTraceID(c.TraceID); err != nil {
 			return err

cmd/telemetrygen/internal/logs/logs.go

@@ -60,7 +60,6 @@ func Start(cfg *Config) error {
 	}
 
 	if err = Run(cfg, expFunc, logger); err != nil {
-		logger.Error("failed to stop the exporter", zap.Error(err))
 		return err
 	}
 
@@ -69,10 +68,12 @@ func Start(cfg *Config) error {
 
 // Run executes the test scenario.
 func Run(c *Config, exp func() (sdklog.Exporter, error), logger *zap.Logger) error {
+	if err := c.Validate(); err != nil {
+		return err
+	}
+
 	if c.TotalDuration > 0 {
 		c.NumLogs = 0
-	} else if c.NumLogs <= 0 {
-		return fmt.Errorf("either `logs` or `duration` must be greater than 0")
 	}
 
 	limit := rate.Limit(c.Rate)

cmd/telemetrygen/internal/logs/worker_test.go

@@ -229,6 +229,58 @@ func TestLogsWithTraceIDAndSpanID(t *testing.T) {
 	}
 }
 
+func TestValidate(t *testing.T) {
+	tests := []struct {
+		name           string
+		cfg            *Config
+		wantErrMessage string
+	}{
+		{
+			name: "No duration or NumLogs",
+			cfg: &Config{
+				Config: common.Config{
+					WorkerCount: 1,
+				},
+				TraceID: "123",
+			},
+			wantErrMessage: "either `logs` or `duration` must be greater than 0",
+		},
+		{
+			name: "TraceID invalid",
+			cfg: &Config{
+				Config: common.Config{
+					WorkerCount: 1,
+				},
+				NumLogs: 5,
+				TraceID: "123",
+			},
+			wantErrMessage: "TraceID must be a 32 character hex string, like: 'ae87dadd90e9935a4bc9660628efd569'",
+		},
+		{
+			name: "SpanID invalid",
+			cfg: &Config{
+				Config: common.Config{
+					WorkerCount: 1,
+				},
+				NumLogs: 5,
+				TraceID: "ae87dadd90e9935a4bc9660628efd569",
+				SpanID:  "123",
+			},
+			wantErrMessage: "SpanID must be a 16 character hex string, like: '5828fa4960140870'",
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			m := &mockExporter{}
+			expFunc := func() (sdklog.Exporter, error) {
+				return m, nil
+			}
+			logger, _ := zap.NewDevelopment()
+			require.EqualError(t, Run(tt.cfg, expFunc, logger), tt.wantErrMessage)
+		})
+	}
+}
+
 func configWithNoAttributes(qty int, body string) *Config {
 	return &Config{
 		Body:    body,

cmd/telemetrygen/internal/metrics/config.go

@@ -4,6 +4,8 @@
 package metrics
 
 import (
+	"fmt"
+
 	"github.com/spf13/pflag"
 
 	"github.com/open-telemetry/opentelemetry-collector-contrib/cmd/telemetrygen/internal/common"
@@ -39,6 +41,10 @@ func (c *Config) Flags(fs *pflag.FlagSet) {
 
 // Validate validates the test scenario parameters.
 func (c *Config) Validate() error {
+	if c.TotalDuration <= 0 && c.NumMetrics <= 0 {
+		return fmt.Errorf("either `metrics` or `duration` must be greater than 0")
+	}
+
 	if c.TraceID != "" {
 		if err := common.ValidateTraceID(c.TraceID); err != nil {
 			return err