fix API breakage

dart/lib/src/hub.dart

@@ -502,7 +502,6 @@ class Hub {
   Future<SentryId> captureTransaction(
     SentryTransaction transaction, {
     SentryTraceContextHeader? traceContext,
-    ProfileInfo? profileInfo,
   }) async {
     var sentryId = SentryId.empty();
 
@@ -539,7 +538,6 @@ class Hub {
             transaction,
             scope: item.scope,
             traceContext: traceContext,
-            profileInfo: profileInfo,
           );
         } catch (exception, stackTrace) {
           _options.logger(

dart/lib/src/hub_adapter.dart

@@ -98,8 +98,7 @@ class HubAdapter implements Hub {
   @override
   Future<SentryId> captureTransaction(
     SentryTransaction transaction, {
-    SentryTraceContextHeader? traceContext,
-    ProfileInfo? profileInfo,
+    SentryTraceContextHeader? traceContext
   }) =>
       Sentry.currentHub.captureTransaction(
         transaction,

dart/lib/src/noop_hub.dart

@@ -80,7 +80,6 @@ class NoOpHub implements Hub {
   Future<SentryId> captureTransaction(
     SentryTransaction transaction, {
     SentryTraceContextHeader? traceContext,
-    ProfileInfo? profileInfo,
   }) async =>
       SentryId.empty();
 

dart/lib/src/protocol/sentry_transaction.dart

@@ -1,6 +1,5 @@
 import 'package:meta/meta.dart';
 
-import '../profiling.dart';
 import '../protocol.dart';
 import '../sentry_tracer.dart';
 import '../utils.dart';
@@ -11,12 +10,13 @@ class SentryTransaction extends SentryEvent {
   late final DateTime startTimestamp;
   static const String _type = 'transaction';
   late final List<SentrySpan> spans;
-  final SentryTracer _tracer;
+  @internal
+  final SentryTracer tracer;
   late final Map<String, SentryMeasurement> measurements;
   late final SentryTransactionInfo? transactionInfo;
 
   SentryTransaction(
-    this._tracer, {
+    this.tracer, {
     SentryId? eventId,
     DateTime? timestamp,
     String? platform,
@@ -40,37 +40,37 @@ class SentryTransaction extends SentryEvent {
     SentryTransactionInfo? transactionInfo,
   }) : super(
           eventId: eventId,
-          timestamp: timestamp ?? _tracer.endTimestamp,
+          timestamp: timestamp ?? tracer.endTimestamp,
           platform: platform,
           serverName: serverName,
           release: release,
           dist: dist,
           environment: environment,
-          transaction: transaction ?? _tracer.name,
-          throwable: throwable ?? _tracer.throwable,
-          tags: tags ?? _tracer.tags,
+          transaction: transaction ?? tracer.name,
+          throwable: throwable ?? tracer.throwable,
+          tags: tags ?? tracer.tags,
           // ignore: deprecated_member_use_from_same_package
-          extra: extra ?? _tracer.data,
+          extra: extra ?? tracer.data,
           user: user,
           contexts: contexts,
           breadcrumbs: breadcrumbs,
           sdk: sdk,
           request: request,
           type: _type,
         ) {
-    startTimestamp = _tracer.startTimestamp;
+    startTimestamp = tracer.startTimestamp;
 
-    final spanContext = _tracer.context;
-    spans = _tracer.children;
+    final spanContext = tracer.context;
+    spans = tracer.children;
     this.measurements = measurements ?? {};
 
     this.contexts.trace = spanContext.toTraceContext(
-      sampled: _tracer.samplingDecision?.sampled,
-      status: _tracer.status,
+      sampled: tracer.samplingDecision?.sampled,
+      status: tracer.status,
     );
 
     this.transactionInfo = transactionInfo ??
-        SentryTransactionInfo(_tracer.transactionNameSource.name);
+        SentryTransactionInfo(tracer.transactionNameSource.name);
   }
 
   @override
@@ -137,7 +137,7 @@ class SentryTransaction extends SentryEvent {
     SentryTransactionInfo? transactionInfo,
   }) =>
       SentryTransaction(
-        _tracer,
+        tracer,
         eventId: eventId ?? this.eventId,
         timestamp: timestamp ?? this.timestamp,
         platform: platform ?? this.platform,

dart/lib/src/sentry_client.dart

@@ -1,7 +1,6 @@
 import 'dart:async';
 import 'dart:math';
 import 'package:meta/meta.dart';
-import 'profiling.dart';
 import 'sentry_attachment/sentry_attachment.dart';
 
 import 'event_processor.dart';
@@ -285,7 +284,6 @@ class SentryClient {
     SentryTransaction transaction, {
     Scope? scope,
     SentryTraceContextHeader? traceContext,
-    ProfileInfo? profileInfo,
   }) async {
     SentryTransaction? preparedTransaction =
         _prepareEvent(transaction) as SentryTransaction;
@@ -333,6 +331,8 @@ class SentryClient {
       traceContext: traceContext,
       attachments: attachments,
     );
+
+    final profileInfo = preparedTransaction.tracer.profileInfo;
     if (profileInfo != null) {
       envelope.items.add(profileInfo.asEnvelopeItem());
     }

dart/lib/src/sentry_envelope_item.dart

@@ -1,6 +1,5 @@
 import 'dart:async';
 import 'dart:convert';
-import 'package:meta/meta.dart';
 
 import 'client_reports/client_report.dart';
 import 'protocol.dart';

dart/lib/src/sentry_tracer.dart

@@ -32,8 +32,13 @@ class SentryTracer extends ISentrySpan {
 
   SentryTraceContextHeader? _sentryTraceContextHeader;
 
+  // Profiler attached to this tracer.
   late final Profiler? profiler;
 
+  // Resulting profile, after it has been collected.  This is later used by
+  // SentryClient to attach as an envelope item when sending the transaction.
+  ProfileInfo? profileInfo;
+
   /// If [waitForChildren] is true, this transaction will not finish until all
   /// its children are finished.
   ///
@@ -141,14 +146,13 @@ class SentryTracer extends ISentrySpan {
       final transaction = SentryTransaction(this);
       transaction.measurements.addAll(_measurements);
 
-      final profileInfo = (status == null || status == SpanStatus.ok())
+      profileInfo = (status == null || status == SpanStatus.ok())
           ? await profiler?.finishFor(transaction)
           : null;
 
       await _hub.captureTransaction(
         transaction,
         traceContext: traceContext(),
-        profileInfo: profileInfo,
       );
     } finally {
       profiler?.dispose();

dart/test/hub_test.dart

@@ -2,7 +2,6 @@ import 'package:collection/collection.dart';
 import 'package:mockito/mockito.dart';
 import 'package:sentry/sentry.dart';
 import 'package:sentry/src/client_reports/discard_reason.dart';
-import 'package:sentry/src/profiling.dart';
 import 'package:sentry/src/sentry_tracer.dart';
 import 'package:sentry/src/transport/data_category.dart';
 import 'package:test/test.dart';

dart/test/mocks/mock_hub.dart

@@ -1,6 +1,5 @@
 import 'package:meta/meta.dart';
 import 'package:sentry/sentry.dart';
-import 'package:sentry/src/profiling.dart';
 
 import '../mocks.dart';
 import 'mock_sentry_client.dart';
@@ -111,7 +110,6 @@ class MockHub with NoSuchMethodProvider implements Hub {
   Future<SentryId> captureTransaction(
     SentryTransaction transaction, {
     SentryTraceContextHeader? traceContext,
-    ProfileInfo? profileInfo,
   }) async {
     captureTransactionCalls
         .add(CaptureTransactionCall(transaction, traceContext));

dart/test/mocks/mock_sentry_client.dart

@@ -1,5 +1,4 @@
 import 'package:sentry/sentry.dart';
-import 'package:sentry/src/profiling.dart';
 
 import 'no_such_method_provider.dart';
 
@@ -85,7 +84,6 @@ class MockSentryClient with NoSuchMethodProvider implements SentryClient {
     SentryTransaction transaction, {
     Scope? scope,
     SentryTraceContextHeader? traceContext,
-    ProfileInfo? profileInfo,
   }) async {
     captureTransactionCalls
         .add(CaptureTransactionCall(transaction, traceContext));

flutter/test/mocks.dart

@@ -269,7 +269,8 @@ class TestMockSentryNative implements SentryNative {
   }
 
   @override
-  Future<dynamic> collectProfile(SentryId traceId, int startTimeNs) {
+  Future<Map<String, dynamic>?> collectProfile(
+      SentryId traceId, int startTimeNs) {
     numberOfCollectProfileCalls++;
     return Future.value(null);
   }
@@ -362,7 +363,8 @@ class MockNativeChannel implements SentryNativeChannel {
   }
 
   @override
-  Future<dynamic> collectProfile(SentryId traceId, int startTimeNs) {
+  Future<Map<String, dynamic>?> collectProfile(
+      SentryId traceId, int startTimeNs) {
     numberOfCollectProfileCalls++;
     return Future.value(null);
   }