Merge pull request #530 from newrelic/dev

Release 10.1.0

.github/docker/linux/pr_build.sh

@@ -77,12 +77,12 @@ if [ "$(uname)" = Linux ] && [ ! -e /etc/alpine-release ] && [ $PHP_SAPIS_EMBED
   do_valgrind=yes
   printf \\n
   printf 'grinding axiom tests\n'
-  make -r -s -j $(nproc) axiom-valgrind "ARCH=${ARCH}"
+  make -r -j $(nproc) axiom-valgrind "ARCH=${ARCH}"
 else
   do_valgrind=
   printf \\n
   printf 'running axiom tests\n'
-  make -r -s -j $(nproc) axiom-run-tests "ARCH=${ARCH}"
+  make -r -j $(nproc) axiom-run-tests "ARCH=${ARCH}"
 fi
 
 #
@@ -128,7 +128,7 @@ EOF
   printf \\n
   printf "building agent (PHP=%s)\n" "$PHPS"
   make agent-clean
-  make -r -s -j $(nproc) agent "ARCH=${ARCH}"
+  make -r -j $(nproc) agent "ARCH=${ARCH}"
 
 
   printf \\n
@@ -157,10 +157,10 @@ EOF
       *embed*)
         if [ -n "$do_valgrind" ]; then
           printf 'grinding agent unit tests\n'
-          make -r -s -j $(nproc) agent-valgrind "ARCH=${ARCH}"
+          make -r -j $(nproc) agent-valgrind "ARCH=${ARCH}" USER_LDFLAGS='-Wl,-z,muldefs'
         else
           printf 'running agent unit tests\n'
-          make -r -s -j $(nproc) agent-check "ARCH=${ARCH}"
+          make -r -j $(nproc) agent-check "ARCH=${ARCH}" USER_LDFLAGS='-Wl,-z,muldefs'
         fi
 	;;
       *)

VERSION

@@ -1 +1 @@
-10.0.0
+10.1.0

agent/Makefile.frag

@@ -83,6 +83,7 @@ TEST_BINARIES = \
 	tests/test_environment \
 	tests/test_fw_codeigniter \
 	tests/test_fw_drupal \
+	tests/test_fw_support \
 	tests/test_fw_wordpress \
 	tests/test_globals \
 	tests/test_internal_instrument \
@@ -261,6 +262,7 @@ endif
 #
 TEST_LIBS := $(PHP_EMBED_LIBRARY) $(shell $(PHP_CONFIG) --libs)
 TEST_LDFLAGS := $(shell $(PHP_CONFIG) --ldflags) $(EXPORT_DYNAMIC)
+TEST_LDFLAGS += $(USER_LDFLAGS)
 
 #
 # Implicit rule to build test object files with the appropriate flags.

agent/config.m4

@@ -183,7 +183,29 @@ if test "$PHP_NEWRELIC" = "yes"; then
 
   dnl Actually define our extension, and far more importantly, its source
   dnl files.
-  PHP_NEW_EXTENSION(newrelic, fw_cakephp.c fw_codeigniter.c fw_drupal8.c fw_drupal.c fw_drupal_common.c fw_joomla.c fw_kohana.c fw_laminas3.c fw_laravel.c fw_laravel_queue.c fw_lumen.c fw_magento1.c fw_magento2.c fw_magento_common.c fw_mediawiki.c fw_silex.c fw_slim.c fw_support.c fw_symfony4.c fw_symfony2.c fw_symfony.c fw_symfony_common.c fw_wordpress.c fw_yii.c fw_zend2.c fw_zend.c lib_doctrine2.c lib_guzzle3.c lib_guzzle4.c lib_guzzle6.c lib_guzzle_common.c lib_mongodb.c lib_phpunit.c lib_predis.c lib_zend_http.c php_agent.c php_api.c php_api_datastore.c php_api_distributed_trace.c php_api_internal.c php_autorum.c php_call.c php_curl.c php_curl_md.c php_datastore.c php_environment.c php_error.c php_execute.c php_explain.c php_explain_mysqli.c php_explain_pdo_mysql.c php_extension.c php_file_get_contents.c php_globals.c php_hash.c php_header.c php_httprequest_send.c php_internal_instrument.c php_minit.c php_mshutdown.c php_mysql.c php_mysqli.c php_newrelic.c php_nrini.c php_output.c php_pdo.c php_pdo_mysql.c php_pdo_pgsql.c php_pgsql.c php_psr7.c php_redis.c php_rinit.c php_rshutdown.c php_samplers.c php_stack.c php_stacked_segment.c php_txn.c php_user_instrument.c php_vm.c php_wrapper.c, $ext_shared,, \\$(NEWRELIC_CFLAGS))
+  NEWRELIC_AGENT="php_agent.c php_api.c php_api_datastore.c \
+  php_api_distributed_trace.c php_api_internal.c php_autorum.c \
+  php_call.c php_curl.c php_curl_md.c php_datastore.c php_environment.c \
+  php_error.c php_execute.c php_explain.c php_explain_mysqli.c \
+  php_explain_pdo_mysql.c php_extension.c php_file_get_contents.c \
+  php_globals.c php_hash.c php_header.c php_httprequest_send.c \
+  php_internal_instrument.c php_minit.c php_mshutdown.c php_mysql.c \
+  php_mysqli.c php_newrelic.c php_nrini.c php_output.c php_pdo.c \
+  php_pdo_mysql.c php_pdo_pgsql.c php_pgsql.c php_psr7.c php_redis.c \
+  php_rinit.c php_rshutdown.c php_samplers.c php_stack.c \
+  php_stacked_segment.c php_txn.c php_user_instrument.c \
+  php_vm.c php_wrapper.c"
+  FRAMEWORKS="fw_cakephp.c fw_codeigniter.c fw_drupal8.c \
+  fw_drupal.c fw_drupal_common.c fw_joomla.c fw_kohana.c \
+  fw_laminas3.c fw_laravel.c fw_laravel_queue.c fw_lumen.c \
+  fw_magento1.c fw_magento2.c fw_magento_common.c fw_mediawiki.c \
+  fw_silex.c fw_slim.c fw_support.c fw_symfony4.c fw_symfony2.c \
+  fw_symfony.c fw_symfony_common.c fw_wordpress.c fw_yii.c \
+  fw_zend2.c fw_zend.c"
+  LIBRARIES="lib_monolog.c lib_doctrine2.c lib_guzzle3.c \
+  lib_guzzle4.c lib_guzzle6.c lib_guzzle_common.c \
+  lib_mongodb.c lib_phpunit.c lib_predis.c lib_zend_http.c"
+  PHP_NEW_EXTENSION(newrelic, $FRAMEWORKS $LIBRARIES $NEWRELIC_AGENT, $ext_shared,, \\$(NEWRELIC_CFLAGS))
 
   PHP_SUBST(NEWRELIC_CFLAGS)
 

agent/fw_hooks.h

@@ -53,5 +53,6 @@ extern void nr_mongodb_enable(TSRMLS_D);
 extern void nr_phpunit_enable(TSRMLS_D);
 extern void nr_predis_enable(TSRMLS_D);
 extern void nr_zend_http_enable(TSRMLS_D);
+extern void nr_monolog_enable(TSRMLS_D);
 
 #endif /* FW_HOOKS_HDR */

agent/fw_support.c

@@ -27,3 +27,28 @@ void nr_php_framework_add_supportability_metric(const char* framework_name,
 
   nrm_force_add(NRPRG(txn) ? NRTXN(unscoped_metrics) : 0, buf, 0);
 }
+
+void nr_fw_support_add_library_supportability_metric(nrtxn_t* txn,
+                                                     const char* library_name) {
+  if (NULL == txn || NULL == library_name) {
+    return;
+  }
+
+  char* metname
+      = nr_formatf("Supportability/library/%s/detected", library_name);
+  nrm_force_add(txn->unscoped_metrics, metname, 0);
+  nr_free(metname);
+}
+
+void nr_fw_support_add_logging_supportability_metric(nrtxn_t* txn,
+                                                     const char* library_name,
+                                                     const bool is_enabled) {
+  if (NULL == txn || NULL == library_name) {
+    return;
+  }
+
+  char* metname = nr_formatf("Supportability/Logging/PHP/%s/%s", library_name,
+                             is_enabled ? "enabled" : "disabled");
+  nrm_force_add(txn->unscoped_metrics, metname, 0);
+  nr_free(metname);
+}

agent/fw_support.h

@@ -13,4 +13,29 @@ extern void nr_php_framework_add_supportability_metric(
     const char* framework_name,
     const char* name TSRMLS_DC);
 
+/*
+ * Purpose: Add `Supportability/library/{library}/detected` unscoped metric
+ *
+ * Params  : 1. Transaction object
+ *           2. Library name
+ *
+ */
+extern void nr_fw_support_add_library_supportability_metric(
+    nrtxn_t* txn,
+    const char* library_name);
+
+/*
+ * Purpose: Add `Supportability/Logging/PHP/{library}/{enabled|disabled}`
+ * unscoped metric
+ *
+ * Params  : 1. Transaction object
+ *           2. Library name
+ *           3. Instrumentation status
+ *
+ */
+extern void nr_fw_support_add_logging_supportability_metric(
+    nrtxn_t* txn,
+    const char* library_name,
+    const bool is_enabled);
+
 #endif /* FW_SUPPORT_HDR */