Skip to content
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 to OTel v0.116.0 #1484

Merged
merged 2 commits into from
Jan 6, 2025
Merged

Upgrade to OTel v0.116.0 #1484

merged 2 commits into from
Jan 6, 2025

Conversation

ptodev
Copy link
Contributor

@ptodev ptodev commented Dec 30, 2024

I believe this is required in order to update Alloy to OTel v0.116.0 as well.

I was not able to run make on my Mac due to this error:

Error: exec: "llvm-strip": executable file not found in $PATH

I suppose the build only works on Linux? I hope the PR CI will let me know if anything else such as third_party_licenses.csv needs updating.

Copy link

codecov bot commented Dec 30, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 81.37%. Comparing base (0cdf322) to head (e8afa74).
Report is 3 commits behind head on main.

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #1484      +/-   ##
==========================================
+ Coverage   81.34%   81.37%   +0.03%     
==========================================
  Files         149      149              
  Lines       15264    15268       +4     
==========================================
+ Hits        12416    12425       +9     
+ Misses       2244     2240       -4     
+ Partials      604      603       -1     
Flag Coverage Δ
integration-test 59.77% <100.00%> (+<0.01%) ⬆️
k8s-integration-test 60.80% <100.00%> (+1.01%) ⬆️
oats-test 34.01% <100.00%> (-0.03%) ⬇️
unittests 52.06% <100.00%> (-0.03%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@ptodev
Copy link
Contributor Author

ptodev commented Dec 30, 2024

I tried to run just make update-licenses, but it failed for some unknown reason. Maybe it's easier if someone from the Beyla team runs it on the PR please?

@ptodev
Copy link
Contributor Author

ptodev commented Jan 1, 2025

@grafana/beyla Is there any chance that you could remove this go mod replace from your go.mod file please:

replace go.opentelemetry.io/otel/metric => github.com/grafana/opentelemetry-go/metric v1.28.0-grafana.3

It is causing an issue with the Alloy build:

/go/pkg/mod/github.com/grafana/beyla@v1.9.1-0.20241230130037-7083b65bf473/pkg/export/otel/metrics.go:982:68: "go.opentelemetry.io/otel/metric".Float64Histogram does not satisfy removableMetric[float64] (missing method Remove)

@grcevski
Copy link
Contributor

grcevski commented Jan 6, 2025

Thanks @ptodev, I'll submit a PR with the license change for you. Regarding the replace in the go.mod, we still need this to support removal of OTel metrics, since we haven't yet merged the change upstream. Depending on how urgent this is, we can temporarily remove it and re-instate it after Alloy picks up the version.

Copy link
Contributor

@grcevski grcevski left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM! Looks good, I just had one question about the removal of the levelled metrics config option.

@@ -376,11 +375,8 @@ func getTraceSettings(ctxInfo *global.ContextInfo, in trace.SpanExporter) export
}
meterProvider := metric.NewMeterProvider()
telemetrySettings := component.TelemetrySettings{
Logger: zap.NewNop(),
MeterProvider: meterProvider,
LeveledMeterProvider: func(_ configtelemetry.Level) metric2.MeterProvider {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do you mind providing a bit of detail why we don't need this anymore? I think this was ported over from Alloy to Beyla by @marctc.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think probably in newer versions of OTEL LeveledMeterProvider is no needed anymore, so I guess it's all good!

Copy link
Contributor

@marctc marctc left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Awesome @ptodev, thanks for this!

@grcevski grcevski merged commit 5fef733 into main Jan 6, 2025
13 checks passed
@grcevski grcevski deleted the ptodev/update-otel branch January 6, 2025 20:53
@grcevski grcevski mentioned this pull request Jan 7, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants