This is an automated email from the ASF dual-hosted git repository. stankiewicz pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/beam.git
commit 674873d7a870ead22054825ebfc999a63395e570 Merge: 268ae1acf5e 5223c232606 Author: Radosław Stankiewicz <[email protected]> AuthorDate: Tue May 5 15:44:41 2026 +0200 Merge pull request #36962 from stankiewicz/model [OpenTelemetry] Model changes to allow OpenTelemetry context propagation .../org/apache/beam/gradle/BeamModulePlugin.groovy | 8 +- ...TimeBoundedSplittableProcessElementInvoker.java | 6 +- .../core/SplittableParDoViaKeyedWorkItems.java | 3 +- runners/google-cloud-dataflow-java/build.gradle | 1 + .../beam/runners/dataflow/BatchViewOverrides.java | 6 + .../google-cloud-dataflow-java/worker/build.gradle | 1 + .../dataflow/worker/UngroupedWindmillReader.java | 14 +- .../dataflow/worker/WindmillKeyedWorkItem.java | 2 +- .../dataflow/worker/util/ValueInEmptyWindows.java | 6 + runners/spark/spark_runner.gradle | 1 + .../apache/beam/runners/spark/util/TimerUtils.java | 6 + .../container/license_scripts/dep_urls_java.yaml | 8 +- sdks/java/core/build.gradle | 1 + .../org/apache/beam/sdk/transforms/DoFnTester.java | 11 +- .../java/org/apache/beam/sdk/transforms/Reify.java | 3 +- .../sdk/values/OpenTelemetryContextPropagator.java | 71 ++++++++ .../org/apache/beam/sdk/values/OutputBuilder.java | 3 + .../beam/sdk/values/ValueInSingleWindow.java | 37 +++- .../org/apache/beam/sdk/values/WindowedValue.java | 4 + .../org/apache/beam/sdk/values/WindowedValues.java | 196 +++++++++++++++------ .../apache/beam/sdk/util/WindowedValueTest.java | 21 ++- .../apache/beam/fn/harness/FnApiDoFnRunner.java | 3 +- .../apache/beam/sdk/io/gcp/GcpApiSurfaceTest.java | 1 + 23 files changed, 338 insertions(+), 75 deletions(-) diff --cc buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy index 22655f69626,b8a0c85c85b..362eef05243 --- a/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy +++ b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy @@@ -628,12 -628,13 +628,13 @@@ class BeamModulePlugin implements Plugi def jsr305_version = "3.0.2" def everit_json_version = "1.14.2" def kafka_version = "2.4.1" - def log4j2_version = "2.25.3" + def log4j2_version = "2.25.4" def nemo_version = "0.1" // [bomupgrader] determined by: io.grpc:grpc-netty, consistent with: google_cloud_platform_libraries_bom - def netty_version = "4.1.124.Final" + def netty_version = "4.1.130.Final" // [bomupgrader] determined by: io.opentelemetry:opentelemetry-sdk, consistent with: google_cloud_platform_libraries_bom - def opentelemetry_version = "1.51.0" + def opentelemetry_version = "1.56.0" + def opentelemetry_contrib_version = "1.52.0" def postgres_version = "42.6.2" // [bomupgrader] determined by: com.google.protobuf:protobuf-java, consistent with: google_cloud_platform_libraries_bom def protobuf_version = "4.33.2"
