Skip to content

Commit 1ad5189

Browse files
committed
rename method, fix constructor invocation.
1 parent 3c3d03e commit 1ad5189

4 files changed

Lines changed: 7 additions & 5 deletions

File tree

runners/core-java/src/main/java/org/apache/beam/runners/core/SplittableParDoViaKeyedWorkItems.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -472,7 +472,8 @@ public String getErrorContext() {
472472
read.getPaneInfo(),
473473
read.getRecordId(),
474474
read.getRecordOffset(),
475-
CausedByDrain.CAUSED_BY_DRAIN);
475+
CausedByDrain.CAUSED_BY_DRAIN,
476+
read.getOpenTelemetryContext());
476477
}
477478
elementAndRestriction = KV.of(read, restrictionState.read());
478479
watermarkEstimatorStateT = watermarkEstimatorState.read();

sdks/java/core/src/main/java/org/apache/beam/sdk/values/OpenTelemetryContextPropagator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ public Iterable<String> keys(BeamFnApi.Elements.ElementMetadata carrier) {
6161
}
6262
};
6363

64-
static void write(Context from, BeamFnApi.Elements.ElementMetadata.Builder builder) {
64+
static void set(Context from, BeamFnApi.Elements.ElementMetadata.Builder builder) {
6565
W3CTraceContextPropagator.getInstance().inject(from, builder, SETTER);
6666
}
6767

sdks/java/core/src/main/java/org/apache/beam/sdk/values/ValueInSingleWindow.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ public void encode(
139139
windowedElem.getOpenTelemetryContext();
140140
if (openTelemetryContext != null) {
141141

142-
OpenTelemetryContextPropagator.write(openTelemetryContext, builder);
142+
OpenTelemetryContextPropagator.set(openTelemetryContext, builder);
143143
}
144144
BeamFnApi.Elements.ElementMetadata metadata = builder.build();
145145
ByteArrayCoder.of().encode(metadata.toByteArray(), outStream);

sdks/java/core/src/main/java/org/apache/beam/sdk/values/WindowedValues.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -356,7 +356,8 @@ public static <T> WindowedValue<T> of(
356356

357357
boolean isGlobal = GlobalWindow.INSTANCE.equals(window);
358358
if (isGlobal && BoundedWindow.TIMESTAMP_MIN_VALUE.equals(timestamp)) {
359-
return new ValueInGlobalWindow<>(value, paneInfo, null, null, causedByDrain);
359+
return new ValueInGlobalWindow<>(
360+
value, paneInfo, null, null, causedByDrain, openTelemetryContext);
360361
} else if (isGlobal) {
361362
return new TimestampedValueInGlobalWindow<>(
362363
value,
@@ -1021,7 +1022,7 @@ public void encode(WindowedValue<T> windowedElem, OutputStream outStream, Coder.
10211022
io.opentelemetry.context.Context openTelemetryContext =
10221023
windowedElem.getOpenTelemetryContext();
10231024
if (openTelemetryContext != null) {
1024-
OpenTelemetryContextPropagator.write(openTelemetryContext, builder);
1025+
OpenTelemetryContextPropagator.set(openTelemetryContext, builder);
10251026
}
10261027
BeamFnApi.Elements.ElementMetadata em =
10271028
builder

0 commit comments

Comments
 (0)