Skip to content

Fix/upstream update disk buffering#2694

Merged
trask merged 4 commits intoopen-telemetry:mainfrom
LikeTheSalad:fix/upstream-update-disk-buffering
Mar 16, 2026
Merged

Fix/upstream update disk buffering#2694
trask merged 4 commits intoopen-telemetry:mainfrom
LikeTheSalad:fix/upstream-update-disk-buffering

Conversation

@LikeTheSalad
Copy link
Copy Markdown
Contributor

Supersedes #2690

@github-actions github-actions bot requested a review from zeitlinger March 16, 2026 14:36
* otel.sdk.metric_reader.collection.duration}) that {@link PeriodicMetricReader} automatically
* records, returning only metrics from the test's instrumentation scope.
*/
private static List<MetricData> filterTestMetrics(List<MetricData> metrics) {
Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

This is needed after these changes: open-telemetry/opentelemetry-java#8038

@LikeTheSalad LikeTheSalad marked this pull request as ready for review March 16, 2026 14:37
@LikeTheSalad LikeTheSalad requested a review from a team as a code owner March 16, 2026 14:37
Copilot AI review requested due to automatic review settings March 16, 2026 14:37
Copy link
Copy Markdown
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

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

Pull request overview

Updates disk-buffering to align with upstream OpenTelemetry changes, stabilizing integration tests and removing reliance on incubator APIs.

Changes:

  • Filter metrics in IntegrationTest to ignore upstream self-instrumentation metrics from PeriodicMetricReader.
  • Remove incubator extended-attributes usage from LogRecordDataImpl and drop the incubator dependency.
  • Bump otelInstrumentationVersion to 2.26.0-alpha.

Reviewed changes

Copilot reviewed 4 out of 4 changed files in this pull request and generated 2 comments.

File Description
disk-buffering/src/test/java/io/opentelemetry/contrib/disk/buffering/IntegrationTest.java Adjusts assertions by filtering out non-test metrics produced by upstream components.
disk-buffering/src/main/java/io/opentelemetry/contrib/disk/buffering/internal/serialization/mapping/logs/models/LogRecordDataImpl.java Switches to stable LogRecordData and removes incubator extended attributes implementation.
disk-buffering/build.gradle.kts Removes opentelemetry-api-incubator dependency now that incubator APIs aren’t used.
dependencyManagement/build.gradle.kts Updates the managed instrumentation version to 2.26.0-alpha.

You can also share your feedback on Copilot code review. Take the survey.

@github-actions github-actions bot requested a review from jack-berg March 16, 2026 15:02
@LikeTheSalad LikeTheSalad requested a review from Copilot March 16, 2026 15:43
Copy link
Copy Markdown
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

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

Pull request overview

Updates disk-buffering and noop API to align with upstream OpenTelemetry changes, including handling of newly emitted self-instrumentation metrics and removal of incubator dependencies.

Changes:

  • Bumped OpenTelemetry instrumentation BOM version to 2.26.0-alpha.
  • Updated disk-buffering integration tests to ignore SDK self-instrumentation metrics.
  • Removed incubator extended-attributes usage from log record modeling and adjusted noop SpanBuilder attribute nullability.

Reviewed changes

Copilot reviewed 5 out of 5 changed files in this pull request and generated 4 comments.

Show a summary per file
File Description
noop-api/src/main/java/io/opentelemetry/contrib/noopapi/NoopTracerProvider.java Adjusts noop SpanBuilder attribute setters to accept nullable values.
disk-buffering/src/test/java/io/opentelemetry/contrib/disk/buffering/IntegrationTest.java Filters out SDK self-metrics so integration assertions remain stable.
disk-buffering/src/main/java/io/opentelemetry/contrib/disk/buffering/internal/serialization/mapping/logs/models/LogRecordDataImpl.java Migrates from incubator extended log record API to LogRecordData.
disk-buffering/build.gradle.kts Removes incubator API dependency.
dependencyManagement/build.gradle.kts Updates instrumentation version to 2.26.0-alpha.

You can also share your feedback on Copilot code review. Take the survey.

@linux-foundation-easycla
Copy link
Copy Markdown

linux-foundation-easycla bot commented Mar 16, 2026

CLA Signed

The committers listed above are authorized under a signed CLA.

@LikeTheSalad LikeTheSalad force-pushed the fix/upstream-update-disk-buffering branch from 02408ce to 0cdca1c Compare March 16, 2026 15:59
@trask trask added this pull request to the merge queue Mar 16, 2026
Merged via the queue into open-telemetry:main with commit 91eb04a Mar 16, 2026
21 checks passed
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