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
2 changes: 1 addition & 1 deletion .github/workflows/update_generation_config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
# the branch into which the pull request is merged
base_branch: main
steps:
- uses: actions/checkout@v5
- uses: actions/checkout@v4
with:
fetch-depth: 0
token: ${{ secrets.CLOUD_JAVA_BOT_TOKEN }}
Expand Down
3 changes: 2 additions & 1 deletion benchmarks/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<junixsocket.version>2.10.1</junixsocket.version>
<opentelemetry.version>1.56.0</opentelemetry.version>
<google.cloud.monitoring.version>3.81.0</google.cloud.monitoring.version>

Choose a reason for hiding this comment

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

medium

To improve maintainability and consistency with the goal of this PR, consider defining a property for the google.cloud.opentelemetry dependencies as well. The dependencies exporter-trace (line 53) and exporter-metrics (line 58) use a hardcoded version 0.36.0. You can define the property here and then use it for those dependencies.

    <google.cloud.monitoring.version>3.81.0</google.cloud.monitoring.version>
    <google.cloud.opentelemetry.version>0.36.0</google.cloud.opentelemetry.version>

</properties>

<dependencies>
Expand All @@ -59,7 +60,7 @@
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-monitoring</artifactId>
<version>3.77.0</version>
<version>${google.cloud.monitoring.version}</version>
</dependency>
<!-- OpenTelemetry test dependencies -->
<dependency>
Expand Down
14 changes: 10 additions & 4 deletions google-cloud-spanner-executor/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
<maven.compiler.target>1.8</maven.compiler.target>
<maven.compiler.source>1.8</maven.compiler.source>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<google.cloud.opentelemetry.version>0.36.0</google.cloud.opentelemetry.version>
</properties>

<dependencies>
Expand All @@ -41,11 +42,16 @@
<dependency>
<groupId>io.opentelemetry</groupId>
<artifactId>opentelemetry-sdk-trace</artifactId>
</dependency>
</dependency>
<dependency>
<groupId>com.google.cloud.opentelemetry</groupId>
<artifactId>shared-resourcemapping</artifactId>
<version>${google.cloud.opentelemetry.version}</version>
</dependency>
<dependency>
<groupId>com.google.cloud.opentelemetry</groupId>
<artifactId>exporter-trace</artifactId>
<version>0.33.0</version>
<version>${google.cloud.opentelemetry.version}</version>
<exclusions>
<exclusion>
<groupId>io.opentelemetry.semconv</groupId>
Expand All @@ -64,7 +70,7 @@
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-trace</artifactId>
<version>2.76.0</version>
<version>2.79.0</version>

Choose a reason for hiding this comment

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

medium

This version is hardcoded. The proto-google-cloud-trace-v1 dependency on line 153 also has a hardcoded version 2.79.0. To align with the goal of this PR to use properties for synchronized versions, consider defining a property like <google.cloud.trace.version>2.79.0</google.cloud.trace.version> in the <properties> section and using it here and for the other dependency.

Suggested change
<version>2.79.0</version>
<version>${google.cloud.trace.version}</version>

<!-- Version will be managed by guava -->
<exclusions>
<exclusion>
Expand Down Expand Up @@ -290,7 +296,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<configuration>
<ignoredDependencies> com.google.api:gax,org.apache.maven.surefire:surefire-junit4,io.opentelemetry.semconv:opentelemetry-semconv </ignoredDependencies>
<ignoredDependencies> com.google.api:gax,org.apache.maven.surefire:surefire-junit4,io.opentelemetry.semconv:opentelemetry-semconv,com.google.cloud.opentelemetry:shared-resourcemapping </ignoredDependencies>
</configuration>
</plugin>
</plugins>
Expand Down
11 changes: 6 additions & 5 deletions google-cloud-spanner/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
<properties>
<site.installationModule>google-cloud-spanner</site.installationModule>
<opencensus.version>0.31.1</opencensus.version>
<google.cloud.monitoring.version>3.81.0</google.cloud.monitoring.version>
<spanner.testenv.config.class>com.google.cloud.spanner.GceTestEnvConfig</spanner.testenv.config.class>
<spanner.testenv.instance>projects/gcloud-devel/instances/spanner-testing-east1</spanner.testenv.instance>
<spanner.gce.config.project_id>gcloud-devel</spanner.gce.config.project_id>
Expand Down Expand Up @@ -272,7 +273,7 @@
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-monitoring</artifactId>
<version>3.77.0</version>
<version>${google.cloud.monitoring.version}</version>
<!-- Version will be managed by guava -->
<exclusions>
<exclusion>
Expand All @@ -284,7 +285,7 @@
<dependency>
<groupId>com.google.api.grpc</groupId>
<artifactId>proto-google-cloud-monitoring-v3</artifactId>
<version>3.77.0</version>
<version>${google.cloud.monitoring.version}</version>
<!-- Version will be managed by guava -->
<exclusions>
<exclusion>
Expand All @@ -296,7 +297,7 @@
<dependency>
<groupId>com.google.api.grpc</groupId>
<artifactId>grpc-google-cloud-monitoring-v3</artifactId>
<version>3.77.0</version>
<version>${google.cloud.monitoring.version}</version>
<scope>test</scope>
<!-- Version will be managed by guava -->
<exclusions>
Expand Down Expand Up @@ -499,13 +500,13 @@
<dependency>
<groupId>com.google.cloud.opentelemetry</groupId>
<artifactId>exporter-trace</artifactId>
<version>0.33.0</version>
<version>0.36.0</version>

Choose a reason for hiding this comment

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

medium

The version for exporter-trace is hardcoded. To improve maintainability and align with the PR's goal, please define a property <google.cloud.opentelemetry.version>0.36.0</google.cloud.opentelemetry.version> in the <properties> section of this POM (e.g., on line 19) and use it here.

Suggested change
<version>0.36.0</version>
<version>${google.cloud.opentelemetry.version}</version>

<scope>test</scope>
</dependency>
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-trace</artifactId>
<version>2.76.0</version>
<version>2.79.0</version>

Choose a reason for hiding this comment

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

medium

The version for google-cloud-trace is hardcoded. The proto-google-cloud-trace-v1 dependency on line 515 also has a hardcoded version 2.79.0. To improve maintainability, consider defining a property like <google.cloud.trace.version>2.79.0</google.cloud.trace.version> in the <properties> section (e.g., on line 19) and using it for both dependencies.

Suggested change
<version>2.79.0</version>
<version>${google.cloud.trace.version}</version>

<scope>test</scope>
</dependency>
<dependency>
Expand Down
Loading