merge in upstream/main

open-telemetry · Sep 25, 2024 · f6ea698 · f6ea698
2 parents 420f347 + 0ed97aa
commit f6ea698
Show file tree

Hide file tree

Showing 100 changed files with 393 additions and 374 deletions.
diff --git a/.chloggen/exporterhelper-remove-deprecated.yaml b/.chloggen/exporterhelper-remove-deprecated.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: exporterhelper
+
+# A brief description of the change.  Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: Removed deprecated `QueueTimeout`/`TimeoutSettings` aliases in favor of `QueueConfig`/`TimeoutConfig`.
+
+# One or more tracking issues or pull requests related to the change
+issues: [11264, 6767]
+
+# (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: "`NewDefaultQueueSettings` and `NewDefaultTimeoutSettings` have been similarly renamed."
+
+# 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]
diff --git a/.chloggen/jackgopack4-re-add-ocb-version-number.yaml b/.chloggen/jackgopack4-re-add-ocb-version-number.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: cmd/builder
+
+# A brief description of the change.  Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: re-adds function to properly set and view version number of OpenTelemetry Collector Builder (ocb) binaries
+
+# One or more tracking issues or pull requests related to the change
+issues: [11208]
+
+# (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: []
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -30,12 +30,12 @@ jobs:
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@8214744c546c1e5c8f03dde8fab3a7353211988d # v3.26.7
+        uses: github/codeql-action/init@461ef6c76dfe95d5c364de2f431ddbd31a417628 # v3.26.9
         with:
           languages: go
 
       - name: Autobuild
-        uses: github/codeql-action/autobuild@8214744c546c1e5c8f03dde8fab3a7353211988d # v3.26.7
+        uses: github/codeql-action/autobuild@461ef6c76dfe95d5c364de2f431ddbd31a417628 # v3.26.9
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@8214744c546c1e5c8f03dde8fab3a7353211988d # v3.26.7
+        uses: github/codeql-action/analyze@461ef6c76dfe95d5c364de2f431ddbd31a417628 # v3.26.9
diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
@@ -64,6 +64,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@8214744c546c1e5c8f03dde8fab3a7353211988d # v3.26.7
+        uses: github/codeql-action/upload-sarif@461ef6c76dfe95d5c364de2f431ddbd31a417628 # v3.26.9
         with:
           sarif_file: results.sarif
diff --git a/Makefile b/Makefile
@@ -262,6 +262,7 @@ check-contrib:
 	@$(MAKE) -C $(CONTRIB_PATH) for-all CMD="$(GOCMD) mod edit \
 		-replace go.opentelemetry.io/collector=$(CURDIR) \
 		-replace go.opentelemetry.io/collector/client=$(CURDIR)/client \
+		-replace go.opentelemetry.io/collector/cmd/mdatagen=$(CURDIR)/cmd/mdatagen \
 		-replace go.opentelemetry.io/collector/component=$(CURDIR)/component  \
 		-replace go.opentelemetry.io/collector/component/componentprofiles=$(CURDIR)/component/componentprofiles  \
 		-replace go.opentelemetry.io/collector/component/componentstatus=$(CURDIR)/component/componentstatus  \
@@ -333,6 +334,7 @@ restore-contrib:
 	@$(MAKE) -C $(CONTRIB_PATH) for-all CMD="$(GOCMD) mod edit \
 		-dropreplace go.opentelemetry.io/collector \
 		-dropreplace go.opentelemetry.io/collector/client \
+		-dropreplace go.opentelemetry.io/collector/cmd/mdatagen \
 		-dropreplace go.opentelemetry.io/collector/component \
 		-dropreplace go.opentelemetry.io/collector/component/componentprofiles \
 		-dropreplace go.opentelemetry.io/collector/component/componentstatus \

diff --git a/client/go.mod b/client/go.mod
@@ -18,11 +18,11 @@ require (
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
-	golang.org/x/net v0.26.0 // indirect
-	golang.org/x/sys v0.21.0 // indirect
-	golang.org/x/text v0.16.0 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20240604185151-ef581f913117 // indirect
-	google.golang.org/grpc v1.66.2 // indirect
+	golang.org/x/net v0.28.0 // indirect
+	golang.org/x/sys v0.24.0 // indirect
+	golang.org/x/text v0.17.0 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20240814211410-ddb44dafa142 // indirect
+	google.golang.org/grpc v1.67.0 // indirect
 	google.golang.org/protobuf v1.34.2 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )

diff --git a/client/go.sum b/client/go.sum
diff --git a/cmd/builder/README.md b/cmd/builder/README.md
@@ -59,19 +59,19 @@ $ /tmp/dist/otelcol-custom --config=/tmp/otelcol.yaml
 
 There are two supported ways to install the builder: via the official releases (recommended) and through `go install`.
 
-### Official releases 
+### Official releases
 
-This is the recommended installation method. Download the binary for your respective platform under the ["Releases"](https://github.com/open-telemetry/opentelemetry-collector/releases?q=builder) page.
+This is the recommended installation method. Download the binary for your respective platform from the ["Releases"](https://github.com/open-telemetry/opentelemetry-collector-releases/releases?q=cmd/builder) page.
 
 ### `go install`
 
 You need to have a `go` compiler in your PATH. Run the following command to install the latest version:
 
-```
+```console
 go install go.opentelemetry.io/collector/cmd/builder@latest
 ```
 
-If installing through this method the binary will be called `builder`. Binaries installed through this method [will incorrectly show `dev` as their version](https://github.com/open-telemetry/opentelemetry-collector/issues/8691).
+If installing through this method the binary will be called `builder`.
 
 ## Running
 
@@ -80,7 +80,7 @@ You will need to specify at least one module (extension, exporter, receiver, pro
 To build a default collector configuration, you can use [this](../otelcorecol/builder-config.yaml) build configuration.
 
 ```console
-$ ocb --config=builder-config.yaml
+ocb --config=builder-config.yaml
 ```
 
 Use `ocb --help` to learn about which flags are available.
@@ -90,18 +90,20 @@ Use `ocb --help` to learn about which flags are available.
 To keep the debug symbols in the resulting OpenTelemetry Collector binary, set the configuration property `debug_compilation` to true.
 
 Then install `go-delve` and run OpenTelemetry Collector with `dlv` command as the following example:
+
 ```bash
 # go install github.com/go-delve/delve/cmd/dlv@latest
 # ~/go/bin/dlv --listen=:2345 --headless=true --api-version=2 --accept-multiclient --log exec .otel-collector-binary -- --config otel-collector-config.yaml
 ```
+
 Finally, load the OpenTelemetry Collector as a project in the IDE, configure debug for Go
 
 ## Configuration
 
 The configuration file is composed of two main parts: `dist` and module types. All `dist` options can be specified via command line flags:
 
 ```console
-$ ocb --config=config.yaml --name="my-otelcol"
+ocb --config=config.yaml --name="my-otelcol"
 ```
 
 The module types are specified at the top-level, and might be: `extensions`, `exporters`, `receivers` and `processors`. They all accept a list of components, and each component is required to have at least the `gomod` entry. When not specified, the `import` value is inferred from the `gomod`. When not specified, the `name` is inferred from the `import`.
@@ -157,29 +159,32 @@ For instance, a code generation step could execute
 ```console
 ocb --skip-compilation --config=config.yaml
 ```
+
 then commit the code in a git repo. A CI can sync the code and execute
+
 ```console
 ocb --skip-generate --skip-get-modules --config=config.yaml
 ```
+
 to only execute the compilation step.
 
 ### Strict versioning checks
 
 The builder checks the relevant `go.mod`
-file for the following things after `go get`ing all components and calling 
+file for the following things after `go get`ing all components and calling
 `go mod tidy`:
 
-1. The `dist::otelcol_version` field in the build configuration must have 
-   matching major and minor versions as the core library version calculated by 
-   the Go toolchain, considering all components.  A mismatch could happen, for 
-   example, when the builder or one of the components depends on a newer release 
+1. The `dist::otelcol_version` field in the build configuration must have
+   matching major and minor versions as the core library version calculated by
+   the Go toolchain, considering all components.  A mismatch could happen, for
+   example, when the builder or one of the components depends on a newer release
    of the core collector library.
-2. For each component in the build configuration, the major and minor versions 
+2. For each component in the build configuration, the major and minor versions
    included in the `gomod` module specifier must match the one calculated by
    the Go toolchain, considering all components.  A mismatch could
    happen, for example, when the enclosing Go module uses a newer
    release of the core collector library.
-   
-The `--skip-strict-versioning` flag disables these versioning checks. 
-This flag is available temporarily and 
+
+The `--skip-strict-versioning` flag disables these versioning checks.
+This flag is available temporarily and
 **will be removed in a future minor version**.
diff --git a/cmd/builder/internal/version.go b/cmd/builder/internal/version.go
@@ -16,8 +16,10 @@ var (
 
 func init() {
 	// the second returned value is a boolean, which is true if the binaries are built with module support.
-	info, _ := debug.ReadBuildInfo()
-	version = info.Main.Version
+	if version == "" {
+		info, _ := debug.ReadBuildInfo()
+		version = info.Main.Version
+	}
 }
 
 func versionCommand() *cobra.Command {

diff --git a/cmd/mdatagen/go.mod b/cmd/mdatagen/go.mod
@@ -53,7 +53,7 @@ require (
 	golang.org/x/net v0.28.0 // indirect
 	golang.org/x/sys v0.25.0 // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20240822170219-fc7c04adadcd // indirect
-	google.golang.org/grpc v1.66.2 // indirect
+	google.golang.org/grpc v1.67.0 // indirect
 	google.golang.org/protobuf v1.34.2 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )

diff --git a/cmd/mdatagen/go.sum b/cmd/mdatagen/go.sum
diff --git a/cmd/otelcorecol/go.mod b/cmd/otelcorecol/go.mod
@@ -53,7 +53,7 @@ require (
 	github.com/hashicorp/go-version v1.7.0 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
-	github.com/klauspost/compress v1.17.9 // indirect
+	github.com/klauspost/compress v1.17.10 // indirect
 	github.com/knadh/koanf/maps v0.1.1 // indirect
 	github.com/knadh/koanf/providers/confmap v0.1.0 // indirect
 	github.com/knadh/koanf/v2 v2.1.1 // indirect
@@ -143,7 +143,7 @@ require (
 	gonum.org/v1/gonum v0.15.1 // indirect
 	google.golang.org/genproto/googleapis/api v0.0.0-20240903143218-8af14fe29dc1 // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 // indirect
-	google.golang.org/grpc v1.66.2 // indirect
+	google.golang.org/grpc v1.67.0 // indirect
 	google.golang.org/protobuf v1.34.2 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )

diff --git a/cmd/otelcorecol/go.sum b/cmd/otelcorecol/go.sum
diff --git a/component/componentstatus/go.mod b/component/componentstatus/go.mod
@@ -23,8 +23,8 @@ require (
 	golang.org/x/net v0.28.0 // indirect
 	golang.org/x/sys v0.25.0 // indirect
 	golang.org/x/text v0.17.0 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20240604185151-ef581f913117 // indirect
-	google.golang.org/grpc v1.66.2 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20240814211410-ddb44dafa142 // indirect
+	google.golang.org/grpc v1.67.0 // indirect
 	google.golang.org/protobuf v1.34.2 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )