Merge branch 'main' into kubeletstats_featuregate_metrics

Author: ChrsMark

.chloggen/container_parser_featuregate_beta.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: 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 beta
+
+# 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: |
+  - Disable the `filelog.container.removeOriginalTimeField` feature gate to get the old behavior.
+
+# 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/exporterhelper-rename-config.yaml

@@ -0,0 +1,35 @@
+# 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: all
+
+# A brief description of the change.  Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: TimeoutSettings/QueueSettings fields in various Config structs are no longer embedded
+
+# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
+issues: [35158]
+
+# (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: |
+  Structs in which .TimeoutSettings is no longer embedded:
+  * carbonexporter.Config
+  * googlecloudpubsubreceiver.Config
+  Structs in which .TimeoutSettings and .QueueSettings are no longer embedded:
+  * alertmanagerexporter.Config
+  * googlecloudexporter.Config
+  * googlemanagedprometheusexporter.Config
+  * otelarrowexporter.Config
+
+# 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: [api]

.chloggen/msg_fix-token-removal.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: signalfxexporter
+
+# A brief description of the change.  Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: Ensure token is not sent through for event data
+
+# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
+issues: [35154]
+
+# (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]

.golangci.yml

@@ -137,9 +137,7 @@ linters-settings:
       - float-compare
       - formatter
       - go-require
-      - negative-positive
       - require-error
-      - suite-dont-use-pkg
       - suite-subtest-run
       - useless-assert
     enable-all: true

Makefile.Common

@@ -77,7 +77,7 @@ GOTESTSUM           := $(TOOLS_BIN_DIR)/gotestsum
 TESTIFYLINT         := $(TOOLS_BIN_DIR)/testifylint
 
 GOTESTSUM_OPT?= --rerun-fails=1
-TESTIFYLINT_OPT?= --enable-all --disable=float-compare,formatter,go-require,negative-positive,require-error,suite-dont-use-pkg,suite-subtest-run,useless-assert
+TESTIFYLINT_OPT?= --enable-all --disable=float-compare,formatter,go-require,require-error,suite-subtest-run,useless-assert
 
 # BUILD_TYPE should be one of (dev, release).
 BUILD_TYPE?=release

cmd/githubgen/go.mod

@@ -4,8 +4,8 @@ go 1.22.0
 
 require (
 	github.com/google/go-github/v64 v64.0.0
-	go.opentelemetry.io/collector/confmap v1.15.0
-	go.opentelemetry.io/collector/confmap/provider/fileprovider v1.15.0
+	go.opentelemetry.io/collector/confmap v1.15.1-0.20240911162712-6c2697c4453c
+	go.opentelemetry.io/collector/confmap/provider/fileprovider v1.15.1-0.20240911162712-6c2697c4453c
 	gopkg.in/yaml.v3 v3.0.1
 )
 

cmd/githubgen/go.sum

@@ -12,9 +12,9 @@ require (
 	github.com/knadh/koanf/v2 v2.1.1
 	github.com/open-telemetry/opamp-go v0.15.0
 	github.com/stretchr/testify v1.9.0
-	go.opentelemetry.io/collector/config/configopaque v1.15.0
-	go.opentelemetry.io/collector/config/configtls v1.15.0
-	go.opentelemetry.io/collector/semconv v0.109.0
+	go.opentelemetry.io/collector/config/configopaque v1.15.1-0.20240911162712-6c2697c4453c
+	go.opentelemetry.io/collector/config/configtls v1.15.1-0.20240911162712-6c2697c4453c
+	go.opentelemetry.io/collector/semconv v0.109.1-0.20240911162712-6c2697c4453c
 	go.uber.org/goleak v1.3.0
 	go.uber.org/zap v1.27.0
 	golang.org/x/sys v0.25.0

cmd/opampsupervisor/go.mod

@@ -14,7 +14,7 @@ dist:
   otelcol_version: 0.109.0
 
 extensions:
-  - gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.109.0
+  - gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.109.1-0.20240911162712-6c2697c4453c
   - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/ackextension v0.109.0
   - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/asapauthextension v0.109.0
   - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/awsproxy v0.109.0
@@ -50,10 +50,10 @@ extensions:
   - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/encoding/zipkinencodingextension v0.109.0
 
 exporters:
-  - gomod: go.opentelemetry.io/collector/exporter/debugexporter v0.109.0
-  - gomod: go.opentelemetry.io/collector/exporter/nopexporter v0.109.0
-  - gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.109.0
-  - gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.109.0
+  - gomod: go.opentelemetry.io/collector/exporter/debugexporter v0.109.1-0.20240911162712-6c2697c4453c
+  - gomod: go.opentelemetry.io/collector/exporter/nopexporter v0.109.1-0.20240911162712-6c2697c4453c
+  - gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.109.1-0.20240911162712-6c2697c4453c
+  - gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.109.1-0.20240911162712-6c2697c4453c
   - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/alertmanagerexporter v0.109.0
   - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/alibabacloudlogserviceexporter v0.109.0
   - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awscloudwatchlogsexporter v0.109.0
@@ -100,8 +100,8 @@ exporters:
   - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/zipkinexporter v0.109.0
 
 processors:
-  - gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.109.0
-  - gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.109.0
+  - gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.109.1-0.20240911162712-6c2697c4453c
+  - gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.109.1-0.20240911162712-6c2697c4453c
   - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor v0.109.0
   - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/cumulativetodeltaprocessor v0.109.0
   - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/deltatocumulativeprocessor v0.109.0
@@ -127,8 +127,8 @@ processors:
   - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/remotetapprocessor v0.109.0
 
 receivers:
-  - gomod: go.opentelemetry.io/collector/receiver/nopreceiver v0.109.0
-  - gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.109.0
+  - gomod: go.opentelemetry.io/collector/receiver/nopreceiver v0.109.1-0.20240911162712-6c2697c4453c
+  - gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.109.1-0.20240911162712-6c2697c4453c
   - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/activedirectorydsreceiver v0.109.0
   - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/aerospikereceiver v0.109.0
   - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/apachereceiver v0.109.0
@@ -220,7 +220,7 @@ receivers:
   - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zookeeperreceiver v0.109.0
 
 connectors:
-  - gomod: go.opentelemetry.io/collector/connector/forwardconnector v0.109.0
+  - gomod: go.opentelemetry.io/collector/connector/forwardconnector v0.109.1-0.20240911162712-6c2697c4453c
   - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/countconnector v0.109.0
   - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/datadogconnector v0.109.0
   - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/exceptionsconnector v0.109.0
@@ -233,11 +233,11 @@ connectors:
   - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/spanmetricsconnector v0.109.0
 
 providers:
-  - gomod: go.opentelemetry.io/collector/confmap/provider/envprovider v1.15.0
-  - gomod: go.opentelemetry.io/collector/confmap/provider/fileprovider v1.15.0
-  - gomod: go.opentelemetry.io/collector/confmap/provider/httpprovider v0.109.0
-  - gomod: go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.109.0
-  - gomod: go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.109.0
+  - gomod: go.opentelemetry.io/collector/confmap/provider/envprovider v1.15.1-0.20240911162712-6c2697c4453c
+  - gomod: go.opentelemetry.io/collector/confmap/provider/fileprovider v1.15.1-0.20240911162712-6c2697c4453c
+  - gomod: go.opentelemetry.io/collector/confmap/provider/httpprovider v0.109.1-0.20240911162712-6c2697c4453c
+  - gomod: go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.109.1-0.20240911162712-6c2697c4453c
+  - gomod: go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.109.1-0.20240911162712-6c2697c4453c
   - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/confmap/provider/s3provider v0.109.0
   - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/confmap/provider/secretsmanagerprovider v0.109.0