Visitar URL original
feat: Introducing Tracing with OpenTelemetry API #1537 by jimit-j-shah · Pull Request #1576 · googleapis/java-datastore · GitHub
Skip to content
This repository was archived by the owner on Feb 24, 2026. It is now read-only.

feat: Introducing Tracing with OpenTelemetry API #1537 #1576

Merged
jimit-j-shah merged 39 commits into from
Sep 19, 2024
Merged

feat: Introducing Tracing with OpenTelemetry API #1537 #1576

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
4a480c9
feat: Adding TraceUtil interface and its implementation to enable Tra…
jimit-j-shah May 8, 2024
762d126
feat: Adding Lookup RPC OpenTelemetry Tracing (#1437)
jimit-j-shah May 15, 2024
052adf7
feat: Adding Commit RPC Trace Instrumentation (#1440)
jimit-j-shah May 20, 2024
f29a1cd
feat: RunQuery trace instrumentation (#1441)
jimit-j-shah May 23, 2024
931e69c
feat: RunAggregationQuery instrumentation (#1447)
jimit-j-shah May 23, 2024
d40e9e3
feat: RunQuery trace instrumentation
jimit-j-shah May 15, 2024
f981126
Formatting
jimit-j-shah May 15, 2024
c38420f
Formatting
jimit-j-shah May 15, 2024
43fb599
Refactor: s/RUNQUERY/RUN_QUERY
jimit-j-shah May 16, 2024
f2999de
feat: RunAggregationQuery Trace Instrumentation
jimit-j-shah May 16, 2024
e2ca649
Build: retiring test assertions for OpenCensus spans - will be replac…
jimit-j-shah May 16, 2024
6dec8c5
Formatting
jimit-j-shah May 17, 2024
b3a1506
Fixing @Test annotation missed after merge
jimit-j-shah May 20, 2024
67099d5
Formatting
jimit-j-shah May 20, 2024
895f615
feat: Add Transaction tracing
jimit-j-shah May 21, 2024
8c03ba6
test: Transaction test for RunInTransaction - need to fix trace instr…
jimit-j-shah May 21, 2024
20c1a54
Adding transaction span names
jimit-j-shah May 23, 2024
2ed509b
TransactionLookupTest
jimit-j-shah May 23, 2024
6e1a8cc
feat: support for transactional operations
jimit-j-shah May 30, 2024
5f56b06
Revert "feat: support for transactional operations"
jimit-j-shah May 30, 2024
5249bd9
feat: support for transactional operations (#1468)
jimit-j-shah Jun 7, 2024
0abf298
feat: Allocateid tracing (#1488)
jimit-j-shah Jun 19, 2024
6af5223
feat: Add tracing for ReserveIds operation (#1490)
jimit-j-shah Jun 25, 2024
d02d959
fix: Fixed Span nesting for `ReadWriteTransactionCallable` by using p…
jimit-j-shah Jun 27, 2024
45da20b
test: Additional Transaction Testing and cleanup OpenCensus usage (#1…
jimit-j-shah Jul 2, 2024
db41656
test: Adding ITTracingTest to verify events and span attributes (whic…
jimit-j-shah Jul 10, 2024
9672e7b
test: Additional Transaction tests and AggregationQuery test (#1518)
jimit-j-shah Jul 19, 2024
f13184e
fix: Undelete gRPC upgrade docs
jimit-j-shah Aug 5, 2024
520e351
fix: Undo merge mistakes
jimit-j-shah Aug 5, 2024
acf19d4
fix: Updating span event strings (#1539)
jimit-j-shah Aug 6, 2024
d903850
Fix: typo in test causing integration test failure (#1556)
jimit-j-shah Sep 4, 2024
83ce822
fix: opentelemetry-sdk should only be used as a Test Dependency
jimit-j-shah Sep 16, 2024
45541d3
fix: Update opentelemetry.version - this also fixes the tests failing…
jimit-j-shah Sep 16, 2024
da943a1
fix: Replacing attribute key values w/ constants
jimit-j-shah Sep 16, 2024
7b0b45c
fix: opentelemetry.version to fix RequireUpperBoundDeps check https:/…
jimit-j-shah Sep 16, 2024
e4b4af0
fix: Create Span hierarchy using parent Span (#1580)
jimit-j-shah Sep 19, 2024
d2e2680
fix: formatting and import refactoring
jimit-j-shah Sep 19, 2024
a1adb66
Merge branch 'main' into tracing-main-4
jimit-j-shah Sep 19, 2024
e0d3ba9
chore: generate libraries at Thu Sep 19 18:35:54 UTC 2024
cloud-java-bot Sep 19, 2024
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 README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ If you are using Maven without the BOM, add this to your dependencies:
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-datastore</artifactId>
<version>2.21.2</version>
<version>2.21.3</version>
</dependency>

```
Expand Down
12 changes: 12 additions & 0 deletions google-cloud-datastore/clirr-ignored-differences.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,4 +55,16 @@
<method>java.lang.Object execute(com.google.cloud.datastore.Query, com.google.cloud.datastore.ReadOption[])</method>
<differenceType>7004</differenceType>
</difference>
<difference>
<className>com/google/cloud/datastore/RetryAndTraceDatastoreRpcDecorator</className>
<method>RetryAndTraceDatastoreRpcDecorator(com.google.cloud.datastore.spi.v1.DatastoreRpc, com.google.cloud.datastore.TraceUtil, com.google.api.gax.retrying.RetrySettings, com.google.cloud.datastore.DatastoreOptions)</method>
<to>RetryAndTraceDatastoreRpcDecorator(com.google.cloud.datastore.spi.v1.DatastoreRpc, com.google.cloud.datastore.telemetry.TraceUtil, com.google.api.gax.retrying.RetrySettings, com.google.cloud.datastore.DatastoreOptions)</to>
<differenceType>7005</differenceType>
</difference>

<!-- Class removed -->
<difference>
<className>com/google/cloud/datastore/TraceUtil</className>
<differenceType>8001</differenceType>
</difference>
</differences>
86 changes: 85 additions & 1 deletion google-cloud-datastore/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,20 @@
</parent>
<properties>
<site.installationModule>google-cloud-datastore</site.installationModule>
<opentelemetry.version>1.42.0</opentelemetry.version>
</properties>
<dependencyManagement>
<dependencies>
<dependency>
<!-- Artifacts from google-cloud-java monorepo -->
<groupId>com.google.cloud</groupId>
<artifactId>gapic-libraries-bom</artifactId>
<version>1.37.0</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>
<dependencies>
<dependency>
<groupId>com.google.api.grpc</groupId>
Expand All @@ -38,6 +51,10 @@
<groupId>com.google.cloud.datastore</groupId>
<artifactId>datastore-v1-proto-client</artifactId>
</dependency>
<dependency>
<groupId>com.google.auth</groupId>
<artifactId>google-auth-library-credentials</artifactId>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-api</artifactId>
Expand Down Expand Up @@ -111,14 +128,26 @@
<artifactId>jsr305</artifactId>
</dependency>

<!-- OpenTelemetry -->
<dependency>
<groupId>io.opentelemetry</groupId>
<artifactId>opentelemetry-api</artifactId>
<version>${opentelemetry.version}</version>
</dependency>
<dependency>
<groupId>io.opentelemetry</groupId>
<artifactId>opentelemetry-context</artifactId>
<version>${opentelemetry.version}</version>
</dependency>
<!-- END OpenTelemetry -->

<!-- Test dependencies -->
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>google-cloud-core</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>

<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava-testlib</artifactId>
Expand Down Expand Up @@ -160,6 +189,61 @@
<version>1.4.4</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.google.testparameterinjector</groupId>
<artifactId>test-parameter-injector</artifactId>
<version>1.16</version>
<scope>test</scope>
</dependency>
<!-- OpenTelemetry -->
<dependency>
<groupId>io.opentelemetry</groupId>
<artifactId>opentelemetry-sdk</artifactId>
<version>${opentelemetry.version}</version>
</dependency>
<dependency>
<groupId>io.opentelemetry</groupId>
<artifactId>opentelemetry-sdk-common</artifactId>
<version>${opentelemetry.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.opentelemetry</groupId>
<artifactId>opentelemetry-sdk-testing</artifactId>
<version>${opentelemetry.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.opentelemetry</groupId>
<artifactId>opentelemetry-sdk-trace</artifactId>
<version>${opentelemetry.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.opentelemetry</groupId>
<artifactId>opentelemetry-semconv</artifactId>
<version>1.1.0-alpha</version>
<scope>test</scope>
</dependency>
<!-- END OpenTelemetry -->
<!-- Cloud Ops -->
<dependency>
<groupId>com.google.cloud.opentelemetry</groupId>
<artifactId>exporter-trace</artifactId>
<version>0.15.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-trace</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.google.api.grpc</groupId>
<artifactId>proto-google-cloud-trace-v1</artifactId>
<scope>test</scope>
</dependency>
<!-- END Cloud Ops -->
</dependencies>

<build>
Expand Down
Loading