Skip to content

OpenTelemetry follow up PR #613

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

Merged
merged 16 commits into from
Sep 20, 2024
Merged

OpenTelemetry follow up PR #613

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
a39b8fd
support db.query.text tag
joao-r-reis Sep 17, 2024
610c50b
add opentelemetry distributed tracing example
joao-r-reis Sep 17, 2024
a640962
add batch statement opentelemetry test
joao-r-reis Sep 17, 2024
195f7d9
add OtelExporter to Otel distributed tracing example
joao-r-reis Sep 17, 2024
a0fe879
update tests after opentelemetry semantics upgrade
joao-r-reis Sep 18, 2024
91d0a8c
rename builder extension to WithOpenTelemetryInstrumentation
joao-r-reis Sep 18, 2024
7ab6233
Fix docs and fix csproj file
joao-r-reis Sep 18, 2024
7b338bb
fix OpenTelemetry integration with speculative executions
joao-r-reis Sep 18, 2024
099346c
fix activity name
joao-r-reis Sep 18, 2024
ae28871
adjust names
joao-r-reis Sep 18, 2024
42b48fb
fix unit test
joao-r-reis Sep 18, 2024
b4ca9a5
add RequestTracker.OnNodeAborted
joao-r-reis Sep 18, 2024
fc3a6d0
PR suggestions
joao-r-reis Sep 19, 2024
19f88c5
performance
joao-r-reis Sep 19, 2024
6e3156e
performance
joao-r-reis Sep 19, 2024
a54fa62
remove unneeded volatile
joao-r-reis Sep 19, 2024
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
update tests after opentelemetry semantics upgrade
  • Loading branch information
@joao-r-reis
joao-r-reis committed Sep 18, 2024
commit a0fe879110bf6bd58c8bb47dd1f2d3798036a67c
13 changes: 6 additions & 7 deletions src/Cassandra.IntegrationTests/OpenTelemetry/OpenTelemetryTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
using System;
using System.Collections;
using System.Collections.Generic;
using System.Data;
using System.Diagnostics;
using System.Linq;
using System.Threading.Tasks;
Expand Down Expand Up @@ -198,8 +197,8 @@ await session.ExecuteAsync(statement).ContinueWith(t =>

ValidateSessionActivityAttributes(syncSessionActivity, typeof(SimpleStatement));
ValidateNodeActivityAttributes(syncNodeActivity, typeof(SimpleStatement));
Assert.Contains(new KeyValuePair<string, string>("db.statement", "SELECT key FROM system.local"), syncSessionActivity.Tags.ToArray());
Assert.Contains(new KeyValuePair<string, string>("db.statement", "SELECT key FROM system.local"), syncNodeActivity.Tags.ToArray());
Assert.Contains(new KeyValuePair<string, string>("db.query.text", "SELECT key FROM system.local"), syncSessionActivity.Tags.ToArray());
Assert.Contains(new KeyValuePair<string, string>("db.query.text", "SELECT key FROM system.local"), syncNodeActivity.Tags.ToArray());
}

[Category(TestCategory.RealCluster)]
Expand Down Expand Up @@ -276,9 +275,9 @@ await mapper.InsertIfNotExistsAsync(songOne, testProfile, true, null)
ValidateSessionActivityAttributes(syncSessionActivity, typeof(BoundStatement));
ValidateNodeActivityAttributes(syncNodeActivity, typeof(BoundStatement));
Assert.Contains(new KeyValuePair<string, string>(
"db.statement", $"INSERT INTO {keyspace}.song (Artist, Id, ReleaseDate, Title) VALUES (?, ?, ?, ?) IF NOT EXISTS"), syncSessionActivity.Tags.ToArray());
"db.query.text", $"INSERT INTO {keyspace}.song (Artist, Id, ReleaseDate, Title) VALUES (?, ?, ?, ?) IF NOT EXISTS"), syncSessionActivity.Tags.ToArray());
Assert.Contains(new KeyValuePair<string, string>(
"db.statement", $"INSERT INTO {keyspace}.song (Artist, Id, ReleaseDate, Title) VALUES (?, ?, ?, ?) IF NOT EXISTS"), syncNodeActivity.Tags.ToArray());
"db.query.text", $"INSERT INTO {keyspace}.song (Artist, Id, ReleaseDate, Title) VALUES (?, ?, ?, ?) IF NOT EXISTS"), syncNodeActivity.Tags.ToArray());
}

[Category(TestCategory.RealCluster)]
Expand Down Expand Up @@ -574,8 +573,8 @@ public async Task AddOpenTelemetry_Batch_ExpectedStatement()
var expectedStatement =
$"INSERT INTO {keyspace}.song (Artist, Id, ReleaseDate, Title) VALUES (?, ?, ?, ?); " +
$"INSERT INTO {keyspace}.song (Artist, Id, ReleaseDate, Title) VALUES (?, ?, ?, ?)";
Assert.Contains(new KeyValuePair<string, string>("db.statement", expectedStatement), syncSessionActivity.Tags.ToArray());
Assert.Contains(new KeyValuePair<string, string>("db.statement", expectedStatement), syncNodeActivity.Tags.ToArray());
Assert.Contains(new KeyValuePair<string, string>("db.query.text", expectedStatement), syncSessionActivity.Tags.ToArray());
Assert.Contains(new KeyValuePair<string, string>("db.query.text", expectedStatement), syncNodeActivity.Tags.ToArray());
}

private async Task SimpleStatementMethodAsync(ISession session)
Expand Down
22 changes: 11 additions & 11 deletions src/Cassandra.Tests/OpenTelemetryTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ namespace Cassandra.Tests
[TestFixture]
public class OpenTelemetryTests
{
private static readonly string otelActivityKey = "otel_activity";
private static readonly string dbNamespaceTag = "db.namespace";
private static readonly string dbQueryTextTag = "db.query.text";
private const string OtelActivityKey = "otel_activity";
private const string DbNamespaceTag = "db.namespace";
private const string DbQueryTextTag = "db.query.text";

[Test]
public void OpenTelemetryRequestTrackerOnStartAsync_StatementIsNull_DbQueryTextAndDbNamespaceTagsAreNotIncluded()
Expand All @@ -46,13 +46,13 @@ public void OpenTelemetryRequestTrackerOnStartAsync_StatementIsNull_DbQueryTextA

requestTracker.OnStartAsync(requestTrackingInfo);

requestTrackingInfo.Items.TryGetValue(otelActivityKey, out object context);
requestTrackingInfo.Items.TryGetValue(OtelActivityKey, out object context);

var activity = context as Activity;

Assert.NotNull(activity);
Assert.Null(activity.Tags.FirstOrDefault(x => x.Key == dbNamespaceTag).Value);
Assert.Null(activity.Tags.FirstOrDefault(x => x.Key == dbQueryTextTag).Value);
Assert.Null(activity.Tags.FirstOrDefault(x => x.Key == DbNamespaceTag).Value);
Assert.Null(activity.Tags.FirstOrDefault(x => x.Key == DbQueryTextTag).Value);
}
}

Expand All @@ -74,7 +74,7 @@ public void OpenTelemetryRequestTrackerOnStartAsync_ListenerNotSampling_Activity

requestTracker.OnStartAsync(requestTrackingInfo);

requestTrackingInfo.Items.TryGetValue(otelActivityKey, out object context);
requestTrackingInfo.Items.TryGetValue(OtelActivityKey, out object context);

var activity = context as Activity;

Expand Down Expand Up @@ -105,13 +105,13 @@ public void OpenTelemetryRequestTrackerOnNodeStartAsync_StatementIsNull_DbQueryT
requestTracker.OnStartAsync(requestTrackingInfo);
requestTracker.OnNodeStartAsync(requestTrackingInfo, hostTrackingInfo);

requestTrackingInfo.Items.TryGetValue($"{otelActivityKey}.{host.HostId}", out object context);
requestTrackingInfo.Items.TryGetValue($"{OtelActivityKey}.{host.HostId}", out object context);

var activity = context as Activity;

Assert.NotNull(activity);
Assert.Null(activity.Tags.FirstOrDefault(x => x.Key == dbNamespaceTag).Value);
Assert.Null(activity.Tags.FirstOrDefault(x => x.Key == dbQueryTextTag).Value);
Assert.Null(activity.Tags.FirstOrDefault(x => x.Key == DbNamespaceTag).Value);
Assert.Null(activity.Tags.FirstOrDefault(x => x.Key == DbQueryTextTag).Value);
}
}

Expand All @@ -138,7 +138,7 @@ public void OpenTelemetryRequestTrackerOnNodeStartAsync_ListenerNotSampling_Acti
requestTracker.OnStartAsync(requestTrackingInfo);
requestTracker.OnNodeStartAsync(requestTrackingInfo, hostTrackingInfo);

requestTrackingInfo.Items.TryGetValue($"{otelActivityKey}.{host.HostId}", out object context);
requestTrackingInfo.Items.TryGetValue($"{OtelActivityKey}.{host.HostId}", out object context);

var activity = context as Activity;

Expand Down
2 changes: 1 addition & 1 deletion src/Extensions/Cassandra.OpenTelemetry/OpenTelemetryRequestTracker.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ public virtual Task OnStartAsync(RequestTrackingInfo request)
}

activity.AddTag("db.system", "cassandra");
activity.AddTag("db.operation", $"{SessionOperationName} - {request.Statement?.GetType().Name}");
activity.AddTag("db.operation.name", $"{SessionOperationName} - {request.Statement?.GetType().Name}");

if (activity.IsAllDataRequested)
{
Expand Down