feat: add w3c header

Author: ahmedAlaaInstabug

packages/instabug_dio_interceptor/CHANGELOG.md

@@ -1,6 +1,12 @@
 # Changelog
 
-## [2.3.0] - 7/05/2024
+## [2.4.0] (2024-11-18)
+
+### Added
+
+- Add support for tracing network requests from Instabug to services like Datadog and New Relic ([#30](https://github.com/Instabug/Instabug-Dio-Interceptor/pull/30)).
+
+## [2.3.0] - (2024-05-07)
 
 ### Added
 

packages/instabug_dio_interceptor/example/android/app/build.gradle

@@ -44,7 +44,7 @@ android {
     defaultConfig {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId "com.example.example"
-        minSdkVersion 21
+        minSdkVersion flutter.minSdkVersion
         targetSdkVersion flutter.targetSdkVersion
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
@@ -65,6 +65,4 @@ flutter {
 
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation 'com.android.support:multidex:1.0.3'
-
 }

packages/instabug_dio_interceptor/example/android/app/src/main/AndroidManifest.xml

@@ -1,28 +1,30 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.example.example">
-   <application
-        android:label="example"
+
+    <application
         android:name="${applicationName}"
-        android:icon="@mipmap/ic_launcher">
+        android:icon="@mipmap/ic_launcher"
+        android:label="example"
+        android:networkSecurityConfig="@xml/network_security_config"
+        android:usesCleartextTraffic="true">
         <activity
             android:name=".MainActivity"
+            android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
             android:exported="true"
+            android:hardwareAccelerated="true"
             android:launchMode="singleTop"
             android:theme="@style/LaunchTheme"
-            android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
-            android:hardwareAccelerated="true"
             android:windowSoftInputMode="adjustResize">
             <!-- Specifies an Android theme to apply to this Activity as soon as
                  the Android process has started. This theme is visible to the user
                  while the Flutter UI initializes. After that, this theme continues
                  to determine the Window background behind the Flutter UI. -->
             <meta-data
-              android:name="io.flutter.embedding.android.NormalTheme"
-              android:resource="@style/NormalTheme"
-              />
+                android:name="io.flutter.embedding.android.NormalTheme"
+                android:resource="@style/NormalTheme" />
             <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
-                <category android:name="android.intent.category.LAUNCHER"/>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
         <!-- Don't delete the meta-data below.

packages/instabug_dio_interceptor/example/android/build.gradle

@@ -1,12 +1,12 @@
 buildscript {
-    ext.kotlin_version = '1.7.10'
+    ext.kotlin_version = '1.6.10'
     repositories {
         google()
         mavenCentral()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.2.0'
+        classpath 'com.android.tools.build:gradle:4.1.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
@@ -26,6 +26,6 @@ subprojects {
     project.evaluationDependsOn(':app')
 }
 
-tasks.register("clean", Delete) {
+task clean(type: Delete) {
     delete rootProject.buildDir
 }

packages/instabug_dio_interceptor/example/android/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip

packages/instabug_dio_interceptor/example/pubspec.lock

@@ -53,18 +53,18 @@ packages:
     dependency: "direct main"
     description:
       name: dio
-      sha256: e17f6b3097b8c51b72c74c9f071a605c47bcc8893839bd66732457a5ebe73714
+      sha256: "5598aa796bbf4699afd5c67c0f5f6e2ed542afc956884b9cd58c306966efc260"
       url: "https://pub.dev"
     source: hosted
-    version: "5.5.0+1"
+    version: "5.7.0"
   dio_web_adapter:
     dependency: transitive
     description:
       name: dio_web_adapter
-      sha256: "36c5b2d79eb17cdae41e974b7a8284fec631651d2a6f39a8a2ff22327e90aeac"
+      sha256: "33259a9276d6cea88774a0000cfae0d861003497755969c92faa223108620dc8"
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.1"
+    version: "2.0.0"
   fake_async:
     dependency: transitive
     description:
@@ -234,10 +234,10 @@ packages:
     dependency: transitive
     description:
       name: typed_data
-      sha256: facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c
+      sha256: f9049c039ebfeb4cf7a7104a675823cd72dba8297f264b6637062516699fa006
       url: "https://pub.dev"
     source: hosted
-    version: "1.3.2"
+    version: "1.4.0"
   vector_math:
     dependency: transitive
     description:
@@ -254,6 +254,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "14.2.5"
+  web:
+    dependency: transitive
+    description:
+      name: web
+      sha256: cd3543bd5798f6ad290ea73d210f423502e71900302dde696f8bff84bf89a1cb
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.1.0"
 sdks:
-  dart: ">=3.3.0 <4.0.0"
+  dart: ">=3.5.0 <4.0.0"
   flutter: ">=3.18.0-18.0.pre.54"

packages/instabug_dio_interceptor/lib/instabug_dio_interceptor.dart

@@ -6,21 +6,30 @@ class InstabugDioInterceptor extends Interceptor {
   static final NetworkLogger _networklogger = NetworkLogger();
 
   @override
-  void onRequest(RequestOptions options, RequestInterceptorHandler handler) {
+  Future<void> onRequest(
+      RequestOptions options, RequestInterceptorHandler handler,) async {
+    final headers = options.headers;
+    final startTime = DateTime.now();
+    // ignore: invalid_use_of_internal_member
+    final w3Header = await _networklogger.getW3CHeader(
+        headers, startTime.millisecondsSinceEpoch,);
+    if (w3Header?.isW3cHeaderFound == false &&
+        w3Header?.w3CGeneratedHeader != null) {
+      headers['traceparent'] = w3Header?.w3CGeneratedHeader;
+    }
+    options.headers = headers;
     final data = NetworkData(
-      startTime: DateTime.now(),
-      url: options.uri.toString(),
-      method: options.method,
-    );
+        startTime: startTime,
+        url: options.uri.toString(),
+        w3cHeader: w3Header,
+        method: options.method,);
     _requests[options.hashCode] = data;
     handler.next(options);
   }
 
   @override
   void onResponse(
-    Response<dynamic> response,
-    ResponseInterceptorHandler handler,
-  ) {
+      Response<dynamic> response, ResponseInterceptorHandler handler,) {
     final data = _map(response);
     _networklogger.networkLog(data);
     handler.next(response);
@@ -67,9 +76,7 @@ class InstabugDioInterceptor extends Interceptor {
 
     var responseBodySize = 0;
     if (responseHeaders.containsKey('content-length')) {
-      try {
-        responseBodySize = int.parse(responseHeaders['content-length'] ?? '0');
-      } catch (_) {}
+      responseBodySize = int.parse(responseHeaders['content-length'][0] ?? '0');
     } else if (response.data != null) {
       responseBodySize = response.data.toString().length;
     }

packages/instabug_dio_interceptor/test/instabug_dio_interceptor_test.dart

@@ -5,6 +5,7 @@ import 'package:instabug_dio_interceptor/instabug_dio_interceptor.dart';
 import 'package:instabug_flutter/instabug_flutter.dart';
 import 'package:instabug_flutter/src/generated/instabug.api.g.dart';
 import 'package:mockito/annotations.dart';
+import 'package:mockito/mockito.dart';
 
 import 'instabug_dio_interceptor_test.mocks.dart';
 import 'mock_adapter.dart';
@@ -15,16 +16,15 @@ class MyInterceptor extends InstabugDioInterceptor {
   int errorCount = 0;
 
   @override
-  void onRequest(RequestOptions options, RequestInterceptorHandler handler) {
+  Future<void> onRequest(
+      RequestOptions options, RequestInterceptorHandler handler,) async {
     requestCount++;
     super.onRequest(options, handler);
   }
 
   @override
   void onResponse(
-    Response<dynamic> response,
-    ResponseInterceptorHandler handler,
-  ) {
+      Response<dynamic> response, ResponseInterceptorHandler handler,) {
     resposneCount++;
     super.onResponse(response, handler);
   }
@@ -53,6 +53,11 @@ void main() {
   setUpAll(() {
     Instabug.$setHostApi(mHost);
     NetworkLogger.$setHostApi(mHost);
+    when(mHost.isW3CFeatureFlagsEnabled()).thenAnswer((_)=>Future<Map<String,bool>>.value(<String, bool>{
+      'isW3cCaughtHeaderEnabled': true,
+      'isW3cExternalGeneratedHeaderEnabled': true,
+      'isW3cExternalTraceIDEnabled': true,
+    }),);
   });
 
   setUp(() {

packages/instabug_dio_interceptor/test/mock_adapter.dart

@@ -11,11 +11,8 @@ class MockAdapter implements HttpClientAdapter {
   final IOHttpClientAdapter _adapter = IOHttpClientAdapter();
 
   @override
-  Future<ResponseBody> fetch(
-    RequestOptions options,
-    Stream<Uint8List>? requestStream,
-    Future<dynamic>? cancelFuture,
-  ) async {
+  Future<ResponseBody> fetch(RequestOptions options,
+      Stream<Uint8List>? requestStream, Future<dynamic>? cancelFuture,) async {
     final uri = options.uri;
 
     if (uri.host == mockHost) {

scripts/init.sh

@@ -0,0 +1,43 @@
+#!/bin/bash
+
+if [ -d "android" ]; then
+    rm -rf "android"
+    echo "Folder android and its contents removed"
+fi
+
+if [ -d "ios" ]; then
+    rm -rf "ios"
+    echo "Folder ios and its contents removed"
+fi
+
+
+if [ -d "build" ]; then
+    rm -rf "build"
+    echo "Folder build and its contents removed"
+fi
+
+if [ -d "lib" ]; then
+    rm -rf "lib"
+    echo "Folder lib and its contents removed"
+fi
+
+if [ -d "test" ]; then
+    rm -rf "test"
+    echo "Folder test and its contents removed"
+fi
+
+
+if command -v melos &> /dev/null
+then
+    echo "Melos found"
+else
+    echo "Melos not found"
+    dart pub global activate melos &&  echo 'export PATH="$PATH:$HOME/.pub-cache/bin"' >> $BASH_ENV
+fi
+
+
+melos bootstrap
+melos dart_bootstrap
+melos pigeon --no-select
+melos generate --no-select
+melos pods --no-select