Skip to content

feat: update with latest from main #2739

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
diegomarquezp wants to merge 7 commits into from
Closed

feat: update with latest from main #2739

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
93e8f59
chore: add release manifest for version 2.70.0
diegomarquezp Dec 3, 2025
1bc04be
chore: add release-please configuration
diegomarquezp Dec 3, 2025
23d0b0a
feat: configure rc releases to be on prerelease mode
diegomarquezp Dec 4, 2025
798193f
fix: next release candidate
diegomarquezp Dec 4, 2025
7c3dcbe
chore(protobuf-4.x-rc): release 2.70.1-rc1-SNAPSHOT (#2725)
diegomarquezp Dec 5, 2025
ec7c710
chore: sync with last release from main branch
diegomarquezp Dec 15, 2025
2e432a4
fix(bigtable): add handling for gauge metrics (#2719)
sushanb Dec 12, 2025
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
3 changes: 3 additions & 0 deletions .release-please-manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
".": "2.70.1"
}
16 changes: 8 additions & 8 deletions google-cloud-bigtable-bom/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-bigtable-bom</artifactId>
<version>2.70.0</version><!-- {x-version-update:google-cloud-bigtable:current} -->
<version>2.70.1-rc1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
<packaging>pom</packaging>
<parent>
<groupId>com.google.cloud</groupId>
Expand Down Expand Up @@ -63,37 +63,37 @@
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-bigtable</artifactId>
<version>2.70.0</version><!-- {x-version-update:google-cloud-bigtable:current} -->
<version>2.70.1-rc1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
</dependency>
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-bigtable-emulator</artifactId>
<version>0.207.0</version><!-- {x-version-update:google-cloud-bigtable-emulator:current} -->
<version>0.207.1-rc1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable-emulator:current} -->
</dependency>
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-bigtable-emulator-core</artifactId>
<version>0.207.0</version><!-- {x-version-update:google-cloud-bigtable-emulator:current} -->
<version>0.207.1-rc1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable-emulator:current} -->
</dependency>
<dependency>
<groupId>com.google.api.grpc</groupId>
<artifactId>grpc-google-cloud-bigtable-admin-v2</artifactId>
<version>2.70.0</version><!-- {x-version-update:grpc-google-cloud-bigtable-admin-v2:current} -->
<version>2.70.1-rc1-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-bigtable-admin-v2:current} -->
</dependency>
<dependency>
<groupId>com.google.api.grpc</groupId>
<artifactId>grpc-google-cloud-bigtable-v2</artifactId>
<version>2.70.0</version><!-- {x-version-update:grpc-google-cloud-bigtable-v2:current} -->
<version>2.70.1-rc1-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-bigtable-v2:current} -->
</dependency>
<dependency>
<groupId>com.google.api.grpc</groupId>
<artifactId>proto-google-cloud-bigtable-admin-v2</artifactId>
<version>2.70.0</version><!-- {x-version-update:proto-google-cloud-bigtable-admin-v2:current} -->
<version>2.70.1-rc1-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-bigtable-admin-v2:current} -->
</dependency>
<dependency>
<groupId>com.google.api.grpc</groupId>
<artifactId>proto-google-cloud-bigtable-v2</artifactId>
<version>2.70.0</version><!-- {x-version-update:proto-google-cloud-bigtable-v2:current} -->
<version>2.70.1-rc1-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-bigtable-v2:current} -->
</dependency>
</dependencies>
</dependencyManagement>
Expand Down
2 changes: 1 addition & 1 deletion google-cloud-bigtable-deps-bom/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-bigtable-deps-bom</artifactId>
<version>2.70.0</version><!-- {x-version-update:google-cloud-bigtable:current} -->
<version>2.70.1-rc1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->

<packaging>pom</packaging>
<name>Google Cloud Bigtable Dependency BOM</name>
Expand Down
4 changes: 2 additions & 2 deletions google-cloud-bigtable-emulator-core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@
<parent>
<artifactId>google-cloud-bigtable-parent</artifactId>
<groupId>com.google.cloud</groupId>
<version>2.70.0</version><!-- {x-version-update:google-cloud-bigtable:current} -->
<version>2.70.1-rc1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
</parent>
<name>Google Cloud Java - Bigtable Emulator Core</name>

<artifactId>google-cloud-bigtable-emulator-core</artifactId>
<version>0.207.0</version><!-- {x-version-update:google-cloud-bigtable-emulator:current} -->
<version>0.207.1-rc1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable-emulator:current} -->

<description>
A Java wrapper for the Cloud Bigtable emulator.
Expand Down
10 changes: 5 additions & 5 deletions google-cloud-bigtable-emulator/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>

<artifactId>google-cloud-bigtable-emulator</artifactId>
<version>0.207.0</version><!-- {x-version-update:google-cloud-bigtable-emulator:current} -->
<version>0.207.1-rc1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable-emulator:current} -->
<name>Google Cloud Java - Bigtable Emulator</name>
<url>https://github.com/googleapis/java-bigtable</url>
<description>
Expand All @@ -14,7 +14,7 @@
<parent>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-bigtable-parent</artifactId>
<version>2.70.0</version><!-- {x-version-update:google-cloud-bigtable:current} -->
<version>2.70.1-rc1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
</parent>
<scm>
<connection>scm:git:git@github.com:googleapis/java-bigtable.git</connection>
Expand Down Expand Up @@ -81,14 +81,14 @@
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-bigtable-deps-bom</artifactId>
<version>2.70.0</version><!-- {x-version-update:google-cloud-bigtable:current} -->
<version>2.70.1-rc1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-bigtable-bom</artifactId>
<version>2.70.0</version><!-- {x-version-update:google-cloud-bigtable:current} -->
<version>2.70.1-rc1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
<type>pom</type>
<scope>import</scope>
</dependency>
Expand All @@ -99,7 +99,7 @@
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-bigtable-emulator-core</artifactId>
<version>0.207.0</version><!-- {x-version-update:google-cloud-bigtable-emulator:current} -->
<version>0.207.1-rc1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable-emulator:current} -->
</dependency>

<dependency>
Expand Down
10 changes: 5 additions & 5 deletions google-cloud-bigtable/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>google-cloud-bigtable</artifactId>
<version>2.70.0</version><!-- {x-version-update:google-cloud-bigtable:current} -->
<version>2.70.1-rc1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
<packaging>jar</packaging>
<name>Google Cloud Bigtable</name>
<url>https://github.com/googleapis/java-bigtable</url>
Expand All @@ -12,11 +12,11 @@
<parent>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-bigtable-parent</artifactId>
<version>2.70.0</version><!-- {x-version-update:google-cloud-bigtable:current} -->
<version>2.70.1-rc1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
</parent>
<properties>
<!-- The version that will be embedded in the published jar via maven-resources-plugin -->
<java-bigtable.version>2.70.0</java-bigtable.version><!-- {x-version-update:google-cloud-bigtable:current} -->
<java-bigtable.version>2.70.1-rc1-SNAPSHOT</java-bigtable.version><!-- {x-version-update:google-cloud-bigtable:current} -->

<site.installationModule>google-cloud-bigtable</site.installationModule>

Expand Down Expand Up @@ -54,14 +54,14 @@
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-bigtable-deps-bom</artifactId>
<version>2.70.0</version><!-- {x-version-update:google-cloud-bigtable:current} -->
<version>2.70.1-rc1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-bigtable-bom</artifactId>
<version>2.70.0</version><!-- {x-version-update:google-cloud-bigtable:current} -->
<version>2.70.1-rc1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down
2 changes: 1 addition & 1 deletion google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/Version.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,6 @@
@InternalApi("For internal use only")
public final class Version {
// {x-version-update-start:google-cloud-bigtable:current}
public static String VERSION = "2.70.0";
public static String VERSION = "2.70.1-rc1-SNAPSHOT";
// {x-version-update-end}
}
32 changes: 23 additions & 9 deletions ...e/src/main/java/com/google/cloud/bigtable/data/v2/stub/metrics/BigtableExporterUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@
import com.google.monitoring.v3.TimeInterval;
import com.google.monitoring.v3.TimeSeries;
import com.google.monitoring.v3.TypedValue;
import com.google.protobuf.Timestamp;
import com.google.protobuf.util.Timestamps;
import io.opentelemetry.api.common.AttributeKey;
import io.opentelemetry.api.common.Attributes;
Expand Down Expand Up @@ -281,11 +282,19 @@ private static TimeSeries convertPointToBigtableTimeSeries(
metricBuilder.putLabels(CLIENT_UID_KEY.getKey(), taskId);
builder.setMetric(metricBuilder.build());

MetricKind kind = convertMetricKind(metricData);

Timestamp endTimestamp = Timestamps.fromNanos(pointData.getEpochNanos());
Timestamp startTimestamp;

if (kind == GAUGE) {
// GAUGE metrics must have start_time equal to end_time.
startTimestamp = endTimestamp;
} else {
startTimestamp = Timestamps.fromNanos(pointData.getStartEpochNanos());
}
TimeInterval timeInterval =
TimeInterval.newBuilder()
.setStartTime(Timestamps.fromNanos(pointData.getStartEpochNanos()))
.setEndTime(Timestamps.fromNanos(pointData.getEpochNanos()))
.build();
TimeInterval.newBuilder().setStartTime(startTimestamp).setEndTime(endTimestamp).build();

builder.addPoints(createPoint(metricData.getType(), pointData, timeInterval));

Expand All @@ -294,9 +303,10 @@ private static TimeSeries convertPointToBigtableTimeSeries(

private static Optional<TimeSeries> createInternalMetricsTimeSeries(
MetricData metricData, PointData pointData, MonitoredResource applicationResource) {
MetricKind kind = convertMetricKind(metricData);
TimeSeries.Builder builder =
TimeSeries.newBuilder()
.setMetricKind(convertMetricKind(metricData))
.setMetricKind(kind)
.setValueType(convertValueType(metricData.getType()))
.setResource(applicationResource);

Expand All @@ -318,11 +328,15 @@ private static Optional<TimeSeries> createInternalMetricsTimeSeries(

builder.setMetric(metricBuilder.build());

Timestamp endTimestamp = Timestamps.fromNanos(pointData.getEpochNanos());
Timestamp startTimestamp;
if (kind == GAUGE) {
startTimestamp = endTimestamp;
} else {
startTimestamp = Timestamps.fromNanos(pointData.getStartEpochNanos());
}
TimeInterval timeInterval =
TimeInterval.newBuilder()
.setStartTime(Timestamps.fromNanos(pointData.getStartEpochNanos()))
.setEndTime(Timestamps.fromNanos(pointData.getEpochNanos()))
.build();
TimeInterval.newBuilder().setStartTime(startTimestamp).setEndTime(endTimestamp).build();

builder.addPoints(createPoint(metricData.getType(), pointData, timeInterval));
return Optional.of(builder.build());
Expand Down
8 changes: 4 additions & 4 deletions grpc-google-cloud-bigtable-admin-v2/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,28 +4,28 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.google.api.grpc</groupId>
<artifactId>grpc-google-cloud-bigtable-admin-v2</artifactId>
<version>2.70.0</version><!-- {x-version-update:grpc-google-cloud-bigtable-admin-v2:current} -->
<version>2.70.1-rc1-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-bigtable-admin-v2:current} -->
<name>grpc-google-cloud-bigtable-admin-v2</name>
<description>GRPC library for grpc-google-cloud-bigtable-admin-v2</description>
<parent>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-bigtable-parent</artifactId>
<version>2.70.0</version><!-- {x-version-update:google-cloud-bigtable:current} -->
<version>2.70.1-rc1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
</parent>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-bigtable-deps-bom</artifactId>
<version>2.70.0</version><!-- {x-version-update:google-cloud-bigtable:current} -->
<version>2.70.1-rc1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-bigtable-bom</artifactId>
<version>2.70.0</version><!-- {x-version-update:google-cloud-bigtable:current} -->
<version>2.70.1-rc1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down
8 changes: 4 additions & 4 deletions grpc-google-cloud-bigtable-v2/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,28 +4,28 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.google.api.grpc</groupId>
<artifactId>grpc-google-cloud-bigtable-v2</artifactId>
<version>2.70.0</version><!-- {x-version-update:grpc-google-cloud-bigtable-v2:current} -->
<version>2.70.1-rc1-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-bigtable-v2:current} -->
<name>grpc-google-cloud-bigtable-v2</name>
<description>GRPC library for grpc-google-cloud-bigtable-v2</description>
<parent>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-bigtable-parent</artifactId>
<version>2.70.0</version><!-- {x-version-update:google-cloud-bigtable:current} -->
<version>2.70.1-rc1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
</parent>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-bigtable-deps-bom</artifactId>
<version>2.70.0</version><!-- {x-version-update:google-cloud-bigtable:current} -->
<version>2.70.1-rc1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-bigtable-bom</artifactId>
<version>2.70.0</version><!-- {x-version-update:google-cloud-bigtable:current} -->
<version>2.70.1-rc1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down
12 changes: 6 additions & 6 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

<artifactId>google-cloud-bigtable-parent</artifactId>
<packaging>pom</packaging>
<version>2.70.0</version><!-- {x-version-update:google-cloud-bigtable:current} -->
<version>2.70.1-rc1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
<name>Google Cloud Bigtable Parent</name>
<url>https://github.com/googleapis/java-bigtable</url>
<description>
Expand Down Expand Up @@ -156,27 +156,27 @@
<dependency>
<groupId>com.google.api.grpc</groupId>
<artifactId>proto-google-cloud-bigtable-v2</artifactId>
<version>2.70.0</version><!-- {x-version-update:proto-google-cloud-bigtable-v2:current} -->
<version>2.70.1-rc1-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-bigtable-v2:current} -->
</dependency>
<dependency>
<groupId>com.google.api.grpc</groupId>
<artifactId>proto-google-cloud-bigtable-admin-v2</artifactId>
<version>2.70.0</version><!-- {x-version-update:proto-google-cloud-bigtable-admin-v2:current} -->
<version>2.70.1-rc1-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-bigtable-admin-v2:current} -->
</dependency>
<dependency>
<groupId>com.google.api.grpc</groupId>
<artifactId>grpc-google-cloud-bigtable-v2</artifactId>
<version>2.70.0</version><!-- {x-version-update:grpc-google-cloud-bigtable-v2:current} -->
<version>2.70.1-rc1-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-bigtable-v2:current} -->
</dependency>
<dependency>
<groupId>com.google.api.grpc</groupId>
<artifactId>grpc-google-cloud-bigtable-admin-v2</artifactId>
<version>2.70.0</version><!-- {x-version-update:grpc-google-cloud-bigtable-admin-v2:current} -->
<version>2.70.1-rc1-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-bigtable-admin-v2:current} -->
</dependency>
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-bigtable</artifactId>
<version>2.70.0</version><!-- {x-version-update:google-cloud-bigtable:current} -->
<version>2.70.1-rc1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
</dependency>
<!-- Test Deps in alphabetical order -->
<dependency>
Expand Down
8 changes: 4 additions & 4 deletions proto-google-cloud-bigtable-admin-v2/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,28 +4,28 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.google.api.grpc</groupId>
<artifactId>proto-google-cloud-bigtable-admin-v2</artifactId>
<version>2.70.0</version><!-- {x-version-update:proto-google-cloud-bigtable-admin-v2:current} -->
<version>2.70.1-rc1-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-bigtable-admin-v2:current} -->
<name>proto-google-cloud-bigtable-admin-v2</name>
<description>PROTO library for proto-google-cloud-bigtable-admin-v2</description>
<parent>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-bigtable-parent</artifactId>
<version>2.70.0</version><!-- {x-version-update:google-cloud-bigtable:current} -->
<version>2.70.1-rc1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
</parent>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-bigtable-deps-bom</artifactId>
<version>2.70.0</version><!-- {x-version-update:google-cloud-bigtable:current} -->
<version>2.70.1-rc1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-bigtable-bom</artifactId>
<version>2.70.0</version><!-- {x-version-update:google-cloud-bigtable:current} -->
<version>2.70.1-rc1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down
Loading
Loading