Skip to content

[starfish] add attributes to db spans data #1629

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
buenaflor merged 13 commits into from
Sep 8, 2023
Merged

[starfish] add attributes to db spans data #1629

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
6aa04fa
add db attibutes to spans
buenaflor Sep 5, 2023
bcc9dd9
change variable names
buenaflor Sep 5, 2023
f9a3a88
update changelog
buenaflor Sep 7, 2023
296c765
update changelog
buenaflor Sep 7, 2023
b03c875
Merge branch 'main' into feat/starfish/db-spans
buenaflor Sep 7, 2023
ef1e08c
update tests
buenaflor Sep 7, 2023
5f33fca
update imports
buenaflor Sep 7, 2023
514de71
update tests
buenaflor Sep 7, 2023
c55ce57
remove unused import
buenaflor Sep 7, 2023
39b4c25
couple dbName to db instance
buenaflor Sep 7, 2023
dec3513
format
buenaflor Sep 7, 2023
8613819
use path pub
buenaflor Sep 7, 2023
d14d661
don't set dbName to null when db close() is called
buenaflor Sep 7, 2023
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
Prev Previous commit
Next Next commit
format
  • Loading branch information
@buenaflor
buenaflor committed Sep 7, 2023
commit dec3513b2728fd419cf609c584053e9abb2fb76c
11 changes: 6 additions & 5 deletions sqflite/lib/src/sentry_database.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,8 @@ class SentryDatabase extends SentryDatabaseExecutor implements Database {
@internal Hub? hub,
}) : _hub = hub ?? HubAdapter(),
dbName = _basenameWithoutExtension(_database.path),
super(_database, hub: hub, dbName: _basenameWithoutExtension(_database.path)) {
super(_database,
hub: hub, dbName: _basenameWithoutExtension(_database.path)) {
// ignore: invalid_use_of_internal_member
final options = _hub.options;
options.sdk.addIntegration('SentrySqfliteTracing');
Expand All @@ -66,8 +67,8 @@ class SentryDatabase extends SentryDatabaseExecutor implements Database {

/// Gets the part of path after the last separator, and without any trailing file extension.
static String _basenameWithoutExtension(String filePath) {
int lastIndex = filePath.lastIndexOf('/');
int dotIndex = filePath.lastIndexOf('.');
final int lastIndex = filePath.lastIndexOf('/');
final int dotIndex = filePath.lastIndexOf('.');

if (dotIndex == -1 || (lastIndex != -1 && dotIndex < lastIndex)) {
return filePath;
Expand Down Expand Up @@ -143,8 +144,8 @@ class SentryDatabase extends SentryDatabaseExecutor implements Database {
setDatabaseAttributeData(span, dbName);

Future<T> newAction(Transaction txn) async {
final executor =
SentryDatabaseExecutor(txn, parentSpan: span, hub: _hub, dbName: dbName);
final executor = SentryDatabaseExecutor(txn,
parentSpan: span, hub: _hub, dbName: dbName);
final sentrySqfliteTransaction =
SentrySqfliteTransaction(executor, hub: _hub, dbName: dbName);

Expand Down
3 changes: 2 additions & 1 deletion sqflite/test/mocks/mocks.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,8 @@ ISentrySpan startTransactionShim(
DatabaseExecutor,
],
customMocks: [
MockSpec<Hub>(fallbackGenerators: {#startTransaction: startTransactionShim})
MockSpec<Hub>(
fallbackGenerators: {#startTransaction: startTransactionShim}),
],
)
void main() {}
6 changes: 4 additions & 2 deletions sqflite/test/sentry_batch_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,8 @@ SELECT * FROM Product''';

final span = fixture.tracer.children.last;
expect(span.data[SentryDatabase.dbSystemKey], SentryDatabase.dbSystem);
expect(span.data[SentryDatabase.dbNameKey], (db as SentryDatabase).dbName);
expect(
span.data[SentryDatabase.dbNameKey], (db as SentryDatabase).dbName);

await db.close();
});
Expand All @@ -311,7 +312,8 @@ SELECT * FROM Product''';

final span = fixture.tracer.children.last;
expect(span.data[SentryDatabase.dbSystemKey], SentryDatabase.dbSystem);
expect(span.data[SentryDatabase.dbNameKey], (db as SentryDatabase).dbName);
expect(
span.data[SentryDatabase.dbNameKey], (db as SentryDatabase).dbName);

await db.close();
});
Expand Down
8 changes: 5 additions & 3 deletions sqflite/test/sentry_database_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,8 @@ void main() {
);
expect(insertSpan.context.parentSpanId, trSpan.context.spanId);
expect(insertSpan.status, SpanStatus.ok());
expect(insertSpan.data[SentryDatabase.dbSystemKey], SentryDatabase.dbSystem);
expect(
insertSpan.data[SentryDatabase.dbSystemKey], SentryDatabase.dbSystem);
expect(insertSpan.data[SentryDatabase.dbNameKey], inMemoryDatabasePath);

expect(
Expand Down Expand Up @@ -147,8 +148,9 @@ void main() {
test('opening db sets currentDbName with db file without extension',
() async {
final db = await fixture.getSut(
database: await openDatabase('path/database/mydatabase.db'),
execute: false);
database: await openDatabase('path/database/mydatabase.db'),
execute: false,
);

expect(db.dbName, 'mydatabase');

Expand Down