Merge branch 'main' into singleton-flags-and-attributes

Author: djaglowski

.chloggen/add-eventname-debug-exporter.yaml

@@ -0,0 +1,25 @@
+# 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. otlpreceiver)
+component: debugexporter
+
+# A brief description of the change.  Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: "Add EventName to debug exporter for Logs. EventName was added as top-level field in the LogRecord from 1.5.0 of proto definition."
+
+# One or more tracking issues or pull requests related to the change
+issues: [11966]
+
+# (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:
+
+# 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/change-persistent-queue.yaml

@@ -0,0 +1,25 @@
+# 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. otlpreceiver)
+component: exporterhelper
+
+# A brief description of the change.  Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: Change persistent queue to not use sized channel, improve memory usage and simplify sized_channel.
+
+# One or more tracking issues or pull requests related to the change
+issues: [12060]
+
+# (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:
+
+# 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/mx-psi_default-provider.yaml

@@ -0,0 +1,25 @@
+# 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. otlpreceiver)
+component: otelcoltest
+
+# A brief description of the change.  Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: Set `DefaultScheme` to `env` in the test `ConfigProvider` to replicate the default provider used by the Collector.
+
+# One or more tracking issues or pull requests related to the change
+issues: [12066]
+
+# (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:
+
+# 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/remove-receiver-scraperhelper.yaml

@@ -0,0 +1,25 @@
+# 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. otlpreceiver)
+component: receiver/scraperhelper
+
+# A brief description of the change.  Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: Removing the deprecated receiver/scraperhelper package
+
+# One or more tracking issues or pull requests related to the change
+issues: [12054]
+
+# (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:
+
+# 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/rm-dep-mdatagen.yaml

@@ -0,0 +1,25 @@
+# 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. otlpreceiver)
+component: mdatagen
+
+# A brief description of the change.  Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: Remove deprecated generated_component_telemetry_test file from being generated and delete it.
+
+# One or more tracking issues or pull requests related to the change
+issues: [12068]
+
+# (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:
+
+# 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]

.golangci.yml

@@ -115,6 +115,9 @@ linters-settings:
       - name: context-keys-type
       # Importing with `.` makes the programs much harder to understand
       - name: dot-imports
+      - name: early-return
+        arguments:
+          - "preserveScope"
       # Empty blocks make code less readable and could be a symptom of a bug or unfinished refactoring.
       - name: empty-block
       # for better readability, variables of type `error` must be named with the prefix `err`.
@@ -137,6 +140,8 @@ linters-settings:
       - name: redefines-builtin-id
       # redundant else-blocks that can be eliminated from the code.
       - name: superfluous-else
+        arguments:
+          - "preserveScope"
       # prevent confusing name for variables when using `time` package
       - name: time-naming
       # warns when an exported function or method returns a value of an un-exported type.

cmd/builder/internal/builder/main_test.go

@@ -101,8 +101,6 @@ var replaceModules = []string{
 	"/receiver/otlpreceiver",
 	"/receiver/receivertest",
 	"/receiver/xreceiver",
-	"/scraper/scraperhelper",
-	"/scraper",
 	"/semconv",
 	"/service",
 }

cmd/mdatagen/go.mod

@@ -114,7 +114,3 @@ replace go.opentelemetry.io/collector/component/componentstatus => ../../compone
 replace go.opentelemetry.io/collector/processor => ../../processor
 
 replace go.opentelemetry.io/collector/consumer/consumererror => ../../consumer/consumererror
-
-replace go.opentelemetry.io/collector/scraper => ../../scraper
-
-replace go.opentelemetry.io/collector/scraper/scraperhelper => ../../scraper/scraperhelper

cmd/mdatagen/internal/command.go

@@ -8,6 +8,7 @@ import (
 	"errors"
 	"fmt"
 	"go/format"
+	"io/fs"
 	"os"
 	"path/filepath"
 	"regexp"
@@ -109,13 +110,14 @@ func run(ymlPath string) error {
 		}
 	}
 
-	toGenerate := map[string]string{}
+	// TODO: Remove this after version v0.122.0 when all the deprecated code should be deleted.
+	//  https://github.com/open-telemetry/opentelemetry-collector/issues/12067
+	if err = os.Remove(filepath.Join(ymlDir, "generated_component_telemetry_test.go")); err != nil && !errors.Is(err, fs.ErrNotExist) {
+		return fmt.Errorf("unable to remove generated file \"generated_component_telemetry_test.go\": %w", err)
+	}
 
+	toGenerate := map[string]string{}
 	if len(md.Telemetry.Metrics) != 0 { // if there are telemetry metrics, generate telemetry specific files
-		if err = generateFile(filepath.Join(tmplDir, "component_telemetry_test.go.tmpl"),
-			filepath.Join(ymlDir, "generated_component_telemetry_test.go"), md, packageName); err != nil {
-			return err
-		}
 		toGenerate[filepath.Join(tmplDir, "telemetry.go.tmpl")] = filepath.Join(codeDir, "generated_telemetry.go")
 		toGenerate[filepath.Join(tmplDir, "telemetry_test.go.tmpl")] = filepath.Join(codeDir, "generated_telemetry_test.go")
 		toGenerate[filepath.Join(tmplDir, "telemetrytest.go.tmpl")] = filepath.Join(testDir, "generated_telemetrytest.go")
@@ -405,7 +407,7 @@ func inlineReplace(tmplFile string, outputFile string, md Metadata, start string
 }
 
 func generateFile(tmplFile string, outputFile string, md Metadata, goPackage string) error {
-	if err := os.Remove(outputFile); err != nil && !errors.Is(err, os.ErrNotExist) {
+	if err := os.Remove(outputFile); err != nil && !errors.Is(err, fs.ErrNotExist) {
 		return fmt.Errorf("unable to remove generated file %q: %w", outputFile, err)
 	}
 

cmd/mdatagen/internal/embedded_templates_test.go

@@ -21,23 +21,22 @@ func TestEnsureTemplatesLoaded(t *testing.T) {
 
 	var (
 		templateFiles = map[string]struct{}{
-			path.Join(rootDir, "component_test.go.tmpl"):           {},
-			path.Join(rootDir, "component_telemetry_test.go.tmpl"): {},
-			path.Join(rootDir, "documentation.md.tmpl"):            {},
-			path.Join(rootDir, "metrics.go.tmpl"):                  {},
-			path.Join(rootDir, "metrics_test.go.tmpl"):             {},
-			path.Join(rootDir, "resource.go.tmpl"):                 {},
-			path.Join(rootDir, "resource_test.go.tmpl"):            {},
-			path.Join(rootDir, "config.go.tmpl"):                   {},
-			path.Join(rootDir, "config_test.go.tmpl"):              {},
-			path.Join(rootDir, "package_test.go.tmpl"):             {},
-			path.Join(rootDir, "readme.md.tmpl"):                   {},
-			path.Join(rootDir, "status.go.tmpl"):                   {},
-			path.Join(rootDir, "telemetry.go.tmpl"):                {},
-			path.Join(rootDir, "telemetry_test.go.tmpl"):           {},
-			path.Join(rootDir, "testdata", "config.yaml.tmpl"):     {},
-			path.Join(rootDir, "telemetrytest.go.tmpl"):            {},
-			path.Join(rootDir, "telemetrytest_test.go.tmpl"):       {},
+			path.Join(rootDir, "component_test.go.tmpl"):       {},
+			path.Join(rootDir, "documentation.md.tmpl"):        {},
+			path.Join(rootDir, "metrics.go.tmpl"):              {},
+			path.Join(rootDir, "metrics_test.go.tmpl"):         {},
+			path.Join(rootDir, "resource.go.tmpl"):             {},
+			path.Join(rootDir, "resource_test.go.tmpl"):        {},
+			path.Join(rootDir, "config.go.tmpl"):               {},
+			path.Join(rootDir, "config_test.go.tmpl"):          {},
+			path.Join(rootDir, "package_test.go.tmpl"):         {},
+			path.Join(rootDir, "readme.md.tmpl"):               {},
+			path.Join(rootDir, "status.go.tmpl"):               {},
+			path.Join(rootDir, "telemetry.go.tmpl"):            {},
+			path.Join(rootDir, "telemetry_test.go.tmpl"):       {},
+			path.Join(rootDir, "testdata", "config.yaml.tmpl"): {},
+			path.Join(rootDir, "telemetrytest.go.tmpl"):        {},
+			path.Join(rootDir, "telemetrytest_test.go.tmpl"):   {},
 		}
 		count = 0
 	)