sjvanrossum commented on code in PR #36962:
URL: https://github.com/apache/beam/pull/36962#discussion_r2918331418
##########
buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy:
##########
@@ -855,8 +857,13 @@ class BeamModulePlugin implements Plugin<Project> {
netty_tcnative_boringssl_static :
"io.netty:netty-tcnative-boringssl-static:2.0.52.Final",
netty_transport :
"io.netty:netty-transport:$netty_version",
netty_transport_native_epoll :
"io.netty:netty-transport-native-epoll:$netty_version",
- opentelemetry_api :
"io.opentelemetry:opentelemetry-api", // google_cloud_platform_libraries_bom
sets version
- opentelemetry_bom :
"io.opentelemetry:opentelemetry-bom-alpha:$opentelemetry_version-alpha", //
alpha required by extensions
+ opentelemetry_api :
"io.opentelemetry:opentelemetry-api:$opentelemetry_sdk_version",
+ opentelemetry_bom :
"io.opentelemetry:opentelemetry-bom-alpha:$opentelemetry_sdk_version-alpha", //
alpha required by extensions
+ opentelemetry_context :
"io.opentelemetry:opentelemetry-context:$opentelemetry_sdk_version",
+ opentelemetry_gcp_auth :
"io.opentelemetry.contrib:opentelemetry-gcp-auth-extension:$opentelemetry_contrib_version-alpha",
+ opentelemetry_sdk :
"io.opentelemetry:opentelemetry-sdk:$opentelemetry_sdk_version",
+ opentelemetry_exporter_otlp :
"io.opentelemetry:opentelemetry-exporter-otlp:$opentelemetry_sdk_version",
+ opentelemetry_extension_autoconfigure :
"io.opentelemetry:opentelemetry-sdk-extension-autoconfigure:$opentelemetry_sdk_version",
Review Comment:
GCP BOM sets OpenTelemetry SDK version iirc:
```suggestion
opentelemetry_api :
"io.opentelemetry:opentelemetry-api", // google_cloud_platform_libraries_bom
sets version
opentelemetry_bom :
"io.opentelemetry:opentelemetry-bom-alpha:$opentelemetry_sdk_version-alpha", //
alpha required by extensions
opentelemetry_context :
"io.opentelemetry:opentelemetry-context", //
google_cloud_platform_libraries_bom sets version
opentelemetry_gcp_auth :
"io.opentelemetry.contrib:opentelemetry-gcp-auth-extension:$opentelemetry_contrib_version-alpha",
opentelemetry_sdk :
"io.opentelemetry:opentelemetry-sdk", // google_cloud_platform_libraries_bom
sets version
opentelemetry_exporter_otlp :
"io.opentelemetry:opentelemetry-exporter-otlp", //
google_cloud_platform_libraries_bom sets version
opentelemetry_extension_autoconfigure :
"io.opentelemetry:opentelemetry-sdk-extension-autoconfigure", //
google_cloud_platform_libraries_bom sets version
```
##########
buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy:
##########
@@ -634,6 +634,8 @@ class BeamModulePlugin implements Plugin<Project> {
def netty_version = "4.1.124.Final"
// [bomupgrader] determined by: io.opentelemetry:opentelemetry-sdk,
consistent with: google_cloud_platform_libraries_bom
def opentelemetry_version = "1.51.0"
+ def opentelemetry_sdk_version = "1.56.0"
Review Comment:
That line above can be removed I think:
```suggestion
def opentelemetry_sdk_version = "1.56.0"
```
##########
sdks/java/core/src/main/java/org/apache/beam/sdk/values/WindowedValues.java:
##########
@@ -923,6 +1018,10 @@ public void encode(WindowedValue<T> windowedElem,
OutputStream outStream, Contex
if (metadataSupported) {
BeamFnApi.Elements.ElementMetadata.Builder builder =
BeamFnApi.Elements.ElementMetadata.newBuilder();
+ io.opentelemetry.context.Context context1 =
windowedElem.getOpenTelemetryContext();
+ if (context1 != null) {
+ OpenTelemetryContextPropagator.write(context1, builder);
+ }
Review Comment:
```suggestion
io.opentelemetry.context.Context openTelemetryContext =
windowedElem.getOpenTelemetryContext();
if (openTelemetryContext != null) {
OpenTelemetryContextPropagator.write(openTelemetryContext,
builder);
}
```
##########
sdks/java/core/src/main/java/org/apache/beam/sdk/values/ValueInSingleWindow.java:
##########
@@ -132,29 +150,32 @@ public void encode(ValueInSingleWindow<T> windowedElem,
OutputStream outStream,
@Override
public ValueInSingleWindow<T> decode(InputStream inStream) throws
IOException {
- return decode(inStream, Context.NESTED);
+ return decode(inStream, Coder.Context.NESTED);
}
@Override
@SuppressWarnings("IgnoredPureGetter")
- public ValueInSingleWindow<T> decode(InputStream inStream, Context
context) throws IOException {
+ public ValueInSingleWindow<T> decode(InputStream inStream, Coder.Context
context)
+ throws IOException {
Instant timestamp = InstantCoder.of().decode(inStream);
BoundedWindow window = windowCoder.decode(inStream);
PaneInfo paneInfo = PaneInfo.PaneInfoCoder.INSTANCE.decode(inStream);
CausedByDrain causedByDrain = CausedByDrain.NORMAL;
+ io.opentelemetry.context.@Nullable Context openTelemetryContext = null;
Review Comment:
```suggestion
@Nullable io.opentelemetry.context.Context openTelemetryContext = null;
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
