Merge branch 'feature/update-to-0.0.2'

wp-graphql · Nov 3, 2017 · 93b2226 · 93b2226
2 parents 2e11faf + d864782
commit 93b2226
Show file tree

Hide file tree

Showing 7 changed files with 33 additions and 211 deletions.
diff --git a/composer.json b/composer.json
@@ -3,6 +3,7 @@
   "description": "Insights for WPGraphQL. Performance and error logging.",
   "type": "wordpress-plugin",
   "license": "GPLv3",
+  "version":"0.2.0",
   "authors": [
     {
       "name": "Jason Bahl",

diff --git a/src/InstrumentSchema.php b/src/InstrumentSchema.php
diff --git a/src/Tracing.php b/src/Tracing.php
@@ -321,7 +321,17 @@ public static function add_tracked_queries_to_response_extensions( $response, $s
 		return $response;
 	}
 
-	public static function init_field_resolver_trace( $field, $type_object, $source, $args, AppContext $context, ResolveInfo $info ) {
+	/**
+	 * @param $source
+	 * @param $args
+	 * @param $context
+	 * @param $info
+	 * @param $field_resolver
+	 * @param $type_name
+	 * @param $field_key
+	 * @param $field
+	 */
+	public static function init_field_resolver_trace( $source, $args, $context, $info, $field_resolver, $type_name, $field_key, $field ) {
 
 		$start_offset = Tracing::get_resolver_start_offset();
 		self::$resolver_start = microtime( true );
@@ -336,12 +346,25 @@ public static function init_field_resolver_trace( $field, $type_object, $source,
 
 	}
 
-	public static function close_field_resolver_trace( $field, $type_object, $source, $args, AppContext $context, ResolveInfo $info ) {
+	/**
+	 * @param $source
+	 * @param $args
+	 * @param $context
+	 * @param $info
+	 * @param $field_resolver
+	 * @param $type_name
+	 * @param $field_key
+	 * @param $field
+	 */
+	public static function close_field_resolver_trace( $source, $args, $context, $info, $field_resolver, $type_name, $field_key, $field ) {
 		self::$field_resolver_trace['duration'] = Tracing::get_resolver_duration( self::$resolver_start );
 		Tracing::trace_resolver( self::$field_resolver_trace );
 		self::reset_field_resolver_trace();
 	}
 
+	/**
+	 *
+	 */
 	protected static function reset_field_resolver_trace() {
 		self::$field_resolver_trace = [];
 		self::$resolver_start = null;

diff --git a/tests/test-InstrumentSchema.php b/tests/test-InstrumentSchema.php
diff --git a/vendor/composer/autoload_classmap.php b/vendor/composer/autoload_classmap.php
@@ -7,6 +7,6 @@
 
 return array(
     'WPGraphQL\\Extensions\\Insights\\Data' => $baseDir . '/src/Data.php',
-    'WPGraphQL\\Extensions\\Insights\\InstrumentSchema' => $baseDir . '/src/InstrumentSchema.php',
+    'WPGraphQL\\Extensions\\Insights\\QueryTrace' => $baseDir . '/src/QueryTrace.php',
     'WPGraphQL\\Extensions\\Insights\\Tracing' => $baseDir . '/src/Tracing.php',
 );
diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php
@@ -22,7 +22,7 @@ class ComposerStaticInit9e12acd0d8d678fe7190ac4fe7971f29
 
     public static $classMap = array (
         'WPGraphQL\\Extensions\\Insights\\Data' => __DIR__ . '/../..' . '/src/Data.php',
-        'WPGraphQL\\Extensions\\Insights\\InstrumentSchema' => __DIR__ . '/../..' . '/src/InstrumentSchema.php',
+        'WPGraphQL\\Extensions\\Insights\\QueryTrace' => __DIR__ . '/../..' . '/src/QueryTrace.php',
         'WPGraphQL\\Extensions\\Insights\\Tracing' => __DIR__ . '/../..' . '/src/Tracing.php',
     );
 

diff --git a/wp-graphql-insights.php b/wp-graphql-insights.php
@@ -7,7 +7,7 @@
  * Author URI:      https://www.wpgraphql.com
  * Text Domain:     wp-graphql-insights
  * Domain Path:     /languages
- * Version:         0.0.2
+ * Version:         0.2.0
  *
  * @package         WPGraphQL_Insights
  */
@@ -84,7 +84,7 @@ private static function setup_constants() {
 
 			// Plugin version.
 			if ( ! defined( 'WPGRAPHQL_INSIGHTS_VERSION' ) ) {
-				define( 'WPGRAPHQL_INSIGHTS_VERSION', '0.0.2' );
+				define( 'WPGRAPHQL_INSIGHTS_VERSION', '0.2.0' );
 			}
 
 			// Plugin Folder Path.
@@ -147,12 +147,12 @@ private function actions() {
 			/**
 			 * Initialize each resolver trace
 			 */
-			add_action( 'graphql_before_resolve', [ 'WPGraphQL\Extensions\Insights\Tracing', 'init_field_resolver_trace' ], 10, 6 );
+			add_action( 'graphql_before_resolve_field', [ 'WPGraphQL\Extensions\Insights\Tracing', 'init_field_resolver_trace' ], 10, 8 );
 
 			/**
 			 * Close each resolver trace
 			 */
-			add_action( 'graphql_after_resolve', [ 'WPGraphQL\Extensions\Insights\Tracing', 'close_field_resolver_trace' ], 10, 6 );
+			add_action( 'graphql_after_resolve_field', [ 'WPGraphQL\Extensions\Insights\Tracing', 'close_field_resolver_trace' ], 10, 8 );
 
 		}
 
@@ -183,7 +183,7 @@ private function filters() {
 function graphql_insights_init() {
 
 	/**
-	 * If the version of WPGraphQL isn't up to date, don't instantiate tracing
+	 * If the version of WPGraphQL isn't up to date, don't instantiate tracing as it won't work properly
 	 * @todo: consider displaying an Admin Notice or something to that tune if the versions aren't compatible
 	 */
 	if ( defined( 'WPGRAPHQL_VERSION' ) && version_compare( WPGRAPHQL_VERSION, '0.0.20', '<=' ) ) {