Skip to content

Commit b0b176d

Browse files
authored
Synchronize the upstream/downstream batch processor code (#251)
As I prepare to submit the concurrent batch processor code to the upstream repository, I have developed the following proof-of-concept: https://github.com/open-telemetry/opentelemetry-collector/pull/11248/files I simplified, commented, linted, and tidied the code in that repository, aiming to achieve the smallest diff possible w/ only the essential features of this repository contributed back. This incorporates upstream changes in metadata.yaml, metrics code generation, and related lint improvements. Then, I copied the changed files back here. No functional changes. I have eliminated the in-flight bytes metric and the panic recovery feature, both nice-to-have but complicates the diff and appear unnecessary. Includes the upstream README.md, metadata.yaml, and generated code.
1 parent 6fd2c28 commit b0b176d

26 files changed

+1472
-1158
lines changed

collector/cmd/otelarrowcol/go.mod

+23-20
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ require (
1717
github.com/open-telemetry/otel-arrow/collector/processor/concurrentbatchprocessor v0.26.0
1818
github.com/open-telemetry/otel-arrow/collector/processor/obfuscationprocessor v0.26.0
1919
github.com/open-telemetry/otel-arrow/collector/receiver/filereceiver v0.26.0
20-
go.opentelemetry.io/collector/component v0.108.1
21-
go.opentelemetry.io/collector/confmap v1.14.1
20+
go.opentelemetry.io/collector/component v0.110.0
21+
go.opentelemetry.io/collector/confmap v1.16.0
2222
go.opentelemetry.io/collector/confmap/converter/expandconverter v0.108.1
2323
go.opentelemetry.io/collector/confmap/provider/envprovider v0.108.1
2424
go.opentelemetry.io/collector/confmap/provider/fileprovider v0.108.1
@@ -31,10 +31,10 @@ require (
3131
go.opentelemetry.io/collector/exporter/otlphttpexporter v0.108.1
3232
go.opentelemetry.io/collector/extension v0.108.1
3333
go.opentelemetry.io/collector/otelcol v0.108.1
34-
go.opentelemetry.io/collector/processor v0.108.1
34+
go.opentelemetry.io/collector/processor v0.110.0
3535
go.opentelemetry.io/collector/receiver v0.108.1
3636
go.opentelemetry.io/collector/receiver/otlpreceiver v0.108.1
37-
golang.org/x/sys v0.24.0
37+
golang.org/x/sys v0.25.0
3838
)
3939

4040
require (
@@ -117,35 +117,38 @@ require (
117117
github.com/zeebo/xxh3 v1.0.2 // indirect
118118
go.mongodb.org/mongo-driver v1.12.1 // indirect
119119
go.opentelemetry.io/collector v0.108.1 // indirect
120-
go.opentelemetry.io/collector/client v1.14.1 // indirect
120+
go.opentelemetry.io/collector/client v1.16.0 // indirect
121121
go.opentelemetry.io/collector/component/componentprofiles v0.108.1 // indirect
122-
go.opentelemetry.io/collector/component/componentstatus v0.108.1 // indirect
122+
go.opentelemetry.io/collector/component/componentstatus v0.110.0 // indirect
123123
go.opentelemetry.io/collector/config/configauth v0.108.1 // indirect
124124
go.opentelemetry.io/collector/config/configcompression v1.14.1 // indirect
125125
go.opentelemetry.io/collector/config/configgrpc v0.108.1 // indirect
126126
go.opentelemetry.io/collector/config/confighttp v0.108.1 // indirect
127127
go.opentelemetry.io/collector/config/confignet v0.108.1 // indirect
128128
go.opentelemetry.io/collector/config/configopaque v1.14.1 // indirect
129129
go.opentelemetry.io/collector/config/configretry v1.14.1 // indirect
130-
go.opentelemetry.io/collector/config/configtelemetry v0.108.1 // indirect
130+
go.opentelemetry.io/collector/config/configtelemetry v0.110.0 // indirect
131131
go.opentelemetry.io/collector/config/configtls v1.14.1 // indirect
132132
go.opentelemetry.io/collector/config/internal v0.108.1 // indirect
133-
go.opentelemetry.io/collector/consumer v0.108.1 // indirect
134-
go.opentelemetry.io/collector/consumer/consumerprofiles v0.108.1 // indirect
135-
go.opentelemetry.io/collector/consumer/consumertest v0.108.1 // indirect
133+
go.opentelemetry.io/collector/consumer v0.110.0 // indirect
134+
go.opentelemetry.io/collector/consumer/consumerprofiles v0.110.0 // indirect
135+
go.opentelemetry.io/collector/consumer/consumertest v0.110.0 // indirect
136136
go.opentelemetry.io/collector/extension/auth v0.108.1 // indirect
137137
go.opentelemetry.io/collector/featuregate v1.14.1 // indirect
138138
go.opentelemetry.io/collector/internal/globalgates v0.108.1 // indirect
139-
go.opentelemetry.io/collector/pdata v1.14.1 // indirect
140-
go.opentelemetry.io/collector/pdata/pprofile v0.108.1 // indirect
141-
go.opentelemetry.io/collector/pdata/testdata v0.108.1 // indirect
139+
go.opentelemetry.io/collector/internal/globalsignal v0.110.0 // indirect
140+
go.opentelemetry.io/collector/pdata v1.16.0 // indirect
141+
go.opentelemetry.io/collector/pdata/pprofile v0.110.0 // indirect
142+
go.opentelemetry.io/collector/pdata/testdata v0.110.0 // indirect
143+
go.opentelemetry.io/collector/pipeline v0.110.0 // indirect
144+
go.opentelemetry.io/collector/processor/processorprofiles v0.110.0 // indirect
142145
go.opentelemetry.io/collector/semconv v0.108.1 // indirect
143146
go.opentelemetry.io/collector/service v0.108.1 // indirect
144147
go.opentelemetry.io/contrib/config v0.8.0 // indirect
145148
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.53.0 // indirect
146149
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect
147150
go.opentelemetry.io/contrib/propagators/b3 v1.28.0 // indirect
148-
go.opentelemetry.io/otel v1.29.0 // indirect
151+
go.opentelemetry.io/otel v1.30.0 // indirect
149152
go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.4.0 // indirect
150153
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.28.0 // indirect
151154
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.28.0 // indirect
@@ -156,11 +159,11 @@ require (
156159
go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.28.0 // indirect
157160
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.28.0 // indirect
158161
go.opentelemetry.io/otel/log v0.4.0 // indirect
159-
go.opentelemetry.io/otel/metric v1.29.0 // indirect
160-
go.opentelemetry.io/otel/sdk v1.29.0 // indirect
162+
go.opentelemetry.io/otel/metric v1.30.0 // indirect
163+
go.opentelemetry.io/otel/sdk v1.30.0 // indirect
161164
go.opentelemetry.io/otel/sdk/log v0.4.0 // indirect
162-
go.opentelemetry.io/otel/sdk/metric v1.29.0 // indirect
163-
go.opentelemetry.io/otel/trace v1.29.0 // indirect
165+
go.opentelemetry.io/otel/sdk/metric v1.30.0 // indirect
166+
go.opentelemetry.io/otel/trace v1.30.0 // indirect
164167
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
165168
go.uber.org/multierr v1.11.0 // indirect
166169
go.uber.org/zap v1.27.0 // indirect
@@ -174,8 +177,8 @@ require (
174177
golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect
175178
gonum.org/v1/gonum v0.15.1 // indirect
176179
google.golang.org/genproto/googleapis/api v0.0.0-20240701130421-f6361c86f094 // indirect
177-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 // indirect
178-
google.golang.org/grpc v1.65.0 // indirect
180+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240822170219-fc7c04adadcd // indirect
181+
google.golang.org/grpc v1.66.2 // indirect
179182
google.golang.org/protobuf v1.34.2 // indirect
180183
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
181184
gopkg.in/yaml.v3 v3.0.1 // indirect

0 commit comments

Comments
 (0)