Merge branch 'dev' into ha/update-notice-error

hahuja2 · web-flow · commit bb7fed8ed885 · 2024-07-18T15:32:21.000-07:00
diff --git a/.github/workflows/test-agent.yml b/.github/workflows/test-agent.yml
@@ -19,6 +19,31 @@ on:
   pull_request:
 
 jobs:
+  gofmt-check:
+    runs-on: ubuntu-latest
+    continue-on-error: true
+    steps:
+      - name: Checkout newrelic-php-agent code
+        uses: actions/checkout@v4
+        with:
+          path: php-agent
+      - name: Setup go
+        uses: actions/setup-go@v5
+        with:
+          go-version-file: ./php-agent/daemon/go.mod
+          cache: false
+      - name: Display go version
+        run: |
+          go version
+      - name: Run gofmt
+        run: |
+          GOFMT_REPORTED_FILES="$(gofmt -l -e ./php-agent/daemon)"
+          if [ ! -z "$GOFMT_REPORTED_FILES" ]; then
+            gofmt -d -e ./php-agent/daemon
+            echo "### gofmt violations found in $(echo "$GOFMT_REPORTED_FILES" | wc -l) files" >> $GITHUB_STEP_SUMMARY
+            echo "$GOFMT_REPORTED_FILES" >> $GITHUB_STEP_SUMMARY
+            exit 1
+          fi
   daemon-unit-tests:
     runs-on: ubuntu-latest
     env:
diff --git a/.github/workflows/trigger-test-suite.yml b/.github/workflows/trigger-test-suite.yml
@@ -8,11 +8,11 @@ on:
   pull_request:
 
 jobs:
-  trigger-multiverse-tests:
+  trigger-test-suite:
     runs-on: ubuntu-latest
     env:
       GH_TOKEN: ${{ secrets.TEST_SUITE_REPO_GH_TOKEN }}
     steps:
-      - name: Trigger Multiverse Test Suite
+      - name: Trigger Test Suite
         run: |
           gh workflow run -R ${{ secrets.TEST_SUITE_REPO }} ${{ secrets.TEST_SUITE_WORKFLOW }} -f agent_git_ref=${{ github.head_ref }} -f pr-number=${{ github.event.number }}
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-10.22.0
+10.23.0
diff --git a/agent/lib_mongodb.c b/agent/lib_mongodb.c
@@ -356,6 +356,14 @@ void nr_mongodb_enable() {
   nr_php_wrap_user_function_extra(NR_PSTR("MongoDB\\Operation\\Count::execute"),
                                   nr_mongodb_operation, "count" TSRMLS_CC);
 
+  /*
+   * `count` has been deprecated in later versions of mongodb and replaced by
+   * `countDocuments`
+   */
+  nr_php_wrap_user_function_extra(
+      NR_PSTR("MongoDB\\Operation\\CountDocuments::execute"),
+      nr_mongodb_operation, "countDocuments");
+
   /*
    * This also catches MongoDB\Collection::createIndex
    */
diff --git a/axiom/nr_version.c b/axiom/nr_version.c
@@ -45,8 +45,9 @@
  *   viburnum           18Mar2024 (10.19)
  *   wallflower         06May2024 (10.20)
  *   xerophyllum        20May2024 (10.21)
+ *   yarrow             26Jun2024 (10.22)
  */
-#define NR_CODENAME "yarrow"
+#define NR_CODENAME "zinnia"
 
 const char* nr_version(void) {
   return NR_STR2(NR_VERSION);
diff --git a/daemon/cmd/daemon/main.go b/daemon/cmd/daemon/main.go
@@ -371,7 +371,7 @@ func main() {
 			proxy = false
 		} else {
 			log.Debugf("ARGV[%d]: %s", i, os.Args[i])
-			if ("--proxy" == os.Args[i]) {
+			if "--proxy" == os.Args[i] {
 				proxy = true
 			}
 		}
@@ -570,10 +570,9 @@ func (env *Environment) Set(key, value string) {
 
 // initLog opens the daemon log based on the current configuration settings.
 // If no log has been specified, initLog will try the following standard
-// locations.
-//
-//   /var/log/newrelic/newrelic-daemon.log
-//   /var/log/newrelic-daemon.log
+// locations:
+//   - /var/log/newrelic/newrelic-daemon.log
+//   - /var/log/newrelic-daemon.log
 //
 // If no suitable location can be found, a generic error is returned.
 func initLog(cfg *Config) error {
diff --git a/daemon/cmd/stressor/main.go b/daemon/cmd/stressor/main.go
@@ -122,8 +122,8 @@ const DaemonSampleRate = 3 * time.Second
 
 // Application Behavior Constants
 // In order to roughly mimic the PHP agent, these should settings match
-//  NR_APP_UNKNOWN_QUERY_BACKOFF_LIMIT_SECONDS
-//  NR_APP_REFRESH_QUERY_PERIOD_SECONDS
+//   - NR_APP_UNKNOWN_QUERY_BACKOFF_LIMIT_SECONDS
+//   - NR_APP_REFRESH_QUERY_PERIOD_SECONDS
 const (
 	connectedAppInfoPeriod   = 20 * time.Second
 	unconnectedAppInfoPeriod = 5 * time.Second
diff --git a/daemon/internal/flatbuffersdata/data_test.go b/daemon/internal/flatbuffersdata/data_test.go
@@ -150,15 +150,15 @@ func TestFlatbuffersTxnData(t *testing.T) {
 	// compilation to handle this rather than the flakier runtime.Version()
 	// string.
 	expect := `[` +
-	`{"name":"Supportability/TxnData/CustomEvents","forced":true,"data":[1,3,0,3,3,9]},` +
-	`{"name":"Supportability/TxnData/Metrics","forced":true,"data":[1,2,0,2,2,4]},` +
-	`{"name":"Supportability/TxnData/Size","forced":true,"data":[1,1408,0,1408,1408,1982464]},` +
-	`{"name":"Supportability/TxnData/SlowSQL","forced":true,"data":[1,1,0,1,1,1]},` +
-	`{"name":"Supportability/TxnData/TraceSize","forced":true,"data":[1,2,0,2,2,4]},` +
-	`{"name":"forced","forced":true,"data":[6,5,4,3,2,1]},` +
-	`{"name":"scoped","forced":false,"data":[1,2,3,4,5,6]},` +
-	`{"name":"scoped","forced":false,"data":[1,2,3,4,5,6]}` +
-	`]`
+		`{"name":"Supportability/TxnData/CustomEvents","forced":true,"data":[1,3,0,3,3,9]},` +
+		`{"name":"Supportability/TxnData/Metrics","forced":true,"data":[1,2,0,2,2,4]},` +
+		`{"name":"Supportability/TxnData/Size","forced":true,"data":[1,1408,0,1408,1408,1982464]},` +
+		`{"name":"Supportability/TxnData/SlowSQL","forced":true,"data":[1,1,0,1,1,1]},` +
+		`{"name":"Supportability/TxnData/TraceSize","forced":true,"data":[1,2,0,2,2,4]},` +
+		`{"name":"forced","forced":true,"data":[6,5,4,3,2,1]},` +
+		`{"name":"scoped","forced":false,"data":[1,2,3,4,5,6]},` +
+		`{"name":"scoped","forced":false,"data":[1,2,3,4,5,6]}` +
+		`]`
 
 	if s != expect {
 		t.Fatal(s, expect)
diff --git a/daemon/internal/newrelic/collector/client.go b/daemon/internal/newrelic/collector/client.go
@@ -58,15 +58,15 @@ type RpmControls struct {
 // Agent Behavior Summary:
 //
 // on connect/preconnect:
-//     410 means shutdown
-//     200, 202 mean success (start run)
-//     all other response codes and errors mean try after backoff
+//   - 410 means shutdown
+//   - 200, 202 mean success (start run)
+//   - all other response codes and errors mean try after backoff
 //
 // on harvest:
-//     410 means shutdown
-//     401, 409 mean restart run
-//     408, 429, 500, 503 mean save data for next harvest
-//     all other response codes and errors discard the data and continue the current harvest
+//   - 410 means shutdown
+//   - 401, 409 mean restart run
+//   - 408, 429, 500, 503 mean save data for next harvest
+//   - all other response codes and errors discard the data and continue the current harvest
 type RPMResponse struct {
 	StatusCode int
 	Body       []byte
@@ -97,7 +97,6 @@ func removeURLFromError(err error) error {
 		ue.URL = "**REDACTED-URL**"
 	}
 
-
 	return err
 }
 
@@ -116,7 +115,7 @@ func (resp RPMResponse) IsDisconnect() bool {
 
 // IsRestartException indicates that the agent should restart.
 // 401 (License Exception) is considered a restart exception according to the spec,
-//   and is included here as such, however the PHP agent will not restart on a 401 and instead stop
+// and is included here as such, however the PHP agent will not restart on a 401 and instead stop
 func (resp RPMResponse) IsRestartException() bool {
 	return resp.StatusCode == 401 || resp.StatusCode == 409
 }
diff --git a/daemon/internal/newrelic/config/config.go b/daemon/internal/newrelic/config/config.go
@@ -65,13 +65,13 @@ func NewDecoder(r io.Reader) *Decoder {
 //
 // Decode implements the following PEG.
 //
-// INI     = ((KEYWORD WS* '=' WS* VALUE) / COMMENT / WS)*
-// KEYWORD = ALPHA (ALPHA / NUMERIC / '_' / '.')*
-// VALUE   = QUOTED / DQUOTED / RAW
-// QUOTED  = '\'' .* '\''
-// DQUOTED = '"' .* '"'
-// RAW     = .* EOL
-// COMMENT = ('#' / ';') .* EOL
+//	INI     = ((KEYWORD WS* '=' WS* VALUE) / COMMENT / WS)*
+//	KEYWORD = ALPHA (ALPHA / NUMERIC / '_' / '.')*
+//	VALUE   = QUOTED / DQUOTED / RAW
+//	QUOTED  = '\'' .* '\''
+//	DQUOTED = '"' .* '"'
+//	RAW     = .* EOL
+//	COMMENT = ('#' / ';') .* EOL
 func (d *Decoder) Decode(v interface{}) (err error) {
 	val := reflect.ValueOf(v)
 	if val.Kind() != reflect.Ptr {
diff --git a/daemon/internal/newrelic/harvest_trigger.go b/daemon/internal/newrelic/harvest_trigger.go
@@ -65,10 +65,10 @@ func triggerBuilder(t HarvestType, duration time.Duration) HarvestTriggerFunc {
 
 // To create a group of goroutines that may be cancelled by sending a single
 // message on a single channel, this function:
-// - Creates a cancel channel for the goroutine function f.
-// - Starts the goroutine.
-// - Returns the newly-created cancel channel so that it may be added to a
-//   broadcast group.
+//   - Creates a cancel channel for the goroutine function f.
+//   - Starts the goroutine.
+//   - Returns the newly-created cancel channel so that it may be added to a
+//     broadcast group.
 func startGroupMember(f HarvestTriggerFunc, trigger chan HarvestType) chan bool {
 	cancel := make(chan bool)
 	go f(trigger, cancel)
@@ -144,10 +144,10 @@ func customTriggerBuilder(reply *ConnectReply) HarvestTriggerFunc {
 
 // This function returns the harvest trigger function that should be used for
 // this agent.  In priority order:
-//   1. Either it uses the ConnectReply to build custom triggers as specified by
-//      the New Relic server-side collector.
-//   2. Or it creates a default harvest trigger, harvesting all data at the
-//      default period.
+//  1. Either it uses the ConnectReply to build custom triggers as specified by
+//     the New Relic server-side collector.
+//  2. Or it creates a default harvest trigger, harvesting all data at the
+//     default period.
 func getHarvestTrigger(key collector.LicenseKey, reply *ConnectReply) HarvestTriggerFunc {
 	// Build a trigger from the server-side collector configuration.
 	if reply.isHarvestAll() {
diff --git a/daemon/internal/newrelic/integration/parse.go b/daemon/internal/newrelic/integration/parse.go
@@ -228,7 +228,6 @@ func parsePHPModules(t *Test, content []byte) error {
 	return nil
 }
 
-
 func parseAnalyticEvents(test *Test, content []byte) error {
 	test.analyticEvents = content
 	return nil
diff --git a/daemon/internal/newrelic/integration/php_packages.go b/daemon/internal/newrelic/integration/php_packages.go
@@ -51,13 +51,14 @@ type ComposerJSON struct {
 	Installed []ComposerPackage
 }
 
-//
 // Given a JSON harvest payload, extract the PHP packages
 //
-// Params 1 : JSON byte string containing update_loaded_modules endpoint data
+// Params 1:
+//   - JSON byte string containing update_loaded_modules endpoint data
 //
-// Returns :  []PhpPackage with extracted package info, sorted by package name
-//            nil upon error processing JSON
+// Returns:
+//   - []PhpPackage with extracted package info, sorted by package name
+//   - nil upon error processing JSON
 func GetPhpPackagesFromData(data []byte) ([]PhpPackage, error) {
 	var pkgs []PhpPackage
 	var x []interface{}
@@ -279,11 +280,11 @@ func (pkgs *PhpPackagesCollection) OverrideVersionsFile() string {
 
 // Detects installed PHP packages
 //
-// Returns :  []PhpPackage with extracted package info, sorted by package name
-//            nil upon error processing JSON
-//
-// Notes   :  Currently only supports an application created with composer
+// Returns:
+//   - []PhpPackage with extracted package info, sorted by package name
+//   - nil upon error processing JSON
 //
+// Notes: Currently only supports an application created with composer
 func (pkgs *PhpPackagesCollection) GatherInstalledPackages() ([]PhpPackage, error) {
 
 	var err error
diff --git a/daemon/internal/newrelic/integration/test.go b/daemon/internal/newrelic/integration/test.go
diff --git a/daemon/internal/newrelic/processor_test.go b/daemon/internal/newrelic/processor_test.go
diff --git a/daemon/internal/newrelic/utilization/utilization_hash.go b/daemon/internal/newrelic/utilization/utilization_hash.go
