Skip to content

Commit 1e84ca8

Browse files
humivohumivo
authored
Patch collector and update submodule (#585)
* Patch collector and fix soak tests * Update the collector version and edit patch file
1 parent fd3aa9c commit 1e84ca8

File tree

7 files changed

+432
-175
lines changed

7 files changed

+432
-175
lines changed

‎OTEL_Version.patch

Lines changed: 248 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,248 @@
1+
diff --git a/collector/go.mod b/collector/go.mod
2+
index 32997f5..45b5c4d 100644
3+
--- a/collector/go.mod
4+
+++ b/collector/go.mod
5+
@@ -16,12 +16,12 @@ replace cloud.google.com/go => cloud.google.com/go v0.107.0
6+
7+
require (
8+
github.com/golang-collections/go-datastructures v0.0.0-20150211160725-59788d5eb259
9+
- github.com/open-telemetry/opentelemetry-collector-contrib/confmap/provider/s3provider v0.77.0
10+
- github.com/open-telemetry/opentelemetry-lambda/collector/lambdacomponents v0.77.0
11+
+ github.com/open-telemetry/opentelemetry-collector-contrib/confmap/provider/s3provider v0.76.3
12+
+ github.com/open-telemetry/opentelemetry-lambda/collector/lambdacomponents v0.76.0
13+
github.com/stretchr/testify v1.8.2
14+
- go.opentelemetry.io/collector v0.77.0
15+
- go.opentelemetry.io/collector/component v0.77.0
16+
- go.opentelemetry.io/collector/confmap v0.77.0
17+
+ go.opentelemetry.io/collector v0.76.1
18+
+ go.opentelemetry.io/collector/component v0.76.1
19+
+ go.opentelemetry.io/collector/confmap v0.76.1
20+
go.uber.org/multierr v1.11.0
21+
go.uber.org/zap v1.24.0
22+
)
23+
@@ -30,21 +30,21 @@ require (
24+
contrib.go.opencensus.io/exporter/prometheus v0.4.2 // indirect
25+
github.com/alecthomas/participle/v2 v2.0.0 // indirect
26+
github.com/antonmedv/expr v1.12.5 // indirect
27+
- github.com/aws/aws-sdk-go-v2 v1.18.0 // indirect
28+
+ github.com/aws/aws-sdk-go-v2 v1.17.8 // indirect
29+
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.0.0 // indirect
30+
- github.com/aws/aws-sdk-go-v2/config v1.18.22 // indirect
31+
- github.com/aws/aws-sdk-go-v2/credentials v1.13.21 // indirect
32+
- github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.3 // indirect
33+
- github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.33 // indirect
34+
- github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.27 // indirect
35+
- github.com/aws/aws-sdk-go-v2/internal/ini v1.3.34 // indirect
36+
+ github.com/aws/aws-sdk-go-v2/config v1.18.21 // indirect
37+
+ github.com/aws/aws-sdk-go-v2/credentials v1.13.20 // indirect
38+
+ github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.2 // indirect
39+
+ github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.32 // indirect
40+
+ github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.26 // indirect
41+
+ github.com/aws/aws-sdk-go-v2/internal/ini v1.3.33 // indirect
42+
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.5.0 // indirect
43+
- github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.27 // indirect
44+
+ github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.26 // indirect
45+
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.9.0 // indirect
46+
github.com/aws/aws-sdk-go-v2/service/s3 v1.19.0 // indirect
47+
- github.com/aws/aws-sdk-go-v2/service/sso v1.12.9 // indirect
48+
- github.com/aws/aws-sdk-go-v2/service/ssooidc v1.14.9 // indirect
49+
- github.com/aws/aws-sdk-go-v2/service/sts v1.18.10 // indirect
50+
+ github.com/aws/aws-sdk-go-v2/service/sso v1.12.8 // indirect
51+
+ github.com/aws/aws-sdk-go-v2/service/ssooidc v1.14.8 // indirect
52+
+ github.com/aws/aws-sdk-go-v2/service/sts v1.18.9 // indirect
53+
github.com/aws/smithy-go v1.13.5 // indirect
54+
github.com/benbjohnson/clock v1.3.0 // indirect
55+
github.com/beorn7/perks v1.0.1 // indirect
56+
@@ -55,7 +55,7 @@ require (
57+
github.com/fsnotify/fsnotify v1.6.0 // indirect
58+
github.com/go-kit/log v0.2.1 // indirect
59+
github.com/go-logfmt/logfmt v0.6.0 // indirect
60+
- github.com/go-logr/logr v1.2.4 // indirect
61+
+ github.com/go-logr/logr v1.2.3 // indirect
62+
github.com/go-logr/stdr v1.2.2 // indirect
63+
github.com/go-ole/go-ole v1.2.6 // indirect
64+
github.com/gobwas/glob v0.2.3 // indirect
65+
@@ -77,22 +77,22 @@ require (
66+
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
67+
github.com/modern-go/reflect2 v1.0.2 // indirect
68+
github.com/mostynb/go-grpc-compression v1.1.17 // indirect
69+
- github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusremotewriteexporter v0.77.0 // indirect
70+
- github.com/open-telemetry/opentelemetry-collector-contrib/extension/sigv4authextension v0.77.0 // indirect
71+
- github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.77.0 // indirect
72+
- github.com/open-telemetry/opentelemetry-collector-contrib/internal/filter v0.77.0 // indirect
73+
- github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.77.0 // indirect
74+
- github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.77.0 // indirect
75+
- github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.77.0 // indirect
76+
- github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheus v0.77.0 // indirect
77+
- github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheusremotewrite v0.77.0 // indirect
78+
- github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor v0.77.0 // indirect
79+
- github.com/open-telemetry/opentelemetry-collector-contrib/processor/filterprocessor v0.77.0 // indirect
80+
- github.com/open-telemetry/opentelemetry-collector-contrib/processor/probabilisticsamplerprocessor v0.77.0 // indirect
81+
- github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourceprocessor v0.77.0 // indirect
82+
- github.com/open-telemetry/opentelemetry-collector-contrib/processor/spanprocessor v0.77.0 // indirect
83+
- github.com/open-telemetry/opentelemetry-lambda/collector/processor/coldstartprocessor v0.77.0 // indirect
84+
- github.com/open-telemetry/opentelemetry-lambda/collector/receiver/telemetryapireceiver v0.77.0 // indirect
85+
+ github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusremotewriteexporter v0.76.3 // indirect
86+
+ github.com/open-telemetry/opentelemetry-collector-contrib/extension/sigv4authextension v0.76.3 // indirect
87+
+ github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.76.3 // indirect
88+
+ github.com/open-telemetry/opentelemetry-collector-contrib/internal/filter v0.76.3 // indirect
89+
+ github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.76.3 // indirect
90+
+ github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.76.3 // indirect
91+
+ github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.76.3 // indirect
92+
+ github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheus v0.76.3 // indirect
93+
+ github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheusremotewrite v0.76.3 // indirect
94+
+ github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor v0.76.3 // indirect
95+
+ github.com/open-telemetry/opentelemetry-collector-contrib/processor/filterprocessor v0.76.3 // indirect
96+
+ github.com/open-telemetry/opentelemetry-collector-contrib/processor/probabilisticsamplerprocessor v0.76.3 // indirect
97+
+ github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourceprocessor v0.76.3 // indirect
98+
+ github.com/open-telemetry/opentelemetry-collector-contrib/processor/spanprocessor v0.76.3 // indirect
99+
+ github.com/open-telemetry/opentelemetry-lambda/collector/processor/coldstartprocessor v0.76.0 // indirect
100+
+ github.com/open-telemetry/opentelemetry-lambda/collector/receiver/telemetryapireceiver v0.76.0 // indirect
101+
github.com/pmezard/go-difflib v1.0.0 // indirect
102+
github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
103+
github.com/prometheus/client_golang v1.15.0 // indirect
104+
@@ -102,8 +102,8 @@ require (
105+
github.com/prometheus/prometheus v0.43.0 // indirect
106+
github.com/prometheus/statsd_exporter v0.22.7 // indirect
107+
github.com/rs/cors v1.9.0 // indirect
108+
- github.com/shirou/gopsutil/v3 v3.23.4 // indirect
109+
- github.com/shoenig/go-m1cpu v0.1.5 // indirect
110+
+ github.com/shirou/gopsutil/v3 v3.23.3 // indirect
111+
+ github.com/shoenig/go-m1cpu v0.1.4 // indirect
112+
github.com/spf13/cobra v1.7.0 // indirect
113+
github.com/spf13/pflag v1.0.5 // indirect
114+
github.com/tidwall/gjson v1.10.2 // indirect
115+
@@ -115,33 +115,33 @@ require (
116+
github.com/tklauser/numcpus v0.6.0 // indirect
117+
github.com/yusufpapurcu/wmi v1.2.2 // indirect
118+
go.opencensus.io v0.24.0 // indirect
119+
- go.opentelemetry.io/collector/consumer v0.77.0 // indirect
120+
- go.opentelemetry.io/collector/exporter v0.77.0 // indirect
121+
- go.opentelemetry.io/collector/exporter/loggingexporter v0.77.0 // indirect
122+
- go.opentelemetry.io/collector/exporter/otlpexporter v0.77.0 // indirect
123+
- go.opentelemetry.io/collector/exporter/otlphttpexporter v0.77.0 // indirect
124+
- go.opentelemetry.io/collector/featuregate v0.77.0 // indirect
125+
+ go.opentelemetry.io/collector/consumer v0.76.1 // indirect
126+
+ go.opentelemetry.io/collector/exporter v0.76.1 // indirect
127+
+ go.opentelemetry.io/collector/exporter/loggingexporter v0.76.1 // indirect
128+
+ go.opentelemetry.io/collector/exporter/otlpexporter v0.76.1 // indirect
129+
+ go.opentelemetry.io/collector/exporter/otlphttpexporter v0.76.1 // indirect
130+
+ go.opentelemetry.io/collector/featuregate v0.76.1 // indirect
131+
go.opentelemetry.io/collector/pdata v1.0.0-rcv0011 // indirect
132+
- go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.77.0 // indirect
133+
- go.opentelemetry.io/collector/receiver v0.77.0 // indirect
134+
- go.opentelemetry.io/collector/receiver/otlpreceiver v0.77.0 // indirect
135+
- go.opentelemetry.io/collector/semconv v0.77.0 // indirect
136+
- go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.41.1 // indirect
137+
- go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.41.1 // indirect
138+
+ go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.76.1 // indirect
139+
+ go.opentelemetry.io/collector/receiver v0.76.1 // indirect
140+
+ go.opentelemetry.io/collector/receiver/otlpreceiver v0.76.1 // indirect
141+
+ go.opentelemetry.io/collector/semconv v0.76.1 // indirect
142+
+ go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.40.0 // indirect
143+
+ go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.40.0 // indirect
144+
go.opentelemetry.io/contrib/propagators/b3 v1.15.0 // indirect
145+
- go.opentelemetry.io/otel v1.15.1 // indirect
146+
- go.opentelemetry.io/otel/bridge/opencensus v0.38.0 // indirect
147+
- go.opentelemetry.io/otel/exporters/prometheus v0.38.1 // indirect
148+
- go.opentelemetry.io/otel/metric v0.38.1 // indirect
149+
- go.opentelemetry.io/otel/sdk v1.15.1 // indirect
150+
- go.opentelemetry.io/otel/sdk/metric v0.38.1 // indirect
151+
- go.opentelemetry.io/otel/trace v1.15.1 // indirect
152+
+ go.opentelemetry.io/otel v1.14.0 // indirect
153+
+ go.opentelemetry.io/otel/bridge/opencensus v0.37.0 // indirect
154+
+ go.opentelemetry.io/otel/exporters/prometheus v0.37.0 // indirect
155+
+ go.opentelemetry.io/otel/metric v0.37.0 // indirect
156+
+ go.opentelemetry.io/otel/sdk v1.14.0 // indirect
157+
+ go.opentelemetry.io/otel/sdk/metric v0.37.0 // indirect
158+
+ go.opentelemetry.io/otel/trace v1.14.0 // indirect
159+
go.uber.org/atomic v1.10.0 // indirect
160+
- golang.org/x/exp v0.0.0-20230321023759-10a507213a29 // indirect
161+
+ golang.org/x/exp v0.0.0-20230307190834-24139beb5833 // indirect
162+
golang.org/x/net v0.9.0 // indirect
163+
golang.org/x/sys v0.7.0 // indirect
164+
golang.org/x/text v0.9.0 // indirect
165+
- gonum.org/v1/gonum v0.13.0 // indirect
166+
+ gonum.org/v1/gonum v0.12.0 // indirect
167+
google.golang.org/genproto v0.0.0-20230306155012-7f2fa6fef1f4 // indirect
168+
google.golang.org/grpc v1.54.0 // indirect
169+
google.golang.org/protobuf v1.30.0 // indirect
170+
diff --git a/collector/processor/coldstartprocessor/go.mod b/collector/processor/coldstartprocessor/go.mod
171+
index f3c0c94..8d3a76e 100644
172+
--- a/collector/processor/coldstartprocessor/go.mod
173+
+++ b/collector/processor/coldstartprocessor/go.mod
174+
@@ -5,11 +5,11 @@ go 1.19
175+
require (
176+
github.com/cespare/xxhash v1.1.0
177+
github.com/stretchr/testify v1.8.2
178+
- go.opentelemetry.io/collector v0.77.0
179+
- go.opentelemetry.io/collector/component v0.77.0
180+
- go.opentelemetry.io/collector/consumer v0.77.0
181+
+ go.opentelemetry.io/collector v0.76.1
182+
+ go.opentelemetry.io/collector/component v0.76.1
183+
+ go.opentelemetry.io/collector/consumer v0.76.1
184+
go.opentelemetry.io/collector/pdata v1.0.0-rcv0011
185+
- go.opentelemetry.io/collector/semconv v0.77.0
186+
+ go.opentelemetry.io/collector/semconv v0.76.1
187+
go.uber.org/multierr v1.11.0
188+
go.uber.org/zap v1.24.0
189+
)
190+
@@ -27,11 +27,11 @@ require (
191+
github.com/modern-go/reflect2 v1.0.2 // indirect
192+
github.com/pmezard/go-difflib v1.0.0 // indirect
193+
go.opencensus.io v0.24.0 // indirect
194+
- go.opentelemetry.io/collector/confmap v0.77.0 // indirect
195+
- go.opentelemetry.io/collector/featuregate v0.77.0 // indirect
196+
- go.opentelemetry.io/otel v1.15.1 // indirect
197+
- go.opentelemetry.io/otel/metric v0.38.1 // indirect
198+
- go.opentelemetry.io/otel/trace v1.15.1 // indirect
199+
+ go.opentelemetry.io/collector/confmap v0.76.1 // indirect
200+
+ go.opentelemetry.io/collector/featuregate v0.76.1 // indirect
201+
+ go.opentelemetry.io/otel v1.14.0 // indirect
202+
+ go.opentelemetry.io/otel/metric v0.37.0 // indirect
203+
+ go.opentelemetry.io/otel/trace v1.14.0 // indirect
204+
go.uber.org/atomic v1.10.0 // indirect
205+
golang.org/x/net v0.9.0 // indirect
206+
golang.org/x/sys v0.7.0 // indirect
207+
diff --git a/collector/receiver/telemetryapireceiver/go.mod b/collector/receiver/telemetryapireceiver/go.mod
208+
index 56b6b27..09793a6 100644
209+
--- a/collector/receiver/telemetryapireceiver/go.mod
210+
+++ b/collector/receiver/telemetryapireceiver/go.mod
211+
@@ -6,13 +6,13 @@ replace github.com/open-telemetry/opentelemetry-lambda/collector => ../../
212+
213+
require (
214+
github.com/golang-collections/go-datastructures v0.0.0-20150211160725-59788d5eb259
215+
- github.com/open-telemetry/opentelemetry-lambda/collector v0.77.0
216+
+ github.com/open-telemetry/opentelemetry-lambda/collector v0.76.0
217+
github.com/stretchr/testify v1.8.2
218+
- go.opentelemetry.io/collector/component v0.77.0
219+
- go.opentelemetry.io/collector/consumer v0.77.0
220+
+ go.opentelemetry.io/collector/component v0.76.1
221+
+ go.opentelemetry.io/collector/consumer v0.76.1
222+
go.opentelemetry.io/collector/pdata v1.0.0-rcv0011
223+
- go.opentelemetry.io/collector/receiver v0.77.0
224+
- go.opentelemetry.io/collector/semconv v0.77.0
225+
+ go.opentelemetry.io/collector/receiver v0.76.1
226+
+ go.opentelemetry.io/collector/semconv v0.76.1
227+
go.uber.org/zap v1.24.0
228+
)
229+
230+
@@ -28,12 +28,12 @@ require (
231+
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
232+
github.com/modern-go/reflect2 v1.0.2 // indirect
233+
github.com/pmezard/go-difflib v1.0.0 // indirect
234+
- go.opentelemetry.io/collector v0.77.0 // indirect
235+
- go.opentelemetry.io/collector/confmap v0.77.0 // indirect
236+
- go.opentelemetry.io/collector/featuregate v0.77.0 // indirect
237+
- go.opentelemetry.io/otel v1.15.1 // indirect
238+
- go.opentelemetry.io/otel/metric v0.38.1 // indirect
239+
- go.opentelemetry.io/otel/trace v1.15.1 // indirect
240+
+ go.opentelemetry.io/collector v0.76.1 // indirect
241+
+ go.opentelemetry.io/collector/confmap v0.76.1 // indirect
242+
+ go.opentelemetry.io/collector/featuregate v0.76.1 // indirect
243+
+ go.opentelemetry.io/otel v1.14.0 // indirect
244+
+ go.opentelemetry.io/otel/metric v0.37.0 // indirect
245+
+ go.opentelemetry.io/otel/trace v1.14.0 // indirect
246+
go.uber.org/atomic v1.10.0 // indirect
247+
go.uber.org/multierr v1.11.0 // indirect
248+
golang.org/x/net v0.9.0 // indirect

‎adot/collector/VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v0.28.0
1+
v0.29.0

0 commit comments

Comments
 (0)