From 2d4fb51e53abd9c6ec45480a6ca827e15a3c15b3 Mon Sep 17 00:00:00 2001
From: martincostello <martin@martincostello.com>
Date: Wed, 30 Jul 2025 15:09:04 +0100
Subject: [PATCH 1/2] Add tracing for Cassandra

- Bump CassandraCSharpDriver to 3.22.0.
- Add support for tracing to Cassandra.
---
 CHANGELOG.md                                                | 5 +++++
 .../Instrumentations/CassandraInitializer.cs                | 6 ++++++
 src/Grafana.OpenTelemetry/Grafana.OpenTelemetry.csproj      | 6 ++----
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cf2d3906..930d31ab 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -162,6 +162,11 @@
 * Use 1.12.0-beta.1 of OpenTelemetry.Resources.OperatingSystem ([#145](https://github.com/grafana/grafana-opentelemetry-dotnet/pull/145))
 * Use 1.12.0-beta.1 of OpenTelemetry.Resources.Process ([#145](https://github.com/grafana/grafana-opentelemetry-dotnet/pull/145))
 * Use 1.12.0-beta.1 of OpenTelemetry.Resources.ProcessRuntime ([#145](https://github.com/grafana/grafana-opentelemetry-dotnet/pull/145))
+* Use 3.22.0 of CassandraCSharpDriver
+  ([#202](https://github.com/grafana/grafana-opentelemetry-dotnet/pull/202))
+* Enable tracing for Cassandra instrumentation (requires the
+  `CassandraCSharpDriver.OpenTelemetry` NuGet package to be installed)
+  ([#202](https://github.com/grafana/grafana-opentelemetry-dotnet/pull/202))
 
 ### Bug Fixes
 
diff --git a/src/Grafana.OpenTelemetry.Base/Instrumentations/CassandraInitializer.cs b/src/Grafana.OpenTelemetry.Base/Instrumentations/CassandraInitializer.cs
index 3fd112a6..b4a030e6 100644
--- a/src/Grafana.OpenTelemetry.Base/Instrumentations/CassandraInitializer.cs
+++ b/src/Grafana.OpenTelemetry.Base/Instrumentations/CassandraInitializer.cs
@@ -4,6 +4,7 @@
 //
 
 using OpenTelemetry.Metrics;
+using OpenTelemetry.Trace;
 
 namespace Grafana.OpenTelemetry
 {
@@ -19,5 +20,10 @@ protected override void InitializeMetrics(MeterProviderBuilder builder)
                 "AddCassandraInstrumentation",
                 new object[] { builder });
         }
+
+        protected override void InitializeTracing(TracerProviderBuilder builder)
+        {
+            builder.AddSource("CassandraCSharpDriver.OpenTelemetry");
+        }
     }
 }
diff --git a/src/Grafana.OpenTelemetry/Grafana.OpenTelemetry.csproj b/src/Grafana.OpenTelemetry/Grafana.OpenTelemetry.csproj
index 5a127736..a34cfb19 100644
--- a/src/Grafana.OpenTelemetry/Grafana.OpenTelemetry.csproj
+++ b/src/Grafana.OpenTelemetry/Grafana.OpenTelemetry.csproj
@@ -20,11 +20,9 @@
   </ItemGroup>
 
   <!-- This dependency is pulled in by `OpenTelemetry.Instrumentation.Cassandra` with a minimum
-       version of 3.16.0. We change this to 3.17.0, as the previous versions have dependency
-       requirements that conflict with recent .NET package versions. -->
+       version of 3.16.0. We change this to 3.22.0 to add support for tracing. -->
   <ItemGroup>
-    <!-- TODO Bump to 3.22.0? -->
-    <PackageReference Include="CassandraCSharpDriver" Version="[3.17.0,)" />
+    <PackageReference Include="CassandraCSharpDriver" Version="[3.22.0,)" />
   </ItemGroup>
 
   <ItemGroup Label="Stable instrumentation packages with dependencies">

From a0d65c89165e9eeaf38ef3204e019d6dc13d136c Mon Sep 17 00:00:00 2001
From: martincostello <martin@martincostello.com>
Date: Wed, 30 Jul 2025 15:11:20 +0100
Subject: [PATCH 2/2] Update CHANGELOG

Clarify comment about `CassandraCSharpDriver.OpenTelemetry`.
---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 930d31ab..e7f46c25 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -165,7 +165,7 @@
 * Use 3.22.0 of CassandraCSharpDriver
   ([#202](https://github.com/grafana/grafana-opentelemetry-dotnet/pull/202))
 * Enable tracing for Cassandra instrumentation (requires the
-  `CassandraCSharpDriver.OpenTelemetry` NuGet package to be installed)
+  `CassandraCSharpDriver.OpenTelemetry` NuGet package to be installed in your application)
   ([#202](https://github.com/grafana/grafana-opentelemetry-dotnet/pull/202))
 
 ### Bug Fixes