-
Notifications
You must be signed in to change notification settings - Fork 521
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Upgrade open-telemetry/opentelemetry-collector-contrib to v0.89.0 #3148
Conversation
Seeking approval for the CLA, then I can rebase with my work email. Please let me know of any thoughts in the meantime. |
dd19707
to
2069f0b
Compare
Thanks for the PR. If you can get the CLA signed then we can merge. |
Linter issue seems like a simple fix. Tempodb test failure is likely transient. I will re-run tests. However, there does appear to be a panic on startup in integration tests:
Take a look and see what you can find. Let me know if you have any questions and I can help dig some. |
2069f0b
to
721a39d
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thank you for updating the changelog
721a39d
to
6795c92
Compare
I've fixed the low-hanging fruit. There's still a SIGSEGV panic in |
The nil pointer dereference is b/c I can find two places this field is set: https://github.com/open-telemetry/opentelemetry-collector/blob/main/service/service.go#L125 and Maybe we need to create our receivers through one of these code paths to make sure the field is set correctly? Running the following will show the issue. Integration tests not required:
|
Thanks @joe-elliott, I didn't realise it was a diff --git a/modules/distributor/receiver/shim.go b/modules/distributor/receiver/shim.go
index cf9ecd41d..11fc47c8d 100644
--- a/modules/distributor/receiver/shim.go
+++ b/modules/distributor/receiver/shim.go
@@ -228,11 +228,16 @@ func New(receiverCfg map[string]interface{}, pusher TracesPusher, middleware Mid
// todo: propagate a real context? translate our log configuration into zap?
ctx := context.Background()
- params := receiver.CreateSettings{TelemetrySettings: component.TelemetrySettings{
- Logger: zapLogger,
- TracerProvider: tracenoop.NewTracerProvider(),
- MeterProvider: metricnoop.NewMeterProvider(),
- }}
+ params := receiver.CreateSettings{
+ TelemetrySettings: component.TelemetrySettings{
+ Logger: zapLogger,
+ TracerProvider: tracenoop.NewTracerProvider(),
+ MeterProvider: metricnoop.NewMeterProvider(),
+ ReportComponentStatus: func(*component.StatusEvent) error {
+ return nil
+ },
+ },
+ }
for componentID, cfg := range conf.Receivers {
factoryBase := receiverFactories[componentID.Type()] As you mention, it looks like the OTel Collector authors assumed I've pushed the no-op implementation. Please let me know your thoughts. |
9da48c6
to
e552879
Compare
e552879
to
337d923
Compare
Please hold off on merging, I'm still going through approvals for AGPL contribution. I'll take a look at the tempodb tests |
Will do.
@mapno was having this issue yesterday. He solved it by rebasing onto main (vs. merging main into his branch). It's a really weird test failure and he was unable to track down the root cause. |
|
337d923
to
c7d70f7
Compare
a80e149
to
a4bd230
Compare
Rebased off |
a4bd230
to
ad2ad43
Compare
Great update! Thanks. |
make vendor-check fmt
passingWhat this PR does: Upgrades the
open-telemetry/opentelemetry-collector-contrib
dependency to v0.89.0, including transitive dependencies as necessary. This version includes open-telemetry/opentelemetry-collector-contrib#26022, which we would like to benefit from in Tempo. N.B. one code change incmd/tempo/main.go
, due toNewTracer()
being removed in go.opentelemetry.io/otel/bridge/[email protected].Checklist
CHANGELOG.md
updated - the order of entries should be[CHANGE]
,[FEATURE]
,[ENHANCEMENT]
,[BUGFIX]