From 78b913b541b3088ac3a64c6c3570c9a554f9247e Mon Sep 17 00:00:00 2001 From: Joshua MacDonald Date: Fri, 17 Jan 2025 11:00:51 -0800 Subject: [PATCH] Use the v0.117.0 builder, update otelarrowcol build to 117 (#279) Finishes the work done in #277. --- CHANGELOG.md | 6 ++++-- Makefile | 2 +- collector/cmd/otelarrowcol/components.go | 24 ++++++++++++------------ collector/cmd/otelarrowcol/go.mod | 10 +++++----- collector/otelarrowcol-build.yaml | 16 ++++++++-------- 5 files changed, 30 insertions(+), 28 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b6ea9135..1699dfab 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,8 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm ## Unreleased +- Update to v0.117.0 collector dependencies. [#277](https://github.com/open-telemetry/otel-arrow/pull/277), [#279](https://github.com/open-telemetry/otel-arrow/pull/279) + ## [0.31.0](https://github.com/open-telemetry/otel-arrow/releases/tag/v0.31.0) - 2024-11-19 - Update to v0.114.0 collector dependencies. [#274](https://github.com/open-telemetry/otel-arrow/pull/274) @@ -31,7 +33,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm - Concurrent batch processor: concurrency limit for legacy behavior or otherwise. [#254](https://github.com/open-telemetry/otel-arrow/pull/254) - Concurrent batch processor: EarlyReturn legacy compat feature. [#253](https://github.com/open-telemetry/otel-arrow/pull/253) -- Concurrent batch processor: Synchronize with upstream; removes in-flight bytes metric, +- Concurrent batch processor: Synchronize with upstream; removes in-flight bytes metric, removes panic recovery as unnecessary divergence. [#251](https://github.com/open-telemetry/otel-arrow/pull/251) - Update collector dependencies to v0.110.0/v1.16.0; remove validation connector [#252](https://github.com/open-telemetry/otel-arrow/pull/252) @@ -182,7 +184,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm ## [0.6.0](https://github.com/open-telemetry/otel-arrow/releases/tag/v0.6.0) - 2023-10-17 -- Collector v0.87.0 dependency updates, CI/minor memory optimization (#65). +- Collector v0.87.0 dependency updates, CI/minor memory optimization (#65). ## [0.5.0](https://github.com/open-telemetry/otel-arrow/releases/tag/v0.5.0) diff --git a/Makefile b/Makefile index f1952885..4eda0ccd 100644 --- a/Makefile +++ b/Makefile @@ -103,7 +103,7 @@ endif BUILDER = builder .PHONY: $(BUILDER) builder: - $(GOCMD) install go.opentelemetry.io/collector/cmd/builder@v0.114.0 + $(GOCMD) install go.opentelemetry.io/collector/cmd/builder@v0.117.0 .PHONY: genotelarrowcol genotelarrowcol: builder diff --git a/collector/cmd/otelarrowcol/components.go b/collector/cmd/otelarrowcol/components.go index f7991a73..49c6e88c 100644 --- a/collector/cmd/otelarrowcol/components.go +++ b/collector/cmd/otelarrowcol/components.go @@ -37,9 +37,9 @@ func components() (otelcol.Factories, error) { return otelcol.Factories{}, err } factories.ExtensionModules = make(map[component.Type]string, len(factories.Extensions)) - factories.ExtensionModules[headerssetterextension.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/extension/headerssetterextension v0.113.0" - factories.ExtensionModules[basicauthextension.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/extension/basicauthextension v0.113.0" - factories.ExtensionModules[pprofextension.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/extension/pprofextension v0.113.0" + factories.ExtensionModules[headerssetterextension.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/extension/headerssetterextension v0.117.0" + factories.ExtensionModules[basicauthextension.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/extension/basicauthextension v0.117.0" + factories.ExtensionModules[pprofextension.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/extension/pprofextension v0.117.0" factories.Receivers, err = receiver.MakeFactoryMap( otelarrowreceiver.NewFactory(), @@ -50,9 +50,9 @@ func components() (otelcol.Factories, error) { return otelcol.Factories{}, err } factories.ReceiverModules = make(map[component.Type]string, len(factories.Receivers)) - factories.ReceiverModules[otelarrowreceiver.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/otelarrowreceiver v0.113.0" - factories.ReceiverModules[filereceiver.NewFactory().Type()] = "github.com/open-telemetry/otel-arrow/collector/receiver/filereceiver v0.30.0" - factories.ReceiverModules[otlpreceiver.NewFactory().Type()] = "go.opentelemetry.io/collector/receiver/otlpreceiver v0.113.0" + factories.ReceiverModules[otelarrowreceiver.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/otelarrowreceiver v0.117.0" + factories.ReceiverModules[filereceiver.NewFactory().Type()] = "github.com/open-telemetry/otel-arrow/collector/receiver/filereceiver v0.31.0" + factories.ReceiverModules[otlpreceiver.NewFactory().Type()] = "go.opentelemetry.io/collector/receiver/otlpreceiver v0.117.0" factories.Exporters, err = exporter.MakeFactoryMap( otelarrowexporter.NewFactory(), @@ -64,10 +64,10 @@ func components() (otelcol.Factories, error) { return otelcol.Factories{}, err } factories.ExporterModules = make(map[component.Type]string, len(factories.Exporters)) - factories.ExporterModules[otelarrowexporter.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/otelarrowexporter v0.113.0" - factories.ExporterModules[debugexporter.NewFactory().Type()] = "go.opentelemetry.io/collector/exporter/debugexporter v0.113.0" - factories.ExporterModules[otlphttpexporter.NewFactory().Type()] = "go.opentelemetry.io/collector/exporter/otlphttpexporter v0.113.0" - factories.ExporterModules[fileexporter.NewFactory().Type()] = "github.com/open-telemetry/otel-arrow/collector/exporter/fileexporter v0.30.0" + factories.ExporterModules[otelarrowexporter.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/otelarrowexporter v0.117.0" + factories.ExporterModules[debugexporter.NewFactory().Type()] = "go.opentelemetry.io/collector/exporter/debugexporter v0.117.0" + factories.ExporterModules[otlphttpexporter.NewFactory().Type()] = "go.opentelemetry.io/collector/exporter/otlphttpexporter v0.117.0" + factories.ExporterModules[fileexporter.NewFactory().Type()] = "github.com/open-telemetry/otel-arrow/collector/exporter/fileexporter v0.31.0" factories.Processors, err = processor.MakeFactoryMap( concurrentbatchprocessor.NewFactory(), @@ -77,8 +77,8 @@ func components() (otelcol.Factories, error) { return otelcol.Factories{}, err } factories.ProcessorModules = make(map[component.Type]string, len(factories.Processors)) - factories.ProcessorModules[concurrentbatchprocessor.NewFactory().Type()] = "github.com/open-telemetry/otel-arrow/collector/processor/concurrentbatchprocessor v0.30.0" - factories.ProcessorModules[obfuscationprocessor.NewFactory().Type()] = "github.com/open-telemetry/otel-arrow/collector/processor/obfuscationprocessor v0.30.0" + factories.ProcessorModules[concurrentbatchprocessor.NewFactory().Type()] = "github.com/open-telemetry/otel-arrow/collector/processor/concurrentbatchprocessor v0.31.0" + factories.ProcessorModules[obfuscationprocessor.NewFactory().Type()] = "github.com/open-telemetry/otel-arrow/collector/processor/obfuscationprocessor v0.31.0" factories.Connectors, err = connector.MakeFactoryMap( ) diff --git a/collector/cmd/otelarrowcol/go.mod b/collector/cmd/otelarrowcol/go.mod index f83ae23c..ab6cb49e 100644 --- a/collector/cmd/otelarrowcol/go.mod +++ b/collector/cmd/otelarrowcol/go.mod @@ -4,7 +4,7 @@ module github.com/open-telemetry/otel-arrow/collector/cmd/otelarrowcol go 1.22.0 -toolchain go1.22.7 +toolchain go1.22.2 require ( github.com/open-telemetry/opentelemetry-collector-contrib/exporter/otelarrowexporter v0.117.0 @@ -12,10 +12,10 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/extension/headerssetterextension v0.117.0 github.com/open-telemetry/opentelemetry-collector-contrib/extension/pprofextension v0.117.0 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/otelarrowreceiver v0.117.0 - github.com/open-telemetry/otel-arrow/collector/exporter/fileexporter v0.33.0 - github.com/open-telemetry/otel-arrow/collector/processor/concurrentbatchprocessor v0.33.0 - github.com/open-telemetry/otel-arrow/collector/processor/obfuscationprocessor v0.33.0 - github.com/open-telemetry/otel-arrow/collector/receiver/filereceiver v0.33.0 + github.com/open-telemetry/otel-arrow/collector/exporter/fileexporter v0.31.0 + github.com/open-telemetry/otel-arrow/collector/processor/concurrentbatchprocessor v0.31.0 + github.com/open-telemetry/otel-arrow/collector/processor/obfuscationprocessor v0.31.0 + github.com/open-telemetry/otel-arrow/collector/receiver/filereceiver v0.31.0 go.opentelemetry.io/collector/component v0.117.0 go.opentelemetry.io/collector/confmap v1.23.0 go.opentelemetry.io/collector/confmap/provider/envprovider v1.23.0 diff --git a/collector/otelarrowcol-build.yaml b/collector/otelarrowcol-build.yaml index e65631ba..da175486 100644 --- a/collector/otelarrowcol-build.yaml +++ b/collector/otelarrowcol-build.yaml @@ -27,29 +27,29 @@ dist: exporters: # This is the core OpenTelemetry Protocol with Apache Arrow exporter - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/otelarrowexporter v0.113.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/otelarrowexporter v0.117.0 - - gomod: go.opentelemetry.io/collector/exporter/debugexporter v0.113.0 - - gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.113.0 + - gomod: go.opentelemetry.io/collector/exporter/debugexporter v0.117.0 + - gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.117.0 - gomod: github.com/open-telemetry/otel-arrow/collector/exporter/fileexporter v0.31.0 receivers: # This is the core OpenTelemetry Protocol with Apache Arrow receiver - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/otelarrowreceiver v0.113.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/otelarrowreceiver v0.117.0 - gomod: github.com/open-telemetry/otel-arrow/collector/receiver/filereceiver v0.31.0 # Users wanting the OTLP/HTTP Receiver will use the otlp receiver. # Users wanting OTLP/gRPC may use the otelarrowreceiver. - - gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.113.0 + - gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.117.0 processors: - gomod: github.com/open-telemetry/otel-arrow/collector/processor/concurrentbatchprocessor v0.31.0 - gomod: github.com/open-telemetry/otel-arrow/collector/processor/obfuscationprocessor v0.31.0 extensions: - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/headerssetterextension v0.113.0 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/basicauthextension v0.113.0 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/pprofextension v0.113.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/headerssetterextension v0.117.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/basicauthextension v0.117.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/pprofextension v0.117.0 replaces: