Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -634,6 +634,8 @@ class BeamModulePlugin implements Plugin<Project> {
def nemo_version = "0.1"
// [bomupgrader] determined by: io.grpc:grpc-netty, consistent with: google_cloud_platform_libraries_bom
def netty_version = "4.1.110.Final"
// [bomupgrader] determined by: io.opentelemetry:opentelemetry-sdk, consistent with: google_cloud_platform_libraries_bom
def opentelemetry_version = "1.47.0"
def postgres_version = "42.2.16"
// [bomupgrader] determined by: com.google.protobuf:protobuf-java, consistent with: google_cloud_platform_libraries_bom
def protobuf_version = "4.33.0"
Expand Down Expand Up @@ -853,6 +855,8 @@ 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
postgres : "org.postgresql:postgresql:$postgres_version",
protobuf_java : "com.google.protobuf:protobuf-java:$protobuf_version",
protobuf_java_util : "com.google.protobuf:protobuf-java-util:$protobuf_version",
Expand Down
1 change: 1 addition & 0 deletions scripts/tools/bomupgrader.py
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ class BeamModulePluginProcessor:
"grpc":
"io.grpc:grpc-netty", # use "grpc-netty" to pick up proper netty version
"netty": "io.netty:netty-transport",
"opentelemetry": "io.opentelemetry:opentelemetry-sdk",
"protobuf": "com.google.protobuf:protobuf-java"
}
# dependencies managed by GCP-BOM that used the dependencies in KNOWN_DEPS
Expand Down
8 changes: 8 additions & 0 deletions sdks/java/container/license_scripts/dep_urls_java.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,14 @@ org.eclipse.jgit:
'4.4.1.201607150455-r':
license: "https://www.eclipse.org/org/documents/edl-v10.html"
type: "Eclipse Distribution License - v1.0"
opentelemetry-bom:
'1.47.0':
license: "https://raw.githubusercontent.com/open-telemetry/opentelemetry-java/v1.47.0/LICENSE"
type: "Apache License 2.0"
opentelemetry-bom-alpha:
'1.47.0-alpha':
license: "https://raw.githubusercontent.com/open-telemetry/opentelemetry-java/v1.47.0/LICENSE"
type: "Apache License 2.0"
zstd-jni:
'1.5.2-5':
license: "https://raw.githubusercontent.com/luben/zstd-jni/master/LICENSE"
Expand Down
2 changes: 2 additions & 0 deletions sdks/java/core/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,8 @@ dependencies {
shadow library.java.jackson_core
shadow library.java.jackson_annotations
shadow library.java.jackson_databind
shadow platform(library.java.opentelemetry_bom)
shadow library.java.opentelemetry_api
shadow library.java.slf4j_api
shadow library.java.snappy_java
shadow library.java.joda_time
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@
import static org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.base.Preconditions.checkNotNull;

import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonIgnore;
import io.opentelemetry.api.GlobalOpenTelemetry;
import io.opentelemetry.api.OpenTelemetry;
import java.time.Duration;
import java.util.ArrayList;
import java.util.Arrays;
Expand Down Expand Up @@ -452,4 +455,29 @@ public Duration create(PipelineOptions options) {
List<String> getAvroSerializableClasses();

void setAvroSerializableClasses(List<String> options);

/**
* The OpenTelemetry properties that will be appended to the set of system properties for SDK
* harness instances. Property names must be specified without the 'otel.' prefix.
*/
@Description(
"The OpenTelemetry properties that will be appended to the set of system properties for SDK "
+ "harness instances. Property names must be specified without the 'otel.' prefix.")
Map<String, String> getOpenTelemetryProperties();

void setOpenTelemetryProperties(Map<String, String> value);

@JsonIgnore
@Hidden
@Default.InstanceFactory(GlobalOpenTelemetryFactory.class)
OpenTelemetry getOpenTelemetry();

void setOpenTelemetry(OpenTelemetry value);

class GlobalOpenTelemetryFactory implements DefaultValueFactory<OpenTelemetry> {
@Override
public OpenTelemetry create(PipelineOptions options) {
return GlobalOpenTelemetry.get();
}
}
}
Loading