From c27d2cd9e4c0ad343d78a2e1f43b69f7e24057f0 Mon Sep 17 00:00:00 2001 From: OpenTelemetry Bot <107717825+opentelemetrybot@users.noreply.github.com> Date: Mon, 11 Dec 2023 22:32:47 +0100 Subject: [PATCH 1/4] [chore] Prepare release v0.91.0 (#9071) The following commands were run to prepare this release: - make chlog-update VERSION=v0.91.0 - make prepare-release PREVIOUS_VERSION=0.90.1 RELEASE_CANDIDATE=0.91.0 MODSET=beta --- .chloggen/automated-status-on-start.yaml | 25 -------- .../codeboten_enable-otel-by-default.yaml | 25 -------- .chloggen/codeboten_fix-missing-metrics.yaml | 28 -------- .chloggen/codeboten_gensemconv-1.21.0.yaml | 25 -------- .../connectors-propogate-mutates-data.yaml | 25 -------- .chloggen/http2ping.yaml | 25 -------- .chloggen/output_version_of_binary.yaml | 12 ---- CHANGELOG-API.md | 2 + CHANGELOG.md | 19 ++++++ cmd/builder/internal/builder/config.go | 2 +- cmd/builder/internal/config/default.yaml | 24 +++---- cmd/builder/test/core.builder.yaml | 8 +-- cmd/otelcorecol/builder-config.yaml | 24 +++---- cmd/otelcorecol/go.mod | 64 +++++++++---------- cmd/otelcorecol/main.go | 2 +- component/go.mod | 4 +- config/configauth/go.mod | 10 +-- config/configgrpc/go.mod | 24 +++---- config/confighttp/go.mod | 22 +++---- config/configtls/go.mod | 2 +- connector/forwardconnector/go.mod | 12 ++-- connector/go.mod | 10 +-- consumer/go.mod | 2 +- examples/k8s/otel-config.yaml | 4 +- exporter/debugexporter/go.mod | 16 ++--- exporter/go.mod | 14 ++-- exporter/loggingexporter/go.mod | 16 ++--- exporter/otlpexporter/go.mod | 36 +++++------ exporter/otlphttpexporter/go.mod | 36 +++++------ extension/auth/go.mod | 8 +-- extension/ballastextension/go.mod | 10 +-- extension/go.mod | 6 +- extension/zpagesextension/go.mod | 12 ++-- go.mod | 18 +++--- otelcol/go.mod | 24 +++---- processor/batchprocessor/go.mod | 12 ++-- processor/go.mod | 10 +-- processor/memorylimiterprocessor/go.mod | 12 ++-- receiver/go.mod | 10 +-- receiver/otlpreceiver/go.mod | 34 +++++----- service/go.mod | 26 ++++---- versions.yaml | 2 +- 42 files changed, 279 insertions(+), 423 deletions(-) delete mode 100755 .chloggen/automated-status-on-start.yaml delete mode 100755 .chloggen/codeboten_enable-otel-by-default.yaml delete mode 100755 .chloggen/codeboten_fix-missing-metrics.yaml delete mode 100755 .chloggen/codeboten_gensemconv-1.21.0.yaml delete mode 100755 .chloggen/connectors-propogate-mutates-data.yaml delete mode 100755 .chloggen/http2ping.yaml delete mode 100755 .chloggen/output_version_of_binary.yaml diff --git a/.chloggen/automated-status-on-start.yaml b/.chloggen/automated-status-on-start.yaml deleted file mode 100755 index 8eb1df926b6..00000000000 --- a/.chloggen/automated-status-on-start.yaml +++ /dev/null @@ -1,25 +0,0 @@ -# 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: statusreporting - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: Automates status reporting upon the completion of component.Start(). - -# One or more tracking issues or pull requests related to the change -issues: [7682] - -# (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: [] \ No newline at end of file diff --git a/.chloggen/codeboten_enable-otel-by-default.yaml b/.chloggen/codeboten_enable-otel-by-default.yaml deleted file mode 100755 index 08cb36bfe8e..00000000000 --- a/.chloggen/codeboten_enable-otel-by-default.yaml +++ /dev/null @@ -1,25 +0,0 @@ -# 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: service - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: "add resource attributes as labels to otel metrics to ensures backwards compatibility with OpenCensus metrics." - -# One or more tracking issues or pull requests related to the change -issues: [9029] - -# (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: [] \ No newline at end of file diff --git a/.chloggen/codeboten_fix-missing-metrics.yaml b/.chloggen/codeboten_fix-missing-metrics.yaml deleted file mode 100755 index 656afaec37d..00000000000 --- a/.chloggen/codeboten_fix-missing-metrics.yaml +++ /dev/null @@ -1,28 +0,0 @@ -# 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: exporterhelper - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: fix missed metric aggregations - -# One or more tracking issues or pull requests related to the change -issues: [9048] - -# (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: | - This ensures that context cancellation in the exporter doesn't interfere with metric aggregation. The OTel - SDK currently returns if there's an error in the context used in `Add`. This means that if there's a - cancelled context in an export, the metrics are now recorded. - -# 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: [] \ No newline at end of file diff --git a/.chloggen/codeboten_gensemconv-1.21.0.yaml b/.chloggen/codeboten_gensemconv-1.21.0.yaml deleted file mode 100755 index c7680099d25..00000000000 --- a/.chloggen/codeboten_gensemconv-1.21.0.yaml +++ /dev/null @@ -1,25 +0,0 @@ -# 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: semconv - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: Generated Semantic conventions 1.21. - -# One or more tracking issues or pull requests related to the change -issues: [9056] - -# (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: [] \ No newline at end of file diff --git a/.chloggen/connectors-propogate-mutates-data.yaml b/.chloggen/connectors-propogate-mutates-data.yaml deleted file mode 100755 index 42e6b082058..00000000000 --- a/.chloggen/connectors-propogate-mutates-data.yaml +++ /dev/null @@ -1,25 +0,0 @@ -# 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: service - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: Fix bug where MutatesData would not correctly propagate through connectors. - -# One or more tracking issues or pull requests related to the change -issues: [9053] - -# (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: [] \ No newline at end of file diff --git a/.chloggen/http2ping.yaml b/.chloggen/http2ping.yaml deleted file mode 100755 index b6f2223ed7d..00000000000 --- a/.chloggen/http2ping.yaml +++ /dev/null @@ -1,25 +0,0 @@ -# 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: config/confighttp - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: Exposes http/2 transport settings to enable health check and workaround golang http/2 issue https://github.com/golang/go/issues/59690 - -# One or more tracking issues or pull requests related to the change -issues: [9022] - -# (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: [] \ No newline at end of file diff --git a/.chloggen/output_version_of_binary.yaml b/.chloggen/output_version_of_binary.yaml deleted file mode 100755 index 3ee2fb784c9..00000000000 --- a/.chloggen/output_version_of_binary.yaml +++ /dev/null @@ -1,12 +0,0 @@ - -change_type: enhancement - -component: cmd/builder - -note: "running builder version on binaries installed with `go install` will output the version specified at the suffix." - -issues: [8770] - -subtext: - -change_logs: [user] diff --git a/CHANGELOG-API.md b/CHANGELOG-API.md index 4ef6591a436..64b6152d4dc 100644 --- a/CHANGELOG-API.md +++ b/CHANGELOG-API.md @@ -7,6 +7,8 @@ If you are looking for user-facing changes, check out [CHANGELOG.md](./CHANGELOG +## v0.91.0 + ## v1.0.0/v0.90.0 ### 🛑 Breaking changes 🛑 diff --git a/CHANGELOG.md b/CHANGELOG.md index ad44fca0b99..e95af0b586a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,25 @@ If you are looking for developer-facing changes, check out [CHANGELOG-API.md](./ +## v0.91.0 + +### 💡 Enhancements 💡 + +- `statusreporting`: Automates status reporting upon the completion of component.Start(). (#7682) +- `service`: add resource attributes as labels to otel metrics to ensures backwards compatibility with OpenCensus metrics. (#9029) +- `semconv`: Generated Semantic conventions 1.21. (#9056) +- `config/confighttp`: Exposes http/2 transport settings to enable health check and workaround golang http/2 issue https://github.com/golang/go/issues/59690 (#9022) +- `cmd/builder`: running builder version on binaries installed with `go install` will output the version specified at the suffix. (#8770) + +### 🧰 Bug fixes 🧰 + +- `exporterhelper`: fix missed metric aggregations (#9048) + This ensures that context cancellation in the exporter doesn't interfere with metric aggregation. The OTel + SDK currently returns if there's an error in the context used in `Add`. This means that if there's a + cancelled context in an export, the metrics are now recorded. + +- `service`: Fix bug where MutatesData would not correctly propagate through connectors. (#9053) + ## v0.90.1 ### 🧰 Bug fixes 🧰 diff --git a/cmd/builder/internal/builder/config.go b/cmd/builder/internal/builder/config.go index 9020170dcbb..252c6b46207 100644 --- a/cmd/builder/internal/builder/config.go +++ b/cmd/builder/internal/builder/config.go @@ -16,7 +16,7 @@ import ( "go.uber.org/zap" ) -const defaultOtelColVersion = "0.90.1" +const defaultOtelColVersion = "0.91.0" // ErrInvalidGoMod indicates an invalid gomod var ErrInvalidGoMod = errors.New("invalid gomod specification for module") diff --git a/cmd/builder/internal/config/default.yaml b/cmd/builder/internal/config/default.yaml index cf8f9114ef0..85682ae9061 100644 --- a/cmd/builder/internal/config/default.yaml +++ b/cmd/builder/internal/config/default.yaml @@ -2,22 +2,22 @@ dist: module: go.opentelemetry.io/collector/cmd/otelcorecol name: otelcorecol description: Local OpenTelemetry Collector binary, testing only. - version: 0.90.0-dev - otelcol_version: 0.90.0 + version: 0.91.0-dev + otelcol_version: 0.91.0 receivers: - - gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.90.0 + - gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.91.0 exporters: - - gomod: go.opentelemetry.io/collector/exporter/debugexporter v0.90.0 - - gomod: go.opentelemetry.io/collector/exporter/loggingexporter v0.90.0 - - gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.90.0 - - gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.90.0 + - gomod: go.opentelemetry.io/collector/exporter/debugexporter v0.91.0 + - gomod: go.opentelemetry.io/collector/exporter/loggingexporter v0.91.0 + - gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.91.0 + - gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.91.0 extensions: - - gomod: go.opentelemetry.io/collector/extension/ballastextension v0.90.0 - - gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.90.0 + - gomod: go.opentelemetry.io/collector/extension/ballastextension v0.91.0 + - gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.91.0 processors: - - gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.90.0 - - gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.90.0 + - gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.91.0 + - gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.91.0 connectors: - - gomod: go.opentelemetry.io/collector/connector/forwardconnector v0.90.0 + - gomod: go.opentelemetry.io/collector/connector/forwardconnector v0.91.0 diff --git a/cmd/builder/test/core.builder.yaml b/cmd/builder/test/core.builder.yaml index 356f10a73b1..4f792b2ee82 100644 --- a/cmd/builder/test/core.builder.yaml +++ b/cmd/builder/test/core.builder.yaml @@ -1,20 +1,20 @@ dist: module: go.opentelemetry.io/collector/builder/test/core - otelcol_version: 0.90.1 + otelcol_version: 0.91.0 extensions: - import: go.opentelemetry.io/collector/extension/zpagesextension - gomod: go.opentelemetry.io/collector v0.90.1 + gomod: go.opentelemetry.io/collector v0.91.0 path: ${WORKSPACE_DIR} receivers: - import: go.opentelemetry.io/collector/receiver/otlpreceiver - gomod: go.opentelemetry.io/collector v0.90.1 + gomod: go.opentelemetry.io/collector v0.91.0 path: ${WORKSPACE_DIR} exporters: - import: go.opentelemetry.io/collector/exporter/debugexporter - gomod: go.opentelemetry.io/collector v0.90.1 + gomod: go.opentelemetry.io/collector v0.91.0 path: ${WORKSPACE_DIR} replaces: diff --git a/cmd/otelcorecol/builder-config.yaml b/cmd/otelcorecol/builder-config.yaml index a0aff6c623a..60414f8d0d7 100644 --- a/cmd/otelcorecol/builder-config.yaml +++ b/cmd/otelcorecol/builder-config.yaml @@ -2,24 +2,24 @@ dist: module: go.opentelemetry.io/collector/cmd/otelcorecol name: otelcorecol description: Local OpenTelemetry Collector binary, testing only. - version: 0.90.1-dev - otelcol_version: 0.90.1 + version: 0.91.0-dev + otelcol_version: 0.91.0 receivers: - - gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.90.1 + - gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.91.0 exporters: - - gomod: go.opentelemetry.io/collector/exporter/debugexporter v0.90.1 - - gomod: go.opentelemetry.io/collector/exporter/loggingexporter v0.90.1 - - gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.90.1 - - gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.90.1 + - gomod: go.opentelemetry.io/collector/exporter/debugexporter v0.91.0 + - gomod: go.opentelemetry.io/collector/exporter/loggingexporter v0.91.0 + - gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.91.0 + - gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.91.0 extensions: - - gomod: go.opentelemetry.io/collector/extension/ballastextension v0.90.1 - - gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.90.1 + - gomod: go.opentelemetry.io/collector/extension/ballastextension v0.91.0 + - gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.91.0 processors: - - gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.90.1 - - gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.90.1 + - gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.91.0 + - gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.91.0 connectors: - - gomod: go.opentelemetry.io/collector/connector/forwardconnector v0.90.1 + - gomod: go.opentelemetry.io/collector/connector/forwardconnector v0.91.0 replaces: - go.opentelemetry.io/collector => ../../ diff --git a/cmd/otelcorecol/go.mod b/cmd/otelcorecol/go.mod index c3ba7b06441..56d5749dc8d 100644 --- a/cmd/otelcorecol/go.mod +++ b/cmd/otelcorecol/go.mod @@ -6,23 +6,23 @@ go 1.20 require ( github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.90.1 - go.opentelemetry.io/collector/connector v0.90.1 - go.opentelemetry.io/collector/connector/forwardconnector v0.90.1 - go.opentelemetry.io/collector/exporter v0.90.1 - go.opentelemetry.io/collector/exporter/debugexporter v0.90.1 - go.opentelemetry.io/collector/exporter/loggingexporter v0.90.1 - go.opentelemetry.io/collector/exporter/otlpexporter v0.90.1 - go.opentelemetry.io/collector/exporter/otlphttpexporter v0.90.1 - go.opentelemetry.io/collector/extension v0.90.1 - go.opentelemetry.io/collector/extension/ballastextension v0.90.1 - go.opentelemetry.io/collector/extension/zpagesextension v0.90.1 - go.opentelemetry.io/collector/otelcol v0.90.1 - go.opentelemetry.io/collector/processor v0.90.1 - go.opentelemetry.io/collector/processor/batchprocessor v0.90.1 - go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.90.1 - go.opentelemetry.io/collector/receiver v0.90.1 - go.opentelemetry.io/collector/receiver/otlpreceiver v0.90.1 + go.opentelemetry.io/collector/component v0.91.0 + go.opentelemetry.io/collector/connector v0.91.0 + go.opentelemetry.io/collector/connector/forwardconnector v0.91.0 + go.opentelemetry.io/collector/exporter v0.91.0 + go.opentelemetry.io/collector/exporter/debugexporter v0.91.0 + go.opentelemetry.io/collector/exporter/loggingexporter v0.91.0 + go.opentelemetry.io/collector/exporter/otlpexporter v0.91.0 + go.opentelemetry.io/collector/exporter/otlphttpexporter v0.91.0 + go.opentelemetry.io/collector/extension v0.91.0 + go.opentelemetry.io/collector/extension/ballastextension v0.91.0 + go.opentelemetry.io/collector/extension/zpagesextension v0.91.0 + go.opentelemetry.io/collector/otelcol v0.91.0 + go.opentelemetry.io/collector/processor v0.91.0 + go.opentelemetry.io/collector/processor/batchprocessor v0.91.0 + go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.91.0 + go.opentelemetry.io/collector/receiver v0.91.0 + go.opentelemetry.io/collector/receiver/otlpreceiver v0.91.0 golang.org/x/sys v0.15.0 ) @@ -77,23 +77,23 @@ require ( github.com/tklauser/numcpus v0.6.1 // indirect github.com/yusufpapurcu/wmi v1.2.3 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector v0.90.1 // indirect - go.opentelemetry.io/collector/config/configauth v0.90.1 // indirect - go.opentelemetry.io/collector/config/configcompression v0.90.1 // indirect - go.opentelemetry.io/collector/config/configgrpc v0.90.1 // indirect - go.opentelemetry.io/collector/config/confighttp v0.90.1 // indirect - go.opentelemetry.io/collector/config/confignet v0.90.1 // indirect - go.opentelemetry.io/collector/config/configopaque v0.90.1 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.90.1 // indirect - go.opentelemetry.io/collector/config/configtls v0.90.1 // indirect - go.opentelemetry.io/collector/config/internal v0.90.1 // indirect - go.opentelemetry.io/collector/confmap v0.90.1 // indirect - go.opentelemetry.io/collector/consumer v0.90.1 // indirect - go.opentelemetry.io/collector/extension/auth v0.90.1 // indirect + go.opentelemetry.io/collector v0.91.0 // indirect + go.opentelemetry.io/collector/config/configauth v0.91.0 // indirect + go.opentelemetry.io/collector/config/configcompression v0.91.0 // indirect + go.opentelemetry.io/collector/config/configgrpc v0.91.0 // indirect + go.opentelemetry.io/collector/config/confighttp v0.91.0 // indirect + go.opentelemetry.io/collector/config/confignet v0.91.0 // indirect + go.opentelemetry.io/collector/config/configopaque v0.91.0 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.91.0 // indirect + go.opentelemetry.io/collector/config/configtls v0.91.0 // indirect + go.opentelemetry.io/collector/config/internal v0.91.0 // indirect + go.opentelemetry.io/collector/confmap v0.91.0 // indirect + go.opentelemetry.io/collector/consumer v0.91.0 // indirect + go.opentelemetry.io/collector/extension/auth v0.91.0 // indirect go.opentelemetry.io/collector/featuregate v1.0.0 // indirect go.opentelemetry.io/collector/pdata v1.0.0 // indirect - go.opentelemetry.io/collector/semconv v0.90.1 // indirect - go.opentelemetry.io/collector/service v0.90.1 // indirect + go.opentelemetry.io/collector/semconv v0.91.0 // indirect + go.opentelemetry.io/collector/service v0.91.0 // indirect go.opentelemetry.io/contrib/config v0.1.1 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.1 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1 // indirect diff --git a/cmd/otelcorecol/main.go b/cmd/otelcorecol/main.go index 80e552effc5..76e2dbf1b9d 100644 --- a/cmd/otelcorecol/main.go +++ b/cmd/otelcorecol/main.go @@ -14,7 +14,7 @@ func main() { info := component.BuildInfo{ Command: "otelcorecol", Description: "Local OpenTelemetry Collector binary, testing only.", - Version: "0.90.1-dev", + Version: "0.91.0-dev", } if err := run(otelcol.CollectorSettings{BuildInfo: info, Factories: components}); err != nil { diff --git a/component/go.mod b/component/go.mod index 9721f92fe15..fdb6b4850c6 100644 --- a/component/go.mod +++ b/component/go.mod @@ -4,8 +4,8 @@ go 1.20 require ( github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/config/configtelemetry v0.90.1 - go.opentelemetry.io/collector/confmap v0.90.1 + go.opentelemetry.io/collector/config/configtelemetry v0.91.0 + go.opentelemetry.io/collector/confmap v0.91.0 go.opentelemetry.io/collector/pdata v1.0.0 go.opentelemetry.io/otel/metric v1.21.0 go.opentelemetry.io/otel/trace v1.21.0 diff --git a/config/configauth/go.mod b/config/configauth/go.mod index e4f4440b4bd..f5e2fc296bb 100644 --- a/config/configauth/go.mod +++ b/config/configauth/go.mod @@ -4,9 +4,9 @@ go 1.20 require ( github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.90.1 - go.opentelemetry.io/collector/extension v0.90.1 - go.opentelemetry.io/collector/extension/auth v0.90.1 + go.opentelemetry.io/collector/component v0.91.0 + go.opentelemetry.io/collector/extension v0.91.0 + go.opentelemetry.io/collector/extension/auth v0.91.0 ) require ( @@ -21,8 +21,8 @@ require ( github.com/mitchellh/mapstructure v1.5.1-0.20220423185008-bf980b35cac4 // indirect github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.90.1 // indirect - go.opentelemetry.io/collector/confmap v0.90.1 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.91.0 // indirect + go.opentelemetry.io/collector/confmap v0.91.0 // indirect go.opentelemetry.io/collector/featuregate v1.0.0 // indirect go.opentelemetry.io/collector/pdata v1.0.0 // indirect go.opentelemetry.io/otel v1.21.0 // indirect diff --git a/config/configgrpc/go.mod b/config/configgrpc/go.mod index 9a03fefc4ed..2655e2df495 100644 --- a/config/configgrpc/go.mod +++ b/config/configgrpc/go.mod @@ -5,15 +5,15 @@ go 1.20 require ( github.com/mostynb/go-grpc-compression v1.2.2 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector v0.90.1 - go.opentelemetry.io/collector/component v0.90.1 - go.opentelemetry.io/collector/config/configauth v0.90.1 - go.opentelemetry.io/collector/config/configcompression v0.90.1 - go.opentelemetry.io/collector/config/confignet v0.90.1 - go.opentelemetry.io/collector/config/configopaque v0.90.1 - go.opentelemetry.io/collector/config/configtls v0.90.1 - go.opentelemetry.io/collector/config/internal v0.90.1 - go.opentelemetry.io/collector/extension/auth v0.90.1 + go.opentelemetry.io/collector v0.91.0 + go.opentelemetry.io/collector/component v0.91.0 + go.opentelemetry.io/collector/config/configauth v0.91.0 + go.opentelemetry.io/collector/config/configcompression v0.91.0 + go.opentelemetry.io/collector/config/confignet v0.91.0 + go.opentelemetry.io/collector/config/configopaque v0.91.0 + go.opentelemetry.io/collector/config/configtls v0.91.0 + go.opentelemetry.io/collector/config/internal v0.91.0 + go.opentelemetry.io/collector/extension/auth v0.91.0 go.opentelemetry.io/collector/pdata v1.0.0 go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.1 go.opentelemetry.io/otel v1.21.0 @@ -55,9 +55,9 @@ require ( github.com/prometheus/procfs v0.11.1 // indirect github.com/prometheus/statsd_exporter v0.22.7 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.90.1 // indirect - go.opentelemetry.io/collector/confmap v0.90.1 // indirect - go.opentelemetry.io/collector/extension v0.90.1 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.91.0 // indirect + go.opentelemetry.io/collector/confmap v0.91.0 // indirect + go.opentelemetry.io/collector/extension v0.91.0 // indirect go.opentelemetry.io/collector/featuregate v1.0.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.44.1-0.20231201153405-6027c1ae76f2 // indirect go.opentelemetry.io/otel/metric v1.21.0 // indirect diff --git a/config/confighttp/go.mod b/config/confighttp/go.mod index 7f8860f26ff..a9887e39494 100644 --- a/config/confighttp/go.mod +++ b/config/confighttp/go.mod @@ -7,15 +7,15 @@ require ( github.com/klauspost/compress v1.17.4 github.com/rs/cors v1.10.1 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector v0.90.1 - go.opentelemetry.io/collector/component v0.90.1 - go.opentelemetry.io/collector/config/configauth v0.90.1 - go.opentelemetry.io/collector/config/configcompression v0.90.1 - go.opentelemetry.io/collector/config/configopaque v0.90.1 - go.opentelemetry.io/collector/config/configtelemetry v0.90.1 - go.opentelemetry.io/collector/config/configtls v0.90.1 - go.opentelemetry.io/collector/config/internal v0.90.1 - go.opentelemetry.io/collector/extension/auth v0.90.1 + go.opentelemetry.io/collector v0.91.0 + go.opentelemetry.io/collector/component v0.91.0 + go.opentelemetry.io/collector/config/configauth v0.91.0 + go.opentelemetry.io/collector/config/configcompression v0.91.0 + go.opentelemetry.io/collector/config/configopaque v0.91.0 + go.opentelemetry.io/collector/config/configtelemetry v0.91.0 + go.opentelemetry.io/collector/config/configtls v0.91.0 + go.opentelemetry.io/collector/config/internal v0.91.0 + go.opentelemetry.io/collector/extension/auth v0.91.0 go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1 go.opentelemetry.io/otel v1.21.0 go.uber.org/zap v1.26.0 @@ -38,8 +38,8 @@ require ( github.com/mitchellh/mapstructure v1.5.1-0.20220423185008-bf980b35cac4 // indirect github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - go.opentelemetry.io/collector/confmap v0.90.1 // indirect - go.opentelemetry.io/collector/extension v0.90.1 // indirect + go.opentelemetry.io/collector/confmap v0.91.0 // indirect + go.opentelemetry.io/collector/extension v0.91.0 // indirect go.opentelemetry.io/collector/featuregate v1.0.0 // indirect go.opentelemetry.io/collector/pdata v1.0.0 // indirect go.opentelemetry.io/otel/metric v1.21.0 // indirect diff --git a/config/configtls/go.mod b/config/configtls/go.mod index a20d4e213e1..8bc328c8961 100644 --- a/config/configtls/go.mod +++ b/config/configtls/go.mod @@ -5,7 +5,7 @@ go 1.20 require ( github.com/fsnotify/fsnotify v1.7.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/config/configopaque v0.90.1 + go.opentelemetry.io/collector/config/configopaque v0.91.0 ) require ( diff --git a/connector/forwardconnector/go.mod b/connector/forwardconnector/go.mod index b8b5ddb99e3..39e070a4773 100644 --- a/connector/forwardconnector/go.mod +++ b/connector/forwardconnector/go.mod @@ -4,9 +4,9 @@ go 1.20 require ( github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.90.1 - go.opentelemetry.io/collector/connector v0.90.1 - go.opentelemetry.io/collector/consumer v0.90.1 + go.opentelemetry.io/collector/component v0.91.0 + go.opentelemetry.io/collector/connector v0.91.0 + go.opentelemetry.io/collector/consumer v0.91.0 go.opentelemetry.io/collector/pdata v1.0.0 ) @@ -25,9 +25,9 @@ require ( github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - go.opentelemetry.io/collector v0.90.1 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.90.1 // indirect - go.opentelemetry.io/collector/confmap v0.90.1 // indirect + go.opentelemetry.io/collector v0.91.0 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.91.0 // indirect + go.opentelemetry.io/collector/confmap v0.91.0 // indirect go.opentelemetry.io/collector/featuregate v1.0.0 // indirect go.opentelemetry.io/otel v1.21.0 // indirect go.opentelemetry.io/otel/metric v1.21.0 // indirect diff --git a/connector/go.mod b/connector/go.mod index a22cbd5a17d..f11308b2495 100644 --- a/connector/go.mod +++ b/connector/go.mod @@ -4,9 +4,9 @@ go 1.20 require ( github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector v0.90.1 - go.opentelemetry.io/collector/component v0.90.1 - go.opentelemetry.io/collector/consumer v0.90.1 + go.opentelemetry.io/collector v0.91.0 + go.opentelemetry.io/collector/component v0.91.0 + go.opentelemetry.io/collector/consumer v0.91.0 go.opentelemetry.io/collector/pdata v1.0.0 go.uber.org/zap v1.26.0 ) @@ -26,8 +26,8 @@ require ( github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.90.1 // indirect - go.opentelemetry.io/collector/confmap v0.90.1 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.91.0 // indirect + go.opentelemetry.io/collector/confmap v0.91.0 // indirect go.opentelemetry.io/collector/featuregate v1.0.0 // indirect go.opentelemetry.io/otel v1.21.0 // indirect go.opentelemetry.io/otel/metric v1.21.0 // indirect diff --git a/consumer/go.mod b/consumer/go.mod index eccc74c3ff1..7d42f9e326a 100644 --- a/consumer/go.mod +++ b/consumer/go.mod @@ -4,7 +4,7 @@ go 1.20 require ( github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector v0.90.1 + go.opentelemetry.io/collector v0.91.0 go.opentelemetry.io/collector/pdata v1.0.0 ) diff --git a/examples/k8s/otel-config.yaml b/examples/k8s/otel-config.yaml index 0bc658fd302..f9e51a8d477 100644 --- a/examples/k8s/otel-config.yaml +++ b/examples/k8s/otel-config.yaml @@ -68,7 +68,7 @@ spec: - command: - "/otelcol" - "--config=/conf/otel-agent-config.yaml" - image: otel/opentelemetry-collector:0.90.1 + image: otel/opentelemetry-collector:0.91.0 name: otel-agent resources: limits: @@ -187,7 +187,7 @@ spec: - command: - "/otelcol" - "--config=/conf/otel-collector-config.yaml" - image: otel/opentelemetry-collector:0.90.1 + image: otel/opentelemetry-collector:0.91.0 name: otel-collector resources: limits: diff --git a/exporter/debugexporter/go.mod b/exporter/debugexporter/go.mod index 9e6f2be90aa..1ae440033da 100644 --- a/exporter/debugexporter/go.mod +++ b/exporter/debugexporter/go.mod @@ -4,10 +4,10 @@ go 1.20 require ( github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.90.1 - go.opentelemetry.io/collector/config/configtelemetry v0.90.1 - go.opentelemetry.io/collector/confmap v0.90.1 - go.opentelemetry.io/collector/exporter v0.90.1 + go.opentelemetry.io/collector/component v0.91.0 + go.opentelemetry.io/collector/config/configtelemetry v0.91.0 + go.opentelemetry.io/collector/confmap v0.91.0 + go.opentelemetry.io/collector/exporter v0.91.0 ) require ( @@ -27,12 +27,12 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector v0.90.1 // indirect - go.opentelemetry.io/collector/consumer v0.90.1 // indirect - go.opentelemetry.io/collector/extension v0.90.1 // indirect + go.opentelemetry.io/collector v0.91.0 // indirect + go.opentelemetry.io/collector/consumer v0.91.0 // indirect + go.opentelemetry.io/collector/extension v0.91.0 // indirect go.opentelemetry.io/collector/featuregate v1.0.0 // indirect go.opentelemetry.io/collector/pdata v1.0.0 // indirect - go.opentelemetry.io/collector/receiver v0.90.1 // indirect + go.opentelemetry.io/collector/receiver v0.91.0 // indirect go.opentelemetry.io/otel v1.21.0 // indirect go.opentelemetry.io/otel/metric v1.21.0 // indirect go.opentelemetry.io/otel/trace v1.21.0 // indirect diff --git a/exporter/go.mod b/exporter/go.mod index 8fb69073b20..3ca2071e731 100644 --- a/exporter/go.mod +++ b/exporter/go.mod @@ -6,14 +6,14 @@ require ( github.com/cenkalti/backoff/v4 v4.2.1 github.com/stretchr/testify v1.8.4 go.opencensus.io v0.24.0 - go.opentelemetry.io/collector v0.90.1 - go.opentelemetry.io/collector/component v0.90.1 - go.opentelemetry.io/collector/config/configtelemetry v0.90.1 - go.opentelemetry.io/collector/consumer v0.90.1 - go.opentelemetry.io/collector/extension v0.90.1 + go.opentelemetry.io/collector v0.91.0 + go.opentelemetry.io/collector/component v0.91.0 + go.opentelemetry.io/collector/config/configtelemetry v0.91.0 + go.opentelemetry.io/collector/consumer v0.91.0 + go.opentelemetry.io/collector/extension v0.91.0 go.opentelemetry.io/collector/featuregate v1.0.0 go.opentelemetry.io/collector/pdata v1.0.0 - go.opentelemetry.io/collector/receiver v0.90.1 + go.opentelemetry.io/collector/receiver v0.91.0 go.opentelemetry.io/otel v1.21.0 go.opentelemetry.io/otel/metric v1.21.0 go.opentelemetry.io/otel/sdk v1.21.0 @@ -53,7 +53,7 @@ require ( github.com/prometheus/common v0.45.0 // indirect github.com/prometheus/procfs v0.11.1 // indirect github.com/prometheus/statsd_exporter v0.22.7 // indirect - go.opentelemetry.io/collector/confmap v0.90.1 // indirect + go.opentelemetry.io/collector/confmap v0.91.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.44.1-0.20231201153405-6027c1ae76f2 // indirect go.opentelemetry.io/otel/sdk/metric v1.21.0 // indirect golang.org/x/net v0.18.0 // indirect diff --git a/exporter/loggingexporter/go.mod b/exporter/loggingexporter/go.mod index 8f0ea79e762..8149aa882c5 100644 --- a/exporter/loggingexporter/go.mod +++ b/exporter/loggingexporter/go.mod @@ -5,10 +5,10 @@ go 1.20 require ( github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.90.1 - go.opentelemetry.io/collector/config/configtelemetry v0.90.1 - go.opentelemetry.io/collector/confmap v0.90.1 - go.opentelemetry.io/collector/exporter v0.90.1 + go.opentelemetry.io/collector/component v0.91.0 + go.opentelemetry.io/collector/config/configtelemetry v0.91.0 + go.opentelemetry.io/collector/confmap v0.91.0 + go.opentelemetry.io/collector/exporter v0.91.0 go.uber.org/zap v1.26.0 ) @@ -29,12 +29,12 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector v0.90.1 // indirect - go.opentelemetry.io/collector/consumer v0.90.1 // indirect - go.opentelemetry.io/collector/extension v0.90.1 // indirect + go.opentelemetry.io/collector v0.91.0 // indirect + go.opentelemetry.io/collector/consumer v0.91.0 // indirect + go.opentelemetry.io/collector/extension v0.91.0 // indirect go.opentelemetry.io/collector/featuregate v1.0.0 // indirect go.opentelemetry.io/collector/pdata v1.0.0 // indirect - go.opentelemetry.io/collector/receiver v0.90.1 // indirect + go.opentelemetry.io/collector/receiver v0.91.0 // indirect go.opentelemetry.io/otel v1.21.0 // indirect go.opentelemetry.io/otel/metric v1.21.0 // indirect go.opentelemetry.io/otel/trace v1.21.0 // indirect diff --git a/exporter/otlpexporter/go.mod b/exporter/otlpexporter/go.mod index b9fe031da6a..3b5d4f1408b 100644 --- a/exporter/otlpexporter/go.mod +++ b/exporter/otlpexporter/go.mod @@ -4,18 +4,18 @@ go 1.20 require ( github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector v0.90.1 - go.opentelemetry.io/collector/component v0.90.1 - go.opentelemetry.io/collector/config/configauth v0.90.1 - go.opentelemetry.io/collector/config/configcompression v0.90.1 - go.opentelemetry.io/collector/config/configgrpc v0.90.1 - go.opentelemetry.io/collector/config/configopaque v0.90.1 - go.opentelemetry.io/collector/config/configtls v0.90.1 - go.opentelemetry.io/collector/confmap v0.90.1 - go.opentelemetry.io/collector/consumer v0.90.1 - go.opentelemetry.io/collector/exporter v0.90.1 + go.opentelemetry.io/collector v0.91.0 + go.opentelemetry.io/collector/component v0.91.0 + go.opentelemetry.io/collector/config/configauth v0.91.0 + go.opentelemetry.io/collector/config/configcompression v0.91.0 + go.opentelemetry.io/collector/config/configgrpc v0.91.0 + go.opentelemetry.io/collector/config/configopaque v0.91.0 + go.opentelemetry.io/collector/config/configtls v0.91.0 + go.opentelemetry.io/collector/confmap v0.91.0 + go.opentelemetry.io/collector/consumer v0.91.0 + go.opentelemetry.io/collector/exporter v0.91.0 go.opentelemetry.io/collector/pdata v1.0.0 - go.opentelemetry.io/collector/receiver/otlpreceiver v0.90.1 + go.opentelemetry.io/collector/receiver/otlpreceiver v0.91.0 google.golang.org/genproto/googleapis/rpc v0.0.0-20231127180814-3a041ad873d4 google.golang.org/grpc v1.59.0 google.golang.org/protobuf v1.31.0 @@ -47,14 +47,14 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rs/cors v1.10.1 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/config/confighttp v0.90.1 // indirect - go.opentelemetry.io/collector/config/confignet v0.90.1 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.90.1 // indirect - go.opentelemetry.io/collector/config/internal v0.90.1 // indirect - go.opentelemetry.io/collector/extension v0.90.1 // indirect - go.opentelemetry.io/collector/extension/auth v0.90.1 // indirect + go.opentelemetry.io/collector/config/confighttp v0.91.0 // indirect + go.opentelemetry.io/collector/config/confignet v0.91.0 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.91.0 // indirect + go.opentelemetry.io/collector/config/internal v0.91.0 // indirect + go.opentelemetry.io/collector/extension v0.91.0 // indirect + go.opentelemetry.io/collector/extension/auth v0.91.0 // indirect go.opentelemetry.io/collector/featuregate v1.0.0 // indirect - go.opentelemetry.io/collector/receiver v0.90.1 // indirect + go.opentelemetry.io/collector/receiver v0.91.0 // indirect go.opentelemetry.io/contrib/config v0.1.1 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.1 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1 // indirect diff --git a/exporter/otlphttpexporter/go.mod b/exporter/otlphttpexporter/go.mod index be325d3be6f..62fca98fa4c 100644 --- a/exporter/otlphttpexporter/go.mod +++ b/exporter/otlphttpexporter/go.mod @@ -4,18 +4,18 @@ go 1.20 require ( github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector v0.90.1 - go.opentelemetry.io/collector/component v0.90.1 - go.opentelemetry.io/collector/config/configcompression v0.90.1 - go.opentelemetry.io/collector/config/confighttp v0.90.1 - go.opentelemetry.io/collector/config/configopaque v0.90.1 - go.opentelemetry.io/collector/config/configtls v0.90.1 - go.opentelemetry.io/collector/confmap v0.90.1 - go.opentelemetry.io/collector/consumer v0.90.1 - go.opentelemetry.io/collector/exporter v0.90.1 + go.opentelemetry.io/collector v0.91.0 + go.opentelemetry.io/collector/component v0.91.0 + go.opentelemetry.io/collector/config/configcompression v0.91.0 + go.opentelemetry.io/collector/config/confighttp v0.91.0 + go.opentelemetry.io/collector/config/configopaque v0.91.0 + go.opentelemetry.io/collector/config/configtls v0.91.0 + go.opentelemetry.io/collector/confmap v0.91.0 + go.opentelemetry.io/collector/consumer v0.91.0 + go.opentelemetry.io/collector/exporter v0.91.0 go.opentelemetry.io/collector/pdata v1.0.0 - go.opentelemetry.io/collector/receiver v0.90.1 - go.opentelemetry.io/collector/receiver/otlpreceiver v0.90.1 + go.opentelemetry.io/collector/receiver v0.91.0 + go.opentelemetry.io/collector/receiver/otlpreceiver v0.91.0 go.uber.org/zap v1.26.0 google.golang.org/genproto/googleapis/rpc v0.0.0-20231127180814-3a041ad873d4 google.golang.org/grpc v1.59.0 @@ -48,13 +48,13 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rs/cors v1.10.1 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/config/configauth v0.90.1 // indirect - go.opentelemetry.io/collector/config/configgrpc v0.90.1 // indirect - go.opentelemetry.io/collector/config/confignet v0.90.1 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.90.1 // indirect - go.opentelemetry.io/collector/config/internal v0.90.1 // indirect - go.opentelemetry.io/collector/extension v0.90.1 // indirect - go.opentelemetry.io/collector/extension/auth v0.90.1 // indirect + go.opentelemetry.io/collector/config/configauth v0.91.0 // indirect + go.opentelemetry.io/collector/config/configgrpc v0.91.0 // indirect + go.opentelemetry.io/collector/config/confignet v0.91.0 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.91.0 // indirect + go.opentelemetry.io/collector/config/internal v0.91.0 // indirect + go.opentelemetry.io/collector/extension v0.91.0 // indirect + go.opentelemetry.io/collector/extension/auth v0.91.0 // indirect go.opentelemetry.io/collector/featuregate v1.0.0 // indirect go.opentelemetry.io/contrib/config v0.1.1 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.1 // indirect diff --git a/extension/auth/go.mod b/extension/auth/go.mod index 0e6de3b51e4..47ef6bbd0b9 100644 --- a/extension/auth/go.mod +++ b/extension/auth/go.mod @@ -4,8 +4,8 @@ go 1.20 require ( github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.90.1 - go.opentelemetry.io/collector/extension v0.90.1 + go.opentelemetry.io/collector/component v0.91.0 + go.opentelemetry.io/collector/extension v0.91.0 google.golang.org/grpc v1.59.0 ) @@ -21,8 +21,8 @@ require ( github.com/mitchellh/mapstructure v1.5.1-0.20220423185008-bf980b35cac4 // indirect github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.90.1 // indirect - go.opentelemetry.io/collector/confmap v0.90.1 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.91.0 // indirect + go.opentelemetry.io/collector/confmap v0.91.0 // indirect go.opentelemetry.io/collector/featuregate v1.0.0 // indirect go.opentelemetry.io/collector/pdata v1.0.0 // indirect go.opentelemetry.io/otel v1.21.0 // indirect diff --git a/extension/ballastextension/go.mod b/extension/ballastextension/go.mod index ea583df9cb1..69283446091 100644 --- a/extension/ballastextension/go.mod +++ b/extension/ballastextension/go.mod @@ -4,10 +4,10 @@ go 1.20 require ( github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector v0.90.1 - go.opentelemetry.io/collector/component v0.90.1 - go.opentelemetry.io/collector/confmap v0.90.1 - go.opentelemetry.io/collector/extension v0.90.1 + go.opentelemetry.io/collector v0.91.0 + go.opentelemetry.io/collector/component v0.91.0 + go.opentelemetry.io/collector/confmap v0.91.0 + go.opentelemetry.io/collector/extension v0.91.0 go.uber.org/zap v1.26.0 ) @@ -30,7 +30,7 @@ require ( github.com/tklauser/go-sysconf v0.3.12 // indirect github.com/tklauser/numcpus v0.6.1 // indirect github.com/yusufpapurcu/wmi v1.2.3 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.90.1 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.91.0 // indirect go.opentelemetry.io/collector/featuregate v1.0.0 // indirect go.opentelemetry.io/collector/pdata v1.0.0 // indirect go.opentelemetry.io/otel v1.21.0 // indirect diff --git a/extension/go.mod b/extension/go.mod index 048623b467f..c8efd6df6ad 100644 --- a/extension/go.mod +++ b/extension/go.mod @@ -4,8 +4,8 @@ go 1.20 require ( github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.90.1 - go.opentelemetry.io/collector/confmap v0.90.1 + go.opentelemetry.io/collector/component v0.91.0 + go.opentelemetry.io/collector/confmap v0.91.0 ) require ( @@ -20,7 +20,7 @@ require ( github.com/mitchellh/mapstructure v1.5.1-0.20220423185008-bf980b35cac4 // indirect github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.90.1 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.91.0 // indirect go.opentelemetry.io/collector/featuregate v1.0.0 // indirect go.opentelemetry.io/collector/pdata v1.0.0 // indirect go.opentelemetry.io/otel v1.21.0 // indirect diff --git a/extension/zpagesextension/go.mod b/extension/zpagesextension/go.mod index d4f1710e39a..a1aa571d93d 100644 --- a/extension/zpagesextension/go.mod +++ b/extension/zpagesextension/go.mod @@ -4,11 +4,11 @@ go 1.20 require ( github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector v0.90.1 - go.opentelemetry.io/collector/component v0.90.1 - go.opentelemetry.io/collector/config/confignet v0.90.1 - go.opentelemetry.io/collector/confmap v0.90.1 - go.opentelemetry.io/collector/extension v0.90.1 + go.opentelemetry.io/collector v0.91.0 + go.opentelemetry.io/collector/component v0.91.0 + go.opentelemetry.io/collector/config/confignet v0.91.0 + go.opentelemetry.io/collector/confmap v0.91.0 + go.opentelemetry.io/collector/extension v0.91.0 go.opentelemetry.io/contrib/zpages v0.46.1 go.opentelemetry.io/otel/sdk v1.21.0 go.opentelemetry.io/otel/trace v1.21.0 @@ -29,7 +29,7 @@ require ( github.com/mitchellh/mapstructure v1.5.1-0.20220423185008-bf980b35cac4 // indirect github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.90.1 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.91.0 // indirect go.opentelemetry.io/collector/featuregate v1.0.0 // indirect go.opentelemetry.io/collector/pdata v1.0.0 // indirect go.opentelemetry.io/contrib/config v0.1.1 // indirect diff --git a/go.mod b/go.mod index 1a230cf62e7..4d5ed16051a 100644 --- a/go.mod +++ b/go.mod @@ -10,15 +10,15 @@ require ( github.com/shirou/gopsutil/v3 v3.23.11 github.com/stretchr/testify v1.8.4 go.opencensus.io v0.24.0 - go.opentelemetry.io/collector/component v0.90.1 - go.opentelemetry.io/collector/config/configtelemetry v0.90.1 - go.opentelemetry.io/collector/connector v0.90.1 - go.opentelemetry.io/collector/consumer v0.90.1 - go.opentelemetry.io/collector/exporter v0.90.1 + go.opentelemetry.io/collector/component v0.91.0 + go.opentelemetry.io/collector/config/configtelemetry v0.91.0 + go.opentelemetry.io/collector/connector v0.91.0 + go.opentelemetry.io/collector/consumer v0.91.0 + go.opentelemetry.io/collector/exporter v0.91.0 go.opentelemetry.io/collector/featuregate v1.0.0 go.opentelemetry.io/collector/pdata v1.0.0 - go.opentelemetry.io/collector/processor v0.90.1 - go.opentelemetry.io/collector/receiver v0.90.1 + go.opentelemetry.io/collector/processor v0.91.0 + go.opentelemetry.io/collector/receiver v0.91.0 go.opentelemetry.io/contrib/config v0.1.1 go.opentelemetry.io/otel v1.21.0 go.opentelemetry.io/otel/exporters/prometheus v0.44.1-0.20231201153405-6027c1ae76f2 @@ -59,8 +59,8 @@ require ( github.com/tklauser/go-sysconf v0.3.12 // indirect github.com/tklauser/numcpus v0.6.1 // indirect github.com/yusufpapurcu/wmi v1.2.3 // indirect - go.opentelemetry.io/collector/confmap v0.90.1 // indirect - go.opentelemetry.io/collector/extension v0.90.1 // indirect + go.opentelemetry.io/collector/confmap v0.91.0 // indirect + go.opentelemetry.io/collector/extension v0.91.0 // indirect go.opentelemetry.io/otel/metric v1.21.0 // indirect go.opentelemetry.io/otel/trace v1.21.0 // indirect go.uber.org/goleak v1.2.1 // indirect diff --git a/otelcol/go.mod b/otelcol/go.mod index a859a4890e7..8adb62d4a7a 100644 --- a/otelcol/go.mod +++ b/otelcol/go.mod @@ -5,16 +5,16 @@ go 1.20 require ( github.com/spf13/cobra v1.8.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.90.1 - go.opentelemetry.io/collector/config/configtelemetry v0.90.1 - go.opentelemetry.io/collector/confmap v0.90.1 - go.opentelemetry.io/collector/connector v0.90.1 - go.opentelemetry.io/collector/exporter v0.90.1 - go.opentelemetry.io/collector/extension v0.90.1 + go.opentelemetry.io/collector/component v0.91.0 + go.opentelemetry.io/collector/config/configtelemetry v0.91.0 + go.opentelemetry.io/collector/confmap v0.91.0 + go.opentelemetry.io/collector/connector v0.91.0 + go.opentelemetry.io/collector/exporter v0.91.0 + go.opentelemetry.io/collector/extension v0.91.0 go.opentelemetry.io/collector/featuregate v1.0.0 - go.opentelemetry.io/collector/processor v0.90.1 - go.opentelemetry.io/collector/receiver v0.90.1 - go.opentelemetry.io/collector/service v0.90.1 + go.opentelemetry.io/collector/processor v0.91.0 + go.opentelemetry.io/collector/receiver v0.91.0 + go.opentelemetry.io/collector/service v0.91.0 go.uber.org/multierr v1.11.0 go.uber.org/zap v1.26.0 golang.org/x/sys v0.15.0 @@ -65,10 +65,10 @@ require ( github.com/tklauser/numcpus v0.6.1 // indirect github.com/yusufpapurcu/wmi v1.2.3 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector v0.90.1 // indirect - go.opentelemetry.io/collector/consumer v0.90.1 // indirect + go.opentelemetry.io/collector v0.91.0 // indirect + go.opentelemetry.io/collector/consumer v0.91.0 // indirect go.opentelemetry.io/collector/pdata v1.0.0 // indirect - go.opentelemetry.io/collector/semconv v0.90.1 // indirect + go.opentelemetry.io/collector/semconv v0.91.0 // indirect go.opentelemetry.io/contrib/config v0.1.1 // indirect go.opentelemetry.io/contrib/propagators/b3 v1.21.1 // indirect go.opentelemetry.io/otel v1.21.0 // indirect diff --git a/processor/batchprocessor/go.mod b/processor/batchprocessor/go.mod index d35ad1f14df..f4dd3f16cc9 100644 --- a/processor/batchprocessor/go.mod +++ b/processor/batchprocessor/go.mod @@ -9,13 +9,13 @@ require ( github.com/prometheus/common v0.45.0 github.com/stretchr/testify v1.8.4 go.opencensus.io v0.24.0 - go.opentelemetry.io/collector v0.90.1 - go.opentelemetry.io/collector/component v0.90.1 - go.opentelemetry.io/collector/config/configtelemetry v0.90.1 - go.opentelemetry.io/collector/confmap v0.90.1 - go.opentelemetry.io/collector/consumer v0.90.1 + go.opentelemetry.io/collector v0.91.0 + go.opentelemetry.io/collector/component v0.91.0 + go.opentelemetry.io/collector/config/configtelemetry v0.91.0 + go.opentelemetry.io/collector/confmap v0.91.0 + go.opentelemetry.io/collector/consumer v0.91.0 go.opentelemetry.io/collector/pdata v1.0.0 - go.opentelemetry.io/collector/processor v0.90.1 + go.opentelemetry.io/collector/processor v0.91.0 go.opentelemetry.io/otel v1.21.0 go.opentelemetry.io/otel/exporters/prometheus v0.44.1-0.20231201153405-6027c1ae76f2 go.opentelemetry.io/otel/metric v1.21.0 diff --git a/processor/go.mod b/processor/go.mod index cb96f7d7dbf..5fbce367b1c 100644 --- a/processor/go.mod +++ b/processor/go.mod @@ -5,10 +5,10 @@ go 1.20 require ( github.com/stretchr/testify v1.8.4 go.opencensus.io v0.24.0 - go.opentelemetry.io/collector v0.90.1 - go.opentelemetry.io/collector/component v0.90.1 - go.opentelemetry.io/collector/config/configtelemetry v0.90.1 - go.opentelemetry.io/collector/consumer v0.90.1 + go.opentelemetry.io/collector v0.91.0 + go.opentelemetry.io/collector/component v0.91.0 + go.opentelemetry.io/collector/config/configtelemetry v0.91.0 + go.opentelemetry.io/collector/consumer v0.91.0 go.opentelemetry.io/collector/featuregate v1.0.0 go.opentelemetry.io/collector/pdata v1.0.0 go.opentelemetry.io/otel v1.21.0 @@ -47,7 +47,7 @@ require ( github.com/prometheus/common v0.45.0 // indirect github.com/prometheus/procfs v0.11.1 // indirect github.com/prometheus/statsd_exporter v0.22.7 // indirect - go.opentelemetry.io/collector/confmap v0.90.1 // indirect + go.opentelemetry.io/collector/confmap v0.91.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.44.1-0.20231201153405-6027c1ae76f2 // indirect go.opentelemetry.io/otel/sdk v1.21.0 // indirect go.opentelemetry.io/otel/sdk/metric v1.21.0 // indirect diff --git a/processor/memorylimiterprocessor/go.mod b/processor/memorylimiterprocessor/go.mod index 6040afecec0..62b7249a502 100644 --- a/processor/memorylimiterprocessor/go.mod +++ b/processor/memorylimiterprocessor/go.mod @@ -4,13 +4,13 @@ go 1.20 require ( github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector v0.90.1 - go.opentelemetry.io/collector/component v0.90.1 - go.opentelemetry.io/collector/config/configtelemetry v0.90.1 - go.opentelemetry.io/collector/confmap v0.90.1 - go.opentelemetry.io/collector/consumer v0.90.1 + go.opentelemetry.io/collector v0.91.0 + go.opentelemetry.io/collector/component v0.91.0 + go.opentelemetry.io/collector/config/configtelemetry v0.91.0 + go.opentelemetry.io/collector/confmap v0.91.0 + go.opentelemetry.io/collector/consumer v0.91.0 go.opentelemetry.io/collector/pdata v1.0.0 - go.opentelemetry.io/collector/processor v0.90.1 + go.opentelemetry.io/collector/processor v0.91.0 go.uber.org/zap v1.26.0 ) diff --git a/receiver/go.mod b/receiver/go.mod index 6c1c020793d..7a93d809989 100644 --- a/receiver/go.mod +++ b/receiver/go.mod @@ -5,10 +5,10 @@ go 1.20 require ( github.com/stretchr/testify v1.8.4 go.opencensus.io v0.24.0 - go.opentelemetry.io/collector v0.90.1 - go.opentelemetry.io/collector/component v0.90.1 - go.opentelemetry.io/collector/config/configtelemetry v0.90.1 - go.opentelemetry.io/collector/consumer v0.90.1 + go.opentelemetry.io/collector v0.91.0 + go.opentelemetry.io/collector/component v0.91.0 + go.opentelemetry.io/collector/config/configtelemetry v0.91.0 + go.opentelemetry.io/collector/consumer v0.91.0 go.opentelemetry.io/collector/featuregate v1.0.0 go.opentelemetry.io/collector/pdata v1.0.0 go.opentelemetry.io/otel v1.21.0 @@ -48,7 +48,7 @@ require ( github.com/prometheus/common v0.45.0 // indirect github.com/prometheus/procfs v0.11.1 // indirect github.com/prometheus/statsd_exporter v0.22.7 // indirect - go.opentelemetry.io/collector/confmap v0.90.1 // indirect + go.opentelemetry.io/collector/confmap v0.91.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.44.1-0.20231201153405-6027c1ae76f2 // indirect go.opentelemetry.io/otel/sdk/metric v1.21.0 // indirect golang.org/x/net v0.18.0 // indirect diff --git a/receiver/otlpreceiver/go.mod b/receiver/otlpreceiver/go.mod index b94dcc70b41..007ade23b2c 100644 --- a/receiver/otlpreceiver/go.mod +++ b/receiver/otlpreceiver/go.mod @@ -6,18 +6,18 @@ require ( github.com/gogo/protobuf v1.3.2 github.com/klauspost/compress v1.17.4 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector v0.90.1 - go.opentelemetry.io/collector/component v0.90.1 - go.opentelemetry.io/collector/config/configgrpc v0.90.1 - go.opentelemetry.io/collector/config/confighttp v0.90.1 - go.opentelemetry.io/collector/config/confignet v0.90.1 - go.opentelemetry.io/collector/config/configtelemetry v0.90.1 - go.opentelemetry.io/collector/config/configtls v0.90.1 - go.opentelemetry.io/collector/confmap v0.90.1 - go.opentelemetry.io/collector/consumer v0.90.1 + go.opentelemetry.io/collector v0.91.0 + go.opentelemetry.io/collector/component v0.91.0 + go.opentelemetry.io/collector/config/configgrpc v0.91.0 + go.opentelemetry.io/collector/config/confighttp v0.91.0 + go.opentelemetry.io/collector/config/confignet v0.91.0 + go.opentelemetry.io/collector/config/configtelemetry v0.91.0 + go.opentelemetry.io/collector/config/configtls v0.91.0 + go.opentelemetry.io/collector/confmap v0.91.0 + go.opentelemetry.io/collector/consumer v0.91.0 go.opentelemetry.io/collector/pdata v1.0.0 - go.opentelemetry.io/collector/receiver v0.90.1 - go.opentelemetry.io/collector/semconv v0.90.1 + go.opentelemetry.io/collector/receiver v0.91.0 + go.opentelemetry.io/collector/semconv v0.91.0 go.uber.org/zap v1.26.0 google.golang.org/genproto/googleapis/rpc v0.0.0-20231127180814-3a041ad873d4 google.golang.org/grpc v1.59.0 @@ -59,12 +59,12 @@ require ( github.com/prometheus/statsd_exporter v0.22.7 // indirect github.com/rs/cors v1.10.1 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/config/configauth v0.90.1 // indirect - go.opentelemetry.io/collector/config/configcompression v0.90.1 // indirect - go.opentelemetry.io/collector/config/configopaque v0.90.1 // indirect - go.opentelemetry.io/collector/config/internal v0.90.1 // indirect - go.opentelemetry.io/collector/extension v0.90.1 // indirect - go.opentelemetry.io/collector/extension/auth v0.90.1 // indirect + go.opentelemetry.io/collector/config/configauth v0.91.0 // indirect + go.opentelemetry.io/collector/config/configcompression v0.91.0 // indirect + go.opentelemetry.io/collector/config/configopaque v0.91.0 // indirect + go.opentelemetry.io/collector/config/internal v0.91.0 // indirect + go.opentelemetry.io/collector/extension v0.91.0 // indirect + go.opentelemetry.io/collector/extension/auth v0.91.0 // indirect go.opentelemetry.io/collector/featuregate v1.0.0 // indirect go.opentelemetry.io/contrib/config v0.1.1 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.1 // indirect diff --git a/service/go.mod b/service/go.mod index b656e043af8..e8a7eafca54 100644 --- a/service/go.mod +++ b/service/go.mod @@ -11,21 +11,21 @@ require ( github.com/shirou/gopsutil/v3 v3.23.11 github.com/stretchr/testify v1.8.4 go.opencensus.io v0.24.0 - go.opentelemetry.io/collector v0.90.1 - go.opentelemetry.io/collector/component v0.90.1 - go.opentelemetry.io/collector/config/confignet v0.90.1 - go.opentelemetry.io/collector/config/configtelemetry v0.90.1 - go.opentelemetry.io/collector/confmap v0.90.1 - go.opentelemetry.io/collector/connector v0.90.1 - go.opentelemetry.io/collector/consumer v0.90.1 - go.opentelemetry.io/collector/exporter v0.90.1 - go.opentelemetry.io/collector/extension v0.90.1 - go.opentelemetry.io/collector/extension/zpagesextension v0.90.1 + go.opentelemetry.io/collector v0.91.0 + go.opentelemetry.io/collector/component v0.91.0 + go.opentelemetry.io/collector/config/confignet v0.91.0 + go.opentelemetry.io/collector/config/configtelemetry v0.91.0 + go.opentelemetry.io/collector/confmap v0.91.0 + go.opentelemetry.io/collector/connector v0.91.0 + go.opentelemetry.io/collector/consumer v0.91.0 + go.opentelemetry.io/collector/exporter v0.91.0 + go.opentelemetry.io/collector/extension v0.91.0 + go.opentelemetry.io/collector/extension/zpagesextension v0.91.0 go.opentelemetry.io/collector/featuregate v1.0.0 go.opentelemetry.io/collector/pdata v1.0.0 - go.opentelemetry.io/collector/processor v0.90.1 - go.opentelemetry.io/collector/receiver v0.90.1 - go.opentelemetry.io/collector/semconv v0.90.1 + go.opentelemetry.io/collector/processor v0.91.0 + go.opentelemetry.io/collector/receiver v0.91.0 + go.opentelemetry.io/collector/semconv v0.91.0 go.opentelemetry.io/contrib/config v0.1.1 go.opentelemetry.io/contrib/propagators/b3 v1.21.1 go.opentelemetry.io/otel v1.21.0 diff --git a/versions.yaml b/versions.yaml index d5a98856a53..73dcb57025c 100644 --- a/versions.yaml +++ b/versions.yaml @@ -8,7 +8,7 @@ module-sets: - go.opentelemetry.io/collector/featuregate - go.opentelemetry.io/collector/pdata beta: - version: v0.90.1 + version: v0.91.0 modules: - go.opentelemetry.io/collector - go.opentelemetry.io/collector/cmd/builder From 0d8801fa67bb5529454d0ab654288be214c8d076 Mon Sep 17 00:00:00 2001 From: Dmitrii Anoshin Date: Mon, 11 Dec 2023 15:08:46 -0800 Subject: [PATCH 2/4] [chore] Remove unused yq tool (#9073) It's not need after https://github.com/open-telemetry/opentelemetry-collector/pull/8024 --- Makefile | 2 +- Makefile.Common | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 764e89a05ec..bfee6971f11 100644 --- a/Makefile +++ b/Makefile @@ -383,7 +383,7 @@ push-tags: $(MULTIMOD) done; .PHONY: check-changes -check-changes: $(YQ) +check-changes: $(MULTIMOD) # NOTE: ! inverses the return code of multimod diff. This is # because prepare-release expects a 0 if there are diffs and # non-0 if there are no diffs, which is the inverse of most diff --git a/Makefile.Common b/Makefile.Common index 82c2dcced4a..487e377233e 100644 --- a/Makefile.Common +++ b/Makefile.Common @@ -33,10 +33,9 @@ MULTIMOD := $(TOOLS_BIN_DIR)/multimod PORTO := $(TOOLS_BIN_DIR)/porto SEMCONVGEN := $(TOOLS_BIN_DIR)/semconvgen SEMCONVKIT := $(TOOLS_BIN_DIR)/semconvkit -YQ := $(TOOLS_BIN_DIR)/yq .PHONY: install-tools -install-tools: $(TOOLS_BIN_NAMES) $(YQ) +install-tools: $(TOOLS_BIN_NAMES) $(TOOLS_BIN_DIR): mkdir -p $@ @@ -44,9 +43,6 @@ $(TOOLS_BIN_DIR): $(TOOLS_BIN_NAMES): $(TOOLS_BIN_DIR) $(TOOLS_MOD_DIR)/go.mod cd $(TOOLS_MOD_DIR) && $(GOCMD) build -o $@ -trimpath $(filter %/$(notdir $@),$(TOOLS_PKG_NAMES)) -$(YQ): $(TOOLS_BIN_DIR) $(TOOLS_MOD_DIR)/go.mod - cd $(TOOLS_MOD_DIR) && $(GOCMD) build -o $@ -trimpath github.com/mikefarah/yq/v4 - .PHONY: test test: $(GOTEST) $(GOTEST_OPT) ./... From 52fed05336e5fd03f9013f088d0bb7b6d5484ac0 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 11 Dec 2023 16:57:12 -0800 Subject: [PATCH 3/4] Update github-actions deps (major) (#9080) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [actions/setup-go](https://togithub.com/actions/setup-go) | action | major | `v4` -> `v5` | | [actions/stale](https://togithub.com/actions/stale) | action | major | `v8` -> `v9` | --- ### Release Notes
actions/setup-go (actions/setup-go) ### [`v5`](https://togithub.com/actions/setup-go/compare/v4...v5) [Compare Source](https://togithub.com/actions/setup-go/compare/v4...v5)
actions/stale (actions/stale) ### [`v9`](https://togithub.com/actions/stale/compare/v8...v9) [Compare Source](https://togithub.com/actions/stale/compare/v8...v9)
--- ### Configuration 📅 **Schedule**: Branch creation - "on tuesday" (UTC), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 👻 **Immortal**: This PR will be recreated if closed unmerged. Get [config help](https://togithub.com/renovatebot/renovate/discussions) if that's undesired. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/open-telemetry/opentelemetry-collector). Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- .github/workflows/api-compatibility.yml | 2 +- .github/workflows/build-and-test-windows.yaml | 2 +- .github/workflows/build-and-test.yml | 14 +++++++------- .github/workflows/builder-integration-test.yaml | 2 +- .github/workflows/builder-release.yaml | 2 +- .github/workflows/changelog.yml | 2 +- .github/workflows/codeql-analysis.yml | 2 +- .github/workflows/contrib-tests.yml | 2 +- .github/workflows/perf.yml | 2 +- .github/workflows/prepare-release.yml | 2 +- .github/workflows/stale-pr.yaml | 2 +- .github/workflows/tidy-dependencies.yml | 2 +- 12 files changed, 18 insertions(+), 18 deletions(-) diff --git a/.github/workflows/api-compatibility.yml b/.github/workflows/api-compatibility.yml index de8bc0cd469..2a38f4ccd99 100644 --- a/.github/workflows/api-compatibility.yml +++ b/.github/workflows/api-compatibility.yml @@ -32,7 +32,7 @@ jobs: path: ${{ github.head_ref }} - name: Setup Go - uses: actions/setup-go@v4 + uses: actions/setup-go@v5 with: go-version: ~1.20.12 diff --git a/.github/workflows/build-and-test-windows.yaml b/.github/workflows/build-and-test-windows.yaml index 1a8f6115569..732a026ebba 100644 --- a/.github/workflows/build-and-test-windows.yaml +++ b/.github/workflows/build-and-test-windows.yaml @@ -17,7 +17,7 @@ jobs: - name: Checkout Repo uses: actions/checkout@v4 - name: Setup Go - uses: actions/setup-go@v4 + uses: actions/setup-go@v5 with: go-version: ~1.20.12 cache: false diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index 089b02668b8..2400aa12b3c 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -17,7 +17,7 @@ jobs: - name: Checkout Repo uses: actions/checkout@v4 - name: Setup Go - uses: actions/setup-go@v4 + uses: actions/setup-go@v5 with: go-version: ~1.20.12 cache: false @@ -40,7 +40,7 @@ jobs: - name: Checkout Repo uses: actions/checkout@v4 - name: Setup Go - uses: actions/setup-go@v4 + uses: actions/setup-go@v5 with: go-version: ~1.20.12 cache: false @@ -64,7 +64,7 @@ jobs: - name: Checkout Repo uses: actions/checkout@v4 - name: Setup Go - uses: actions/setup-go@v4 + uses: actions/setup-go@v5 with: go-version: ~1.20.12 cache: false @@ -89,7 +89,7 @@ jobs: - name: Checkout Repo uses: actions/checkout@v4 - name: Setup Go - uses: actions/setup-go@v4 + uses: actions/setup-go@v5 with: go-version: ~1.20.12 cache: false @@ -140,7 +140,7 @@ jobs: - name: Checkout Repo uses: actions/checkout@v4 - name: Setup Go - uses: actions/setup-go@v4 + uses: actions/setup-go@v5 with: go-version: ${{ matrix.go-version }} cache: false @@ -183,7 +183,7 @@ jobs: - name: Checkout Repo uses: actions/checkout@v4 - name: Setup Go - uses: actions/setup-go@v4 + uses: actions/setup-go@v5 with: go-version: ~1.20.6 cache: false @@ -251,7 +251,7 @@ jobs: - name: Checkout Repo uses: actions/checkout@v4 - name: Setup Go - uses: actions/setup-go@v4 + uses: actions/setup-go@v5 with: go-version: ~1.20.12 cache: false diff --git a/.github/workflows/builder-integration-test.yaml b/.github/workflows/builder-integration-test.yaml index d6689b1a8de..0dd446c4aa6 100644 --- a/.github/workflows/builder-integration-test.yaml +++ b/.github/workflows/builder-integration-test.yaml @@ -28,7 +28,7 @@ jobs: - name: Checkout Repo uses: actions/checkout@v4 - name: Setup Go - uses: actions/setup-go@v4 + uses: actions/setup-go@v5 with: go-version: ~1.20.12 - name: Test diff --git a/.github/workflows/builder-release.yaml b/.github/workflows/builder-release.yaml index 51d560f1985..5fb341a6e9c 100644 --- a/.github/workflows/builder-release.yaml +++ b/.github/workflows/builder-release.yaml @@ -14,7 +14,7 @@ jobs: with: fetch-depth: 0 - name: Setup Go - uses: actions/setup-go@v4 + uses: actions/setup-go@v5 with: go-version: ~1.20.12 - name: Run GoReleaser diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml index 64c11b27d92..71015ff5687 100644 --- a/.github/workflows/changelog.yml +++ b/.github/workflows/changelog.yml @@ -27,7 +27,7 @@ jobs: with: fetch-depth: 0 - name: Setup Go - uses: actions/setup-go@v4 + uses: actions/setup-go@v5 with: go-version: ~1.20.12 - name: Cache Go diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 166d65343af..fe864f6a118 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -17,7 +17,7 @@ jobs: uses: actions/checkout@v4 - name: Setup Go - uses: actions/setup-go@v4 + uses: actions/setup-go@v5 with: go-version: ~1.20.12 diff --git a/.github/workflows/contrib-tests.yml b/.github/workflows/contrib-tests.yml index c305af13cda..358a339af6f 100644 --- a/.github/workflows/contrib-tests.yml +++ b/.github/workflows/contrib-tests.yml @@ -21,7 +21,7 @@ jobs: - name: Checkout Repo uses: actions/checkout@v4 - name: Setup Go - uses: actions/setup-go@v4 + uses: actions/setup-go@v5 with: go-version: ~1.20.12 cache: false diff --git a/.github/workflows/perf.yml b/.github/workflows/perf.yml index 515f56fe4e2..10055b629d4 100644 --- a/.github/workflows/perf.yml +++ b/.github/workflows/perf.yml @@ -11,7 +11,7 @@ jobs: - uses: actions/checkout@v4 - name: Setup Go - uses: actions/setup-go@v4 + uses: actions/setup-go@v5 with: go-version: ~1.20.12 diff --git a/.github/workflows/prepare-release.yml b/.github/workflows/prepare-release.yml index 6b7d6d9448c..b51b1384d77 100644 --- a/.github/workflows/prepare-release.yml +++ b/.github/workflows/prepare-release.yml @@ -51,7 +51,7 @@ jobs: REPO: open-telemetry/opentelemetry-collector-contrib run: ./.github/workflows/scripts/release-check-build-status.sh - name: Setup Go - uses: actions/setup-go@v4 + uses: actions/setup-go@v5 with: go-version: ~1.20.12 # Prepare Core for release. diff --git a/.github/workflows/stale-pr.yaml b/.github/workflows/stale-pr.yaml index 355edc64da4..c361451b17d 100644 --- a/.github/workflows/stale-pr.yaml +++ b/.github/workflows/stale-pr.yaml @@ -7,7 +7,7 @@ jobs: stale: runs-on: ubuntu-latest steps: - - uses: actions/stale@v8 + - uses: actions/stale@v9 with: repo-token: ${{ secrets.GITHUB_TOKEN }} stale-pr-message: 'This PR was marked stale due to lack of activity. It will be closed in 14 days.' diff --git a/.github/workflows/tidy-dependencies.yml b/.github/workflows/tidy-dependencies.yml index e4473a3a291..525880293d5 100644 --- a/.github/workflows/tidy-dependencies.yml +++ b/.github/workflows/tidy-dependencies.yml @@ -14,7 +14,7 @@ jobs: - uses: actions/checkout@v4 with: ref: ${{ github.head_ref }} - - uses: actions/setup-go@v4 + - uses: actions/setup-go@v5 with: go-version: ~1.20.12 cache: false From 6d5b45fe67ce08befbad3802f4c7fb7bc50b8c62 Mon Sep 17 00:00:00 2001 From: Alex Boten Date: Tue, 12 Dec 2023 01:58:19 -0800 Subject: [PATCH 4/4] [chore] add github action to generate semconv pr (#9064) This is similar to the workflow used by the jmx gatherer PR in the collector contrib repo. --------- Signed-off-by: Alex Boten --- .../generate-semantic-conventions-pr.yaml | 107 ++++++++++++++++++ 1 file changed, 107 insertions(+) create mode 100644 .github/workflows/generate-semantic-conventions-pr.yaml diff --git a/.github/workflows/generate-semantic-conventions-pr.yaml b/.github/workflows/generate-semantic-conventions-pr.yaml new file mode 100644 index 00000000000..7543a044d4d --- /dev/null +++ b/.github/workflows/generate-semantic-conventions-pr.yaml @@ -0,0 +1,107 @@ +name: Generate Semantic Conventions PR + +on: + schedule: + # Daily at 01:30 (UTC) + - cron: '30 1 * * *' + workflow_dispatch: + +jobs: + check-versions: + runs-on: ubuntu-latest + outputs: + latest-version: ${{ steps.check-versions.outputs.latest-version }} + already-added: ${{ steps.check-versions.outputs.already-added }} + already-opened: ${{ steps.check-versions.outputs.already-opened }} + steps: + - uses: actions/checkout@v4 + + - id: check-versions + name: Check versions + env: + GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + run: | + # version in this repo are prefixed with v + latest_version=v$(gh release view \ + --repo open-telemetry/semantic-conventions \ + --json tagName \ + --jq .tagName \ + | sed 's/^v//') + + rc=$(find semconv -name $latest_version | grep .) + if $rc == 0; then + already_added=true + fi + + matches=$(gh pr list \ + --author opentelemetrybot \ + --state open \ + --search "in:title \"Add semantic conventions version $latest_version\"") + if [ ! -z "$matches" ] + then + already_opened=true + fi + + echo "latest-version=$latest_version" >> $GITHUB_OUTPUT + echo "already-added=$already_added" >> $GITHUB_OUTPUT + echo "already-opened=$already_opened" >> $GITHUB_OUTPUT + + update-semantic-conventions: + runs-on: ubuntu-latest + if: | + needs.check-versions.outputs.already-added != 'true' && + needs.check-versions.outputs.already-opened != 'true' + needs: + - check-versions + steps: + - uses: actions/checkout@v4 + - name: Checkout semantic-convention + uses: actions/checkout@v4 + with: + repository: open-telemetry/semantic-convention + path: tmp-semantic-conventions + + - name: Update version + env: + VERSION: ${{ needs.check-versions.outputs.latest-version }} + run: | + make gensemconv SPECPATH=./tmp-semantic-conventions SPECTAG=$VERSION + git diff + + - name: Use CLA approved github bot + run: | + git config user.name opentelemetrybot + git config user.email 107717825+opentelemetrybot@users.noreply.github.com + + - name: Create pull request against main + env: + VERSION: ${{ needs.check-versions.outputs.latest-version }} + # not using secrets.GITHUB_TOKEN since pull requests from that token do not run workflows + GH_TOKEN: ${{ secrets.OPENTELEMETRYBOT_GITHUB_TOKEN }} + run: | + message="Add semantic conventions version $VERSION" + body="Add semantic conventions version \`$VERSION\`." + branch="opentelemetrybot/add-semantic-conventions-${VERSION}" + + git checkout -b $branch + git add semconv/ + git commit -m "$message" + git push --set-upstream origin $branch + url=$(gh pr create --title "$message" \ + --body "$body" \ + --base main) + + pull_request_number=${url//*\//} + + # see the template for change log entry file at blob/main/.chloggen/TEMPLATE.yaml + cat > .chloggen/semconv-$VERSION.yaml << EOF + change_type: enhancement + component: semconv + note: Add semantic conventions version $VERSION + issues: [ $pull_request_number ] + EOF + + git add .chloggen/semconv-$VERSION.yaml + + git commit -m "Add change log entry" + git push