diff --git a/CHANGELOG.md b/CHANGELOG.md index 9b691ec5..91371d61 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 +## [0.25.0](https://github.com/open-telemetry/otel-arrow/releases/tag/v0.24.0) - 2024-07-17 + - Wrap concurrentbatchprocessor errors [#235](https://github.com/open-telemetry/otel-arrow/pull/235) - Update to OTel-Collector v0.105.0, which includes the OTel-Arrow components. [#233](https://github.com/open-telemetry/otel-arrow/pull/233) - Remove the primary exporter/receiver components, update references and documentation. [#230](https://github.com/open-telemetry/otel-arrow/pull/230) diff --git a/collector/cmd/otelarrowcol/components.go b/collector/cmd/otelarrowcol/components.go index 0e62a1ed..73fa17e5 100644 --- a/collector/cmd/otelarrowcol/components.go +++ b/collector/cmd/otelarrowcol/components.go @@ -52,7 +52,7 @@ func components() (otelcol.Factories, error) { } 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.105.0" - factories.ReceiverModules[filereceiver.NewFactory().Type()] = "github.com/open-telemetry/otel-arrow/collector/receiver/filereceiver v0.24.0" + factories.ReceiverModules[filereceiver.NewFactory().Type()] = "github.com/open-telemetry/otel-arrow/collector/receiver/filereceiver v0.25.0" factories.ReceiverModules[otlpreceiver.NewFactory().Type()] = "go.opentelemetry.io/collector/receiver/otlpreceiver v0.105.0" factories.Exporters, err = exporter.MakeFactoryMap( @@ -68,7 +68,7 @@ func components() (otelcol.Factories, error) { factories.ExporterModules[otelarrowexporter.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/otelarrowexporter v0.105.0" factories.ExporterModules[debugexporter.NewFactory().Type()] = "go.opentelemetry.io/collector/exporter/debugexporter v0.105.0" factories.ExporterModules[otlphttpexporter.NewFactory().Type()] = "go.opentelemetry.io/collector/exporter/otlphttpexporter v0.105.0" - factories.ExporterModules[fileexporter.NewFactory().Type()] = "github.com/open-telemetry/otel-arrow/collector/exporter/fileexporter v0.24.0" + factories.ExporterModules[fileexporter.NewFactory().Type()] = "github.com/open-telemetry/otel-arrow/collector/exporter/fileexporter v0.25.0" factories.Processors, err = processor.MakeFactoryMap( concurrentbatchprocessor.NewFactory(), @@ -78,8 +78,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.24.0" - factories.ProcessorModules[obfuscationprocessor.NewFactory().Type()] = "github.com/open-telemetry/otel-arrow/collector/processor/obfuscationprocessor v0.24.0" + factories.ProcessorModules[concurrentbatchprocessor.NewFactory().Type()] = "github.com/open-telemetry/otel-arrow/collector/processor/concurrentbatchprocessor v0.25.0" + factories.ProcessorModules[obfuscationprocessor.NewFactory().Type()] = "github.com/open-telemetry/otel-arrow/collector/processor/obfuscationprocessor v0.25.0" factories.Connectors, err = connector.MakeFactoryMap( validationconnector.NewFactory(), @@ -88,7 +88,7 @@ func components() (otelcol.Factories, error) { return otelcol.Factories{}, err } factories.ConnectorModules = make(map[component.Type]string, len(factories.Connectors)) - factories.ConnectorModules[validationconnector.NewFactory().Type()] = "github.com/open-telemetry/otel-arrow/collector/connector/validationconnector v0.24.0" + factories.ConnectorModules[validationconnector.NewFactory().Type()] = "github.com/open-telemetry/otel-arrow/collector/connector/validationconnector v0.25.0" return factories, nil } diff --git a/collector/cmd/otelarrowcol/go.mod b/collector/cmd/otelarrowcol/go.mod index 6ef2afcf..5bc279f1 100644 --- a/collector/cmd/otelarrowcol/go.mod +++ b/collector/cmd/otelarrowcol/go.mod @@ -12,11 +12,11 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/extension/headerssetterextension v0.105.0 github.com/open-telemetry/opentelemetry-collector-contrib/extension/pprofextension v0.105.0 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/otelarrowreceiver v0.105.0 - github.com/open-telemetry/otel-arrow/collector/connector/validationconnector v0.24.0 - github.com/open-telemetry/otel-arrow/collector/exporter/fileexporter v0.24.0 - github.com/open-telemetry/otel-arrow/collector/processor/concurrentbatchprocessor v0.24.0 - github.com/open-telemetry/otel-arrow/collector/processor/obfuscationprocessor v0.24.0 - github.com/open-telemetry/otel-arrow/collector/receiver/filereceiver v0.24.0 + github.com/open-telemetry/otel-arrow/collector/connector/validationconnector v0.25.0 + github.com/open-telemetry/otel-arrow/collector/exporter/fileexporter v0.25.0 + github.com/open-telemetry/otel-arrow/collector/processor/concurrentbatchprocessor v0.25.0 + github.com/open-telemetry/otel-arrow/collector/processor/obfuscationprocessor v0.25.0 + github.com/open-telemetry/otel-arrow/collector/receiver/filereceiver v0.25.0 go.opentelemetry.io/collector/component v0.105.0 go.opentelemetry.io/collector/confmap v0.105.0 go.opentelemetry.io/collector/confmap/converter/expandconverter v0.105.0 @@ -41,6 +41,7 @@ require ( github.com/GehirnInc/crypt v0.0.0-20200316065508-bb7000b8a962 // indirect github.com/HdrHistogram/hdrhistogram-go v1.1.2 // indirect github.com/apache/arrow/go/v16 v16.1.0 // indirect + github.com/apache/arrow/go/v17 v17.0.0 // indirect github.com/axiomhq/hyperloglog v0.0.0-20230201085229-3ddf4bad03dc // indirect github.com/bahlo/generic-list-go v0.2.0 // indirect github.com/beorn7/perks v1.0.1 // indirect @@ -63,7 +64,7 @@ require ( github.com/go-ole/go-ole v1.2.6 // indirect github.com/go-stack/stack v1.8.1 // indirect github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect - github.com/goccy/go-json v0.10.2 // indirect + github.com/goccy/go-json v0.10.3 // indirect github.com/gofrs/uuid v4.4.0+incompatible // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect @@ -76,7 +77,7 @@ require ( 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/cpuid/v2 v2.2.7 // indirect + github.com/klauspost/cpuid/v2 v2.2.8 // 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 @@ -90,8 +91,8 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/mostynb/go-grpc-compression v1.2.3 // indirect github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect - github.com/open-telemetry/otel-arrow v0.24.0 // indirect - github.com/open-telemetry/otel-arrow/collector v0.24.0 // indirect + github.com/open-telemetry/otel-arrow v0.25.0 // indirect + github.com/open-telemetry/otel-arrow/collector v0.25.0 // indirect github.com/pierrec/lz4/v4 v4.1.21 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect @@ -160,11 +161,11 @@ require ( go.uber.org/zap v1.27.0 // indirect golang.org/x/crypto v0.25.0 // indirect golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 // indirect - golang.org/x/mod v0.17.0 // indirect + golang.org/x/mod v0.18.0 // indirect golang.org/x/net v0.27.0 // indirect golang.org/x/sync v0.7.0 // indirect golang.org/x/text v0.16.0 // indirect - golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect + golang.org/x/tools v0.22.0 // indirect golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect gonum.org/v1/gonum v0.15.0 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20240701130421-f6361c86f094 // indirect @@ -174,3 +175,17 @@ require ( gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) + +replace github.com/open-telemetry/otel-arrow => ../../../ + +replace github.com/open-telemetry/otel-arrow/collector => ../../ + +replace github.com/open-telemetry/otel-arrow/collector/connector/validationconnector => ../../connector/validationconnector + +replace github.com/open-telemetry/otel-arrow/collector/exporter/fileexporter => ../../exporter/fileexporter + +replace github.com/open-telemetry/otel-arrow/collector/receiver/filereceiver => ../../receiver/filereceiver + +replace github.com/open-telemetry/otel-arrow/collector/processor/concurrentbatchprocessor => ../../processor/concurrentbatchprocessor + +replace github.com/open-telemetry/otel-arrow/collector/processor/obfuscationprocessor => ../../processor/obfuscationprocessor diff --git a/collector/cmd/otelarrowcol/go.sum b/collector/cmd/otelarrowcol/go.sum index 69145828..ef0493f9 100644 --- a/collector/cmd/otelarrowcol/go.sum +++ b/collector/cmd/otelarrowcol/go.sum @@ -95,6 +95,8 @@ github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kd github.com/apache/arrow/go/arrow v0.0.0-20191024131854-af6fa24be0db/go.mod h1:VTxUBvSJ3s3eHAg65PNgrsn5BtqCRPdmyXh6rAfdxN0= github.com/apache/arrow/go/v16 v16.1.0 h1:dwgfOya6s03CzH9JrjCBx6bkVb4yPD4ma3haj9p7FXI= github.com/apache/arrow/go/v16 v16.1.0/go.mod h1:9wnc9mn6vEDTRIm4+27pEjQpRKuTvBaessPoEXQzxWA= +github.com/apache/arrow/go/v17 v17.0.0 h1:RRR2bdqKcdbss9Gxy2NS/hK8i4LDMh23L6BbkN5+F54= +github.com/apache/arrow/go/v17 v17.0.0/go.mod h1:jR7QHkODl15PfYyjM2nU+yTLScZ/qfj7OSUZmJ8putc= github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY= @@ -371,8 +373,8 @@ github.com/gobwas/ws v1.0.2/go.mod h1:szmBTxLgaFppYjEmNtny/v3w89xOydFnnZMcgRRu/E github.com/gobwas/ws v1.1.0/go.mod h1:nzvNcVha5eUziGrbxFCo6qFIojQHjJV5cLYIbezhfL0= github.com/goccy/go-json v0.9.7/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I= github.com/goccy/go-json v0.9.11/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I= -github.com/goccy/go-json v0.10.2 h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU= -github.com/goccy/go-json v0.10.2/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I= +github.com/goccy/go-json v0.10.3 h1:KZ5WoDbxAIgm2HNbYckL0se1fHD6rz5j4ywS6ebzDqA= +github.com/goccy/go-json v0.10.3/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M= github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= github.com/gofrs/flock v0.8.1/go.mod h1:F1TvTiK9OcQqauNUHlbJvyl9Qa1QvF/gOUDKA14jxHU= github.com/gofrs/uuid v3.3.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= @@ -642,8 +644,8 @@ github.com/klauspost/compress v1.17.9 h1:6KIumPrER1LHsvBVuDa0r5xaG0Es51mhhB9BQB2 github.com/klauspost/compress v1.17.9/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw= github.com/klauspost/cpuid v0.0.0-20170728055534-ae7887de9fa5/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek= github.com/klauspost/cpuid v1.2.1/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek= -github.com/klauspost/cpuid/v2 v2.2.7 h1:ZWSB3igEs+d0qvnxR/ZBzXVmxkgt8DdzP6m9pfuVLDM= -github.com/klauspost/cpuid/v2 v2.2.7/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws= +github.com/klauspost/cpuid/v2 v2.2.8 h1:+StwCXwm9PdpiEkPyzBXIy+M9KUb4ODm0Zarf1kS5BM= +github.com/klauspost/cpuid/v2 v2.2.8/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws= github.com/klauspost/crc32 v0.0.0-20161016154125-cb6bfca970f6/go.mod h1:+ZoRqAPRLkC4NPOvfYeR5KNOrY6TD+/sAC3HXPZgDYg= github.com/klauspost/pgzip v1.0.2-0.20170402124221-0bf5dcad4ada/go.mod h1:Ch1tH69qFZu15pkjo5kYi6mth2Zzwzt50oCQKQE9RUs= github.com/knadh/koanf/maps v0.1.1 h1:G5TjmUh2D7G2YWf5SQQqSiHRJEjaicvU0KpypqB3NIs= @@ -805,20 +807,6 @@ github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.105 github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.105.0/go.mod h1:I+fL3494NrarNgHHs2D7kz0v02KGCmwmp3L89KUqENA= github.com/open-telemetry/opentelemetry-collector-contrib/receiver/otelarrowreceiver v0.105.0 h1:y+b6+9ORCeW/d95RmeigIu4EhphAlXugPXyzB+xR6fM= github.com/open-telemetry/opentelemetry-collector-contrib/receiver/otelarrowreceiver v0.105.0/go.mod h1:uBo+IY0YGKaBJxULNnCSCFdTHRtM56KMSBhM133zTIo= -github.com/open-telemetry/otel-arrow v0.24.0 h1:hNUEbwHW/1gEOUiN+HoI+ITiXe2vSBaPWlE9FRwJwDE= -github.com/open-telemetry/otel-arrow v0.24.0/go.mod h1:uzoHixEh6CUBZkP+vkRvyiHYUnYsAOUwCcfByQkSMM0= -github.com/open-telemetry/otel-arrow/collector v0.24.0 h1:NYTcgtwG0lQnoGcEomTTtueZxzk03xt+XEXN4L5kqHA= -github.com/open-telemetry/otel-arrow/collector v0.24.0/go.mod h1:+jJ3Vfhh685hXSw2Z1P1wl/rTqEKlSaJ4FocZI+xs+0= -github.com/open-telemetry/otel-arrow/collector/connector/validationconnector v0.24.0 h1:6+3Y4eDMBDMJcHkEnqaXLqt5EycDbtCEyeQlSfVCxck= -github.com/open-telemetry/otel-arrow/collector/connector/validationconnector v0.24.0/go.mod h1:5txV07w99k1stJKYHYOSrYa5Ur7VWvh9qVAfGOqfR6I= -github.com/open-telemetry/otel-arrow/collector/exporter/fileexporter v0.24.0 h1:g2OOduQydi7ZIuX8c7BkPWDVAYN2mTGAUa1s4emmy48= -github.com/open-telemetry/otel-arrow/collector/exporter/fileexporter v0.24.0/go.mod h1:5IHrZAjfjjbBRF30hpixr6yB7P2NU8smAXrnQLIJLt8= -github.com/open-telemetry/otel-arrow/collector/processor/concurrentbatchprocessor v0.24.0 h1:zcvNC5p+ByUjAohxWhwYSRTqgWa2LXh0Ev3hLVtNvR0= -github.com/open-telemetry/otel-arrow/collector/processor/concurrentbatchprocessor v0.24.0/go.mod h1:Nd3PpjIyv2DcPhHeU09z1aRh42CdpkxT96amdQi5dmM= -github.com/open-telemetry/otel-arrow/collector/processor/obfuscationprocessor v0.24.0 h1:N2jLd6Mx+Ds9y56pOZL2XTzlNMHIoNzrE1g6csju8mg= -github.com/open-telemetry/otel-arrow/collector/processor/obfuscationprocessor v0.24.0/go.mod h1:NeabvLcfy79b/VsIAYNdBxlX+QvFXFcx1cRGsyLd2m0= -github.com/open-telemetry/otel-arrow/collector/receiver/filereceiver v0.24.0 h1:KRlKK+t/NI6YD+kodBOqs8Tq4JLcfS74MQpC+OJNmRU= -github.com/open-telemetry/otel-arrow/collector/receiver/filereceiver v0.24.0/go.mod h1:aeAOKEqwuj+dR5e+SI2jZNaTziZTM1Lt2wMqIFN8jUg= github.com/opentracing/opentracing-go v1.0.2/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= github.com/opentracing/opentracing-go v1.0.3-0.20180606204148-bd9c31933947/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= @@ -1319,8 +1307,8 @@ golang.org/x/mod v0.6.0/go.mod h1:4mET923SAdbXp2ki8ey+zGs1SLqsuM2Y0uvdZR/fUNI= golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/mod v0.10.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/mod v0.11.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= -golang.org/x/mod v0.17.0 h1:zY54UmvipHiNd+pm+m0x9KhZ9hl1/7QNMyxXbc6ICqA= -golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= +golang.org/x/mod v0.18.0 h1:5+9lSbEzPSdWkH32vYPBwEpX8KwDbM52Ud9xBUvNlb0= +golang.org/x/mod v0.18.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= golang.org/x/net v0.0.0-20180218175443-cbe0f9307d01/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180719180050-a680a1efc54d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -1648,8 +1636,8 @@ golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc golang.org/x/tools v0.2.0/go.mod h1:y4OqIKeOV/fWJetJ8bXPU1sEVniLMIyDAZWeHdV+NTA= golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= golang.org/x/tools v0.9.1/go.mod h1:owI94Op576fPu3cIGQeHs3joujW/2Oc6MtlxbF5dfNc= -golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d h1:vU5i/LfpvrRCpgM/VPfJLg5KjxD3E+hfT1SH+d9zLwg= -golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk= +golang.org/x/tools v0.22.0 h1:gqSGLZqv+AI9lIQzniJ0nZDRG5GBPsSi+DRNHWNz6yA= +golang.org/x/tools v0.22.0/go.mod h1:aCwcsjqvq7Yqt6TNyX7QMU2enbQ/Gt0bo6krSeEri+c= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= diff --git a/collector/cmd/otelarrowcol/main.go b/collector/cmd/otelarrowcol/main.go index 98cd0c48..16f67f86 100644 --- a/collector/cmd/otelarrowcol/main.go +++ b/collector/cmd/otelarrowcol/main.go @@ -21,7 +21,7 @@ func main() { info := component.BuildInfo{ Command: "otelarrowcol", Description: "OpenTelemetry Protocol with Apache Arrow development collector, for testing and evaluation", - Version: "0.24.0", + Version: "0.25.0", } set := otelcol.CollectorSettings{ diff --git a/collector/connector/validationconnector/go.mod b/collector/connector/validationconnector/go.mod index 97f05d97..7eefe977 100644 --- a/collector/connector/validationconnector/go.mod +++ b/collector/connector/validationconnector/go.mod @@ -5,7 +5,7 @@ go 1.21.0 toolchain go1.22.2 require ( - github.com/open-telemetry/otel-arrow v0.24.0 + github.com/open-telemetry/otel-arrow v0.25.0 go.opentelemetry.io/collector v0.105.0 go.opentelemetry.io/collector/component v0.105.0 go.opentelemetry.io/collector/connector v0.105.0 diff --git a/collector/examples/printer/printer b/collector/examples/printer/printer deleted file mode 100755 index a253d787..00000000 Binary files a/collector/examples/printer/printer and /dev/null differ diff --git a/collector/exporter/fileexporter/go.mod b/collector/exporter/fileexporter/go.mod index b831e5e4..7583962a 100644 --- a/collector/exporter/fileexporter/go.mod +++ b/collector/exporter/fileexporter/go.mod @@ -6,7 +6,7 @@ toolchain go1.22.2 require ( github.com/klauspost/compress v1.17.8 - github.com/open-telemetry/otel-arrow/collector v0.24.0 + github.com/open-telemetry/otel-arrow/collector v0.25.0 github.com/stretchr/testify v1.9.0 go.opentelemetry.io/collector/component v0.105.0 go.opentelemetry.io/collector/config/configretry v1.12.0 diff --git a/collector/otelarrowcol-build.yaml b/collector/otelarrowcol-build.yaml index d8eeea63..3aa2ca38 100644 --- a/collector/otelarrowcol-build.yaml +++ b/collector/otelarrowcol-build.yaml @@ -17,7 +17,7 @@ dist: # Note: this version number is replaced to match the current release using `sed` # during the release process, see ../../../RELEASING.md. - version: 0.24.0 + version: 0.25.0 # Note: This should match the version of the core and contrib # collector components used below (e.g., the debugexporter and @@ -36,25 +36,35 @@ exporters: - gomod: go.opentelemetry.io/collector/exporter/debugexporter v0.105.0 - gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.105.0 - - gomod: github.com/open-telemetry/otel-arrow/collector/exporter/fileexporter v0.24.0 + - gomod: github.com/open-telemetry/otel-arrow/collector/exporter/fileexporter v0.25.0 receivers: # This is the core OpenTelemetry Protocol with Apache Arrow receiver - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/otelarrowreceiver v0.105.0 - - gomod: github.com/open-telemetry/otel-arrow/collector/receiver/filereceiver v0.24.0 + - gomod: github.com/open-telemetry/otel-arrow/collector/receiver/filereceiver v0.25.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.105.0 processors: - - gomod: github.com/open-telemetry/otel-arrow/collector/processor/concurrentbatchprocessor v0.24.0 - - gomod: github.com/open-telemetry/otel-arrow/collector/processor/obfuscationprocessor v0.24.0 + - gomod: github.com/open-telemetry/otel-arrow/collector/processor/concurrentbatchprocessor v0.25.0 + - gomod: github.com/open-telemetry/otel-arrow/collector/processor/obfuscationprocessor v0.25.0 connectors: - - gomod: github.com/open-telemetry/otel-arrow/collector/connector/validationconnector v0.24.0 + - gomod: github.com/open-telemetry/otel-arrow/collector/connector/validationconnector v0.25.0 extensions: - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/headerssetterextension v0.105.0 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/basicauthextension v0.105.0 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/pprofextension v0.105.0 + + +replaces: + - github.com/open-telemetry/otel-arrow => ../../../ + - github.com/open-telemetry/otel-arrow/collector => ../../ + - github.com/open-telemetry/otel-arrow/collector/connector/validationconnector => ../../connector/validationconnector + - github.com/open-telemetry/otel-arrow/collector/exporter/fileexporter => ../../exporter/fileexporter + - github.com/open-telemetry/otel-arrow/collector/receiver/filereceiver => ../../receiver/filereceiver + - github.com/open-telemetry/otel-arrow/collector/processor/concurrentbatchprocessor => ../../processor/concurrentbatchprocessor + - github.com/open-telemetry/otel-arrow/collector/processor/obfuscationprocessor => ../../processor/obfuscationprocessor diff --git a/collector/test/go.mod b/collector/test/go.mod index d75501d4..78ecc083 100644 --- a/collector/test/go.mod +++ b/collector/test/go.mod @@ -5,8 +5,8 @@ go 1.22.2 require ( github.com/open-telemetry/opentelemetry-collector-contrib/exporter/otelarrowexporter v0.105.0 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/otelarrowreceiver v0.105.0 - github.com/open-telemetry/otel-arrow v0.24.0 - github.com/open-telemetry/otel-arrow/collector v0.24.0 + github.com/open-telemetry/otel-arrow v0.25.0 + github.com/open-telemetry/otel-arrow/collector v0.25.0 github.com/stretchr/testify v1.9.0 go.opentelemetry.io/collector/component v0.105.0 go.opentelemetry.io/collector/consumer v0.105.0 diff --git a/go.work.save b/go.work.save new file mode 100644 index 00000000..3fb82049 --- /dev/null +++ b/go.work.save @@ -0,0 +1,3 @@ +go 1.22.5 + +use ./collector/processor/concurrentbatchprocessor diff --git a/versions.yaml b/versions.yaml index 4ec57e6e..480aff5c 100644 --- a/versions.yaml +++ b/versions.yaml @@ -3,7 +3,7 @@ module-sets: beta: - version: v0.24.0 + version: v0.25.0 modules: - github.com/open-telemetry/otel-arrow - github.com/open-telemetry/otel-arrow/collector