Merge branch 'main' into tsp-late-span-age

Author: jpkrohling

.chloggen/eks_cloud_account_id.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: resourcedetectionprocessor
+
+# A brief description of the change.  Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: This enhancement detects AWS EKS cloud account ID
+
+# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
+issues: [37179]
+
+# (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: [user]

.chloggen/fg_filelog_stable.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: breaking
+
+# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver)
+component: pkg/stanza
+
+# A brief description of the change.  Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: Move `filelog.container.removeOriginalTimeField` feature gate to stable
+
+# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
+issues: [33389]
+
+# (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: [user]

exporter/datasetexporter/config_test.go

@@ -9,9 +9,7 @@ import (
 	"time"
 
 	"github.com/stretchr/testify/assert"
-	"go.opentelemetry.io/collector/config/configretry"
 	"go.opentelemetry.io/collector/confmap"
-	"go.opentelemetry.io/collector/exporter/exporterhelper"
 )
 
 func TestConfigUnmarshalUnknownAttributes(t *testing.T) {
@@ -102,49 +100,6 @@ func TestConfigValidate(t *testing.T) {
 	}
 }
 
-func TestConfigString(t *testing.T) {
-	config := Config{
-		DatasetURL: "https://example.com",
-		APIKey:     "secret",
-		Debug:      true,
-		BufferSettings: BufferSettings{
-			MaxLifetime:    123,
-			PurgeOlderThan: 567,
-			GroupBy:        []string{"field1", "field2"},
-		},
-		TracesSettings: TracesSettings{
-			exportSettings: exportSettings{
-				ExportSeparator:            "TTT",
-				ExportDistinguishingSuffix: "UUU",
-			},
-		},
-		LogsSettings: LogsSettings{
-			ExportResourceInfo:             true,
-			ExportResourcePrefix:           "AAA",
-			ExportScopeInfo:                true,
-			ExportScopePrefix:              "BBB",
-			DecomposeComplexMessageField:   true,
-			DecomposedComplexMessagePrefix: "EEE",
-			exportSettings: exportSettings{
-				ExportSeparator:            "CCC",
-				ExportDistinguishingSuffix: "DDD",
-			},
-		},
-		ServerHostSettings: ServerHostSettings{
-			ServerHost:  "foo-bar",
-			UseHostName: false,
-		},
-		BackOffConfig:   configretry.NewDefaultBackOffConfig(),
-		QueueSettings:   exporterhelper.NewDefaultQueueConfig(),
-		TimeoutSettings: exporterhelper.NewDefaultTimeoutConfig(),
-	}
-
-	assert.Equal(t,
-		"DatasetURL: https://example.com; APIKey: [REDACTED] (6); Debug: true; BufferSettings: {MaxLifetime:123ns PurgeOlderThan:567ns GroupBy:[field1 field2] RetryInitialInterval:0s RetryMaxInterval:0s RetryMaxElapsedTime:0s RetryShutdownTimeout:0s MaxParallelOutgoing:0}; LogsSettings: {ExportResourceInfo:true ExportResourcePrefix:AAA ExportScopeInfo:true ExportScopePrefix:BBB DecomposeComplexMessageField:true DecomposedComplexMessagePrefix:EEE exportSettings:{ExportSeparator:CCC ExportDistinguishingSuffix:DDD}}; TracesSettings: {exportSettings:{ExportSeparator:TTT ExportDistinguishingSuffix:UUU}}; ServerHostSettings: {UseHostName:false ServerHost:foo-bar}; BackOffConfig: {Enabled:true InitialInterval:5s RandomizationFactor:0.5 Multiplier:1.5 MaxInterval:30s MaxElapsedTime:5m0s}; QueueSettings: {Enabled:true NumConsumers:10 QueueSize:1000 StorageID:<nil>}; TimeoutSettings: {Timeout:5s}",
-		config.String(),
-	)
-}
-
 func TestConfigUseProvidedExportResourceInfoValue(t *testing.T) {
 	f := NewFactory()
 	config := f.CreateDefaultConfig().(*Config)

exporter/tencentcloudlogserviceexporter/go.mod

@@ -6,7 +6,7 @@ require (
 	github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.117.0
 	github.com/pierrec/lz4 v2.6.1+incompatible
 	github.com/stretchr/testify v1.10.0
-	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1081
+	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1082
 	go.opentelemetry.io/collector/component v0.117.1-0.20250114172347-71aae791d7f8
 	go.opentelemetry.io/collector/component/componenttest v0.117.1-0.20250114172347-71aae791d7f8
 	go.opentelemetry.io/collector/config/configopaque v1.23.1-0.20250114172347-71aae791d7f8

exporter/tencentcloudlogserviceexporter/go.sum

@@ -3,7 +3,7 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/extension/encod
 go 1.22.0
 
 require (
-	github.com/linkedin/goavro/v2 v2.13.0
+	github.com/linkedin/goavro/v2 v2.13.1
 	github.com/open-telemetry/opentelemetry-collector-contrib/extension/encoding v0.117.0
 	github.com/stretchr/testify v1.10.0
 	go.opentelemetry.io/collector/component v0.117.1-0.20250114172347-71aae791d7f8

extension/encoding/avrologencodingextension/go.mod

@@ -320,10 +320,3 @@ receivers:
 </td>
 </tr>
 </table>
-
-### Removing original time field
-
-In order to remove the original time field from the log records users can enable the
-`filelog.container.removeOriginalTimeField` feature gate.
-The feature gate `filelog.container.removeOriginalTimeField` will be deprecated and eventually removed
-in the future, following the [feature lifecycle](https://github.com/open-telemetry/opentelemetry-collector/tree/main/featuregate#feature-lifecycle).

extension/encoding/avrologencodingextension/go.sum

@@ -9,7 +9,6 @@ import (
 
 	"go.opentelemetry.io/collector/component"
 	"go.opentelemetry.io/collector/featuregate"
-	"go.uber.org/zap"
 
 	"github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/entry"
 	"github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/errors"
@@ -25,11 +24,13 @@ const (
 	removeOriginalTimeFieldFeatureFlag = "filelog.container.removeOriginalTimeField"
 )
 
-var removeOriginalTimeField = featuregate.GlobalRegistry().MustRegister(
+var _ = featuregate.GlobalRegistry().MustRegister(
 	removeOriginalTimeFieldFeatureFlag,
-	featuregate.StageBeta,
+	featuregate.StageStable,
 	featuregate.WithRegisterDescription("When enabled, deletes the original `time` field from the Log Attributes. Time is parsed to Timestamp field, which should be used instead."),
 	featuregate.WithRegisterReferenceURL("https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/33389"),
+	featuregate.WithRegisterFromVersion("v0.105.0"),
+	featuregate.WithRegisterToVersion("v0.118.0"),
 )
 
 func init() {
@@ -79,14 +80,6 @@ func (c Config) Build(set component.TelemetrySettings) (operator.Operator, error
 		}
 	}
 
-	if !removeOriginalTimeField.IsEnabled() {
-		// https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/33389
-		set.Logger.Info("`time` log record attribute will be removed in a future release. Switch now using the feature gate.",
-			zap.String("attribute", "time"),
-			zap.String("feature gate", removeOriginalTimeFieldFeatureFlag),
-		)
-	}
-
 	wg := sync.WaitGroup{}
 
 	p := &Parser{

pkg/stanza/docs/operators/container.md

@@ -343,9 +343,7 @@ func parseTime(e *entry.Entry, layout string) error {
 	// timeutils.ParseGotime calls timeutils.SetTimestampYear before returning the timeValue
 	e.Timestamp = timeValue
 
-	if removeOriginalTimeField.IsEnabled() {
-		e.Delete(entry.NewAttributeField(parseFrom))
-	}
+	e.Delete(entry.NewAttributeField(parseFrom))
 
 	return nil
 }