From c792d9720d98ddaab24399aee2fc26a1fca546e5 Mon Sep 17 00:00:00 2001
From: Steve Willoughby <swilloughby@newrelic.com>
Date: Thu, 28 Sep 2023 12:29:30 -0700
Subject: [PATCH 1/5] updates to nrpgx5

---
 CHANGELOG.md                                  |  42 ++--
 v3/go.mod                                     |  12 +
 v3/integrations/nrpgx/README.md               |   2 +-
 v3/integrations/nrpgx5/README.md              |   2 +-
 v3/integrations/nrpgx5/example/LICENSE.txt    | 206 ++++++++++++++++++
 .../nrpgx5/example/pgx/LICENSE.txt            | 206 ++++++++++++++++++
 .../nrpgx5/example/pgxpool/LICENSE.txt        | 206 ++++++++++++++++++
 v3/integrations/nrpgx5/go.mod                 |  28 +++
 v3/integrations/nrpgx5/nrpgx5.go              | 103 +++++----
 9 files changed, 736 insertions(+), 71 deletions(-)
 create mode 100644 v3/integrations/nrpgx5/example/LICENSE.txt
 create mode 100644 v3/integrations/nrpgx5/example/pgx/LICENSE.txt
 create mode 100644 v3/integrations/nrpgx5/example/pgxpool/LICENSE.txt

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 47b718bd5..9049b6af1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,13 +1,16 @@
-## 3.25.1
- * Corrects an error in the release process for 3.25.0.
-### Support statement
+## 3.26.0
+### Added
+ * Extended implementation of the `nrpgx5` integration (now v1.2.0). This instruments Postgres database operations using the `jackc/pgx/v5` library, including the direct access mode of operation as opposed to requiring code to use the library compatibly with the standard `database/sql` library.
+
+### Corrections
+ * See below for revised release notes for the 3.25.1 and the retracted 3.25.0 releases. We have clarified what was released at those versions; see also the revised notes for 3.22.0 and 3.22.1 for the same reason.
 
+### Support statement
  We use the latest version of the Go language. At minimum, you should be using no version of Go older than what is supported by the Go team themselves.
 
  See the [Go agent EOL Policy](https://docs.newrelic.com/docs/apm/agents/go-agent/get-started/go-agent-eol-policy/) for details about supported versions of the Go agent and third-party components.
 
-
-## 3.25.0
+## 3.25.1
 ### Added
    * Added Support for FastHTTP package
       * Added newrelic.WrapHandleFuncFastHTTP() and newrelic.StartExternalSegmentFastHTTP() functions to instrument fasthttp context and create wrapped handlers. These functions work similarly to the existing ones for net/http
@@ -16,6 +19,15 @@
 ### Fixed
  * Corrected a bug where the security agent failed to correctly parse the `NEW_RELIC_SECURITY_AGENT_ENABLED` environment variable.
 
+### Support statement
+ We use the latest version of the Go language. At minimum, you should be using no version of Go older than what is supported by the Go team themselves.
+
+ See the [Go agent EOL Policy](https://docs.newrelic.com/docs/apm/agents/go-agent/get-started/go-agent-eol-policy/) for details about supported versions of the Go agent and third-party components.
+
+## 3.25.0 (retracted)
+This release was retracted due to an error in the release process which caused the wrong git commit to be tagged.
+Since the erroneous `v3.25.0` tag was already visible publicly and may already have been picked up by the Go language infrastructure, we retracted the incorrect 3.25.0 version and released the changes intended for 3.25.0 as version 3.25.1, so users of the Go Agent library will reliably get the correct code.
+
 ### Support statement
 We use the latest version of the Go language. At minimum, you should be using no version of Go older than what is supported by the Go team themselves (i.e., Go versions 1.19 and later are supported).
 We recommend updating to the latest agent version as soon as it’s available. If you can’t upgrade to the latest version, update your agents to a version no more than 90 days old. Read more about keeping agents up to date. (https://docs.newrelic.com/docs/new-relic-solutions/new-relic-one/install-configure/update-new-relic-agent/)
@@ -111,16 +123,6 @@ See the [Go agent EOL Policy](https://docs.newrelic.com/docs/apm/agents/go-agent
 
 
 ## 3.22.1
- * Corrects an error in the release process for 3.22.0.
-
-### Support statement
-
- We use the latest version of the Go language. At minimum, you should be using no version of Go older than what is supported by the Go team themselves.
-
- See the [Go agent EOL Policy](https://docs.newrelic.com/docs/apm/agents/go-agent/get-started/go-agent-eol-policy/) for details about supported versions of the Go agent and third-party components.
-
-## 3.22.0
-
  ### Added
  * New Apache Kafka integration nrsarama that instruments the Sarama library https://github.com/Shopify/sarama
  * New logs in context integration logcontext-v2/nrzap that instruments the zap logging framework https://github.com/uber-go/zap
@@ -135,6 +137,16 @@ See the [Go agent EOL Policy](https://docs.newrelic.com/docs/apm/agents/go-agent
  * Bumped gin package to v1.9.0 in the nrgin integration
  * Bumped crypto package to v0.1.0 in the nrpgx  integration
  * Fixed integration tests in nrnats package not correctly showing code coverage
+ * Corrects an error in the release process for 3.22.0.
+
+### Support statement
+
+ We use the latest version of the Go language. At minimum, you should be using no version of Go older than what is supported by the Go team themselves.
+
+ See the [Go agent EOL Policy](https://docs.newrelic.com/docs/apm/agents/go-agent/get-started/go-agent-eol-policy/) for details about supported versions of the Go agent and third-party components.
+
+## 3.22.0 (retracted)
+This release has been retracted due to an error in the release process which caused it to be incorrectly created. Instead, release 3.22.1 was issued with the changes intended for 3.22.0.
 
  ### Support statement
 
diff --git a/v3/go.mod b/v3/go.mod
index c59b0ca3f..f3717dad6 100644
--- a/v3/go.mod
+++ b/v3/go.mod
@@ -8,5 +8,17 @@ require (
 	google.golang.org/grpc v1.54.0
 )
 
+require (
+	github.com/andybalholm/brotli v1.0.5 // indirect
+	github.com/klauspost/compress v1.16.3 // indirect
+	github.com/valyala/bytebufferpool v1.0.0 // indirect
+	golang.org/x/net v0.8.0 // indirect
+	golang.org/x/sys v0.6.0 // indirect
+	golang.org/x/text v0.8.0 // indirect
+	google.golang.org/genproto v0.0.0-20230110181048-76db0878b65f // indirect
+	google.golang.org/protobuf v1.28.1 // indirect
+)
+
 retract v3.22.0 // release process error corrected in v3.22.1
+
 retract v3.25.0 // release process error corrected in v3.25.1
diff --git a/v3/integrations/nrpgx/README.md b/v3/integrations/nrpgx/README.md
index 19944a488..fe5a924cf 100644
--- a/v3/integrations/nrpgx/README.md
+++ b/v3/integrations/nrpgx/README.md
@@ -1,4 +1,4 @@
-# v3/integrations/nrpq [![GoDoc](https://godoc.org/github.com/newrelic/go-agent/v3/integrations/nrpgx?status.svg)](https://godoc.org/github.com/newrelic/go-agent/v3/integrations/nrpgx)
+# v3/integrations/nrpgx [![GoDoc](https://godoc.org/github.com/newrelic/go-agent/v3/integrations/nrpgx?status.svg)](https://godoc.org/github.com/newrelic/go-agent/v3/integrations/nrpgx)
 
 Package `nrpgx` instruments https://github.com/jackc/pgx/v4.
 
diff --git a/v3/integrations/nrpgx5/README.md b/v3/integrations/nrpgx5/README.md
index 3e5070f66..011451499 100644
--- a/v3/integrations/nrpgx5/README.md
+++ b/v3/integrations/nrpgx5/README.md
@@ -1,6 +1,6 @@
 # v3/integrations/nrpgx5 [![GoDoc](https://godoc.org/github.com/newrelic/go-agent/v3/integrations/nrpgx5?status.svg)](https://godoc.org/github.com/newrelic/go-agent/v3/integrations/nrpgx5)
 
-Package `nrpgx` instruments https://github.com/jackc/pgx/v5.
+Package `nrpgx5` instruments https://github.com/jackc/pgx/v5. 
 
 ```go
 import "github.com/newrelic/go-agent/v3/integrations/nrpgx5"
diff --git a/v3/integrations/nrpgx5/example/LICENSE.txt b/v3/integrations/nrpgx5/example/LICENSE.txt
new file mode 100644
index 000000000..cee548c2d
--- /dev/null
+++ b/v3/integrations/nrpgx5/example/LICENSE.txt
@@ -0,0 +1,206 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+
+Versions 3.8.0 and above for this project are licensed under Apache 2.0. For
+prior versions of this project, please see the LICENCE.txt file in the root
+directory of that version for more information.
diff --git a/v3/integrations/nrpgx5/example/pgx/LICENSE.txt b/v3/integrations/nrpgx5/example/pgx/LICENSE.txt
new file mode 100644
index 000000000..cee548c2d
--- /dev/null
+++ b/v3/integrations/nrpgx5/example/pgx/LICENSE.txt
@@ -0,0 +1,206 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+
+Versions 3.8.0 and above for this project are licensed under Apache 2.0. For
+prior versions of this project, please see the LICENCE.txt file in the root
+directory of that version for more information.
diff --git a/v3/integrations/nrpgx5/example/pgxpool/LICENSE.txt b/v3/integrations/nrpgx5/example/pgxpool/LICENSE.txt
new file mode 100644
index 000000000..cee548c2d
--- /dev/null
+++ b/v3/integrations/nrpgx5/example/pgxpool/LICENSE.txt
@@ -0,0 +1,206 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+
+Versions 3.8.0 and above for this project are licensed under Apache 2.0. For
+prior versions of this project, please see the LICENCE.txt file in the root
+directory of that version for more information.
diff --git a/v3/integrations/nrpgx5/go.mod b/v3/integrations/nrpgx5/go.mod
index 0e99693dd..7c388899a 100644
--- a/v3/integrations/nrpgx5/go.mod
+++ b/v3/integrations/nrpgx5/go.mod
@@ -9,5 +9,33 @@ require (
 	github.com/stretchr/testify v1.8.0
 )
 
+require (
+	github.com/andybalholm/brotli v1.0.5 // indirect
+	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/golang/protobuf v1.5.3 // indirect
+	github.com/jackc/chunkreader/v2 v2.0.1 // indirect
+	github.com/jackc/pgconn v1.10.0 // indirect
+	github.com/jackc/pgio v1.0.0 // indirect
+	github.com/jackc/pgmock v0.0.0-20210724152146-4ad1a8207f65 // indirect
+	github.com/jackc/pgpassfile v1.0.0 // indirect
+	github.com/jackc/pgproto3/v2 v2.1.1 // indirect
+	github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b // indirect
+	github.com/jackc/pgtype v1.8.1 // indirect
+	github.com/jackc/pgx/v4 v4.13.0 // indirect
+	github.com/jackc/puddle/v2 v2.0.0 // indirect
+	github.com/klauspost/compress v1.16.3 // indirect
+	github.com/pmezard/go-difflib v1.0.0 // indirect
+	github.com/rogpeppe/go-internal v1.11.0 // indirect
+	github.com/valyala/bytebufferpool v1.0.0 // indirect
+	github.com/valyala/fasthttp v1.49.0 // indirect
+	golang.org/x/crypto v0.7.0 // indirect
+	golang.org/x/net v0.8.0 // indirect
+	golang.org/x/sys v0.6.0 // indirect
+	golang.org/x/text v0.8.0 // indirect
+	google.golang.org/genproto v0.0.0-20230110181048-76db0878b65f // indirect
+	google.golang.org/grpc v1.54.0 // indirect
+	google.golang.org/protobuf v1.28.1 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
+)
 
 replace github.com/newrelic/go-agent/v3 => ../..
diff --git a/v3/integrations/nrpgx5/nrpgx5.go b/v3/integrations/nrpgx5/nrpgx5.go
index 5c8758cfe..b51bb4ab5 100644
--- a/v3/integrations/nrpgx5/nrpgx5.go
+++ b/v3/integrations/nrpgx5/nrpgx5.go
@@ -3,52 +3,35 @@
 // Use this package to instrument your PostgreSQL calls using the pgx
 // library.
 //
-// This are the steps to instrument your pgx calls without using `database/sql`:
-// if you want to use `database/sql`, you can use `nrpgx` package instead
+// This integration is specifically aimed at instrumenting applications which
+// use the pgx/v5 library to directly communicate with the Postgres database server
+// (i.e., not via the standard database/sql library).
 //
-// to instrument your pgx calls:
-// you can set the tracer in the pgx.Config like this
-// ```go
-// import (
-// 	"github.com/jackc/pgx/v5"
-// 	"github.com/newrelic/go-agent/v3/integrations/nrpgx5"
-// 	"github.com/newrelic/go-agent/v3/newrelic"
-// )
+// To instrument your database operations, you will need to call nrpgx5.NewTracer() to obtain
+// a pgx.Tracer value. You can do this either with a normal pgx.ParseConfig() call or the
+// pgxpool.ParseConfig() call if you wish to use pgx connection pools.
 //
-// func main() {
-// 	cfg, err := pgx.ParseConfig("postgres://postgres:postgres@localhost:5432")
-// 	if err != nil {
-// 		panic(err)
-// 	}
+// For example:
 //
-// 	cfg.Tracer = nrpgx5.NewTracer()
-// 	conn, err := pgx.ConnectConfig(context.Background(), cfg)
-// 	if err != nil {
-// 		panic(err)
-// 	}
-// ...
-// ```
-// or you can set the tracer in the pgxpool.Config like this
-// ```go
-// import (
-// 	"github.com/jackc/pgx/v5/pgxpool"
-// 	"github.com/newrelic/go-agent/v3/integrations/nrpgx5"
-// 	"github.com/newrelic/go-agent/v3/newrelic"
-// )
+//    import (
+//    	"github.com/jackc/pgx/v5"
+// 	   "github.com/newrelic/go-agent/v3/integrations/nrpgx5"
+//    	"github.com/newrelic/go-agent/v3/newrelic"
+//    )
 //
-// func main() {
-// 	cfg, err := pgxpool.ParseConfig("postgres://postgres:postgres@localhost:5432")
-// 	if err != nil {
-// 		panic(err)
-// 	}
+//    func main() {
+// 	   cfg, err := pgx.ParseConfig("postgres://postgres:postgres@localhost:5432") // OR pgxpools.ParseConfig(...)
+// 	   if err != nil {
+//        panic(err)
+//     }
 //
-// 	cfg.ConnConfig.Tracer = nrpgx5.NewTracer()
-// 	db, err := pgxpool.NewWithConfig(context.Background(), cfg)
-// 	if err != nil {
-// 		panic(err)
-// 	}
-// ...
-// ```
+// 	   cfg.Tracer = nrpgx5.NewTracer()
+//     conn, err := pgx.ConnectConfig(context.Background(), cfg)
+//     if err != nil {
+//        panic(err)
+//     }
+//
+// See the programs in the example directory for working examples of each use case.
 
 package nrpgx5
 
@@ -89,8 +72,10 @@ func NewTracer() *Tracer {
 	}
 }
 
-// TraceConnectStart is called at the beginning of Connect and ConnectConfig calls. The returned context is used for
-// the rest of the call and will be passed to TraceConnectEnd. // implement pgx.ConnectTracer
+// TraceConnectStart is called at the beginning of Connect and ConnectConfig calls, as
+// what is essentially a callback from the pgx/v5 library to us so we can trace the operation.
+// The returned context is used for
+// the rest of the call and will be passed to TraceConnectEnd.
 func (t *Tracer) TraceConnectStart(ctx context.Context, data pgx.TraceConnectStartData) context.Context {
 	t.BaseSegment = newrelic.DatastoreSegment{
 		Product:      newrelic.DatastorePostgres,
@@ -102,11 +87,13 @@ func (t *Tracer) TraceConnectStart(ctx context.Context, data pgx.TraceConnectSta
 	return ctx
 }
 
-// TraceConnectEnd method // implement pgx.ConnectTracer
+// TraceConnectEnd is called by pgx/v5 at the end of the Connect and ConnectConfig calls.
 func (Tracer) TraceConnectEnd(ctx context.Context, data pgx.TraceConnectEndData) {}
 
-// TraceQueryStart is called at the beginning of Query, QueryRow, and Exec calls. The returned context is used for the
-// rest of the call and will be passed to TraceQueryEnd. //implement pgx.QueryTracer
+// TraceQueryStart is called by pgx/v5 at the beginning of Query, QueryRow, and Exec calls.
+// The returned context is used for the
+// rest of the call and will be passed to TraceQueryEnd.
+// This starts a new datastore segment in the transaction stored in the passed context.
 func (t *Tracer) TraceQueryStart(ctx context.Context, conn *pgx.Conn, data pgx.TraceQueryStartData) context.Context {
 	segment := t.BaseSegment
 	segment.StartTime = newrelic.FromContext(ctx).StartSegmentNow()
@@ -117,11 +104,16 @@ func (t *Tracer) TraceQueryStart(ctx context.Context, conn *pgx.Conn, data pgx.T
 
 	// fill Operation and Collection
 	t.ParseQuery(&segment, data.SQL)
+	if newrelic.IsSecurityAgentPresent() {
+		sa := newrelic.GetSecurityAgentInterface()
+		defer sa.SendExitEvent(sa.SendEvent("SQL", data.SQL, data.Args), nil) // TODO: need to refine this so the call to SendExitEvent happens in TraceQueryEnd without running afoul of any runtime issues caused by multiple parallel database operations. For now this allows us to have the functionality required as the top priority.
+	}
 
 	return context.WithValue(ctx, querySegmentKey, &segment)
 }
 
-// TraceQueryEnd method implement pgx.QueryTracer. It will try to get segment from context and end it.
+// TraceQueryEnd is called by pgx/v5 at the completion of Query, QueryRow, and Exec calls.
+// This will terminate the datastore segment started when the database operation was started.
 func (t *Tracer) TraceQueryEnd(ctx context.Context, conn *pgx.Conn, data pgx.TraceQueryEndData) {
 	segment, ok := ctx.Value(querySegmentKey).(*newrelic.DatastoreSegment)
 	if !ok {
@@ -139,7 +131,7 @@ func (t *Tracer) getQueryParameters(args []interface{}) map[string]interface{} {
 }
 
 // TraceBatchStart is called at the beginning of SendBatch calls. The returned context is used for the
-// rest of the call and will be passed to TraceBatchQuery and TraceBatchEnd. // implement pgx.BatchTracer
+// rest of the call and will be passed to TraceBatchQuery and TraceBatchEnd.
 func (t *Tracer) TraceBatchStart(ctx context.Context, conn *pgx.Conn, data pgx.TraceBatchStartData) context.Context {
 	segment := t.BaseSegment
 	segment.StartTime = newrelic.FromContext(ctx).StartSegmentNow()
@@ -149,7 +141,8 @@ func (t *Tracer) TraceBatchStart(ctx context.Context, conn *pgx.Conn, data pgx.T
 	return context.WithValue(ctx, batchSegmentKey, &segment)
 }
 
-// TraceBatchQuery implement pgx.BatchTracer. In this method we will get query and store it in segment.
+// TraceBatchQuery is called for each batched query operation. We will add the SQL statement to the segment's
+// ParameterizedQuery value.
 func (t *Tracer) TraceBatchQuery(ctx context.Context, conn *pgx.Conn, data pgx.TraceBatchQueryData) {
 	segment, ok := ctx.Value(batchSegmentKey).(*newrelic.DatastoreSegment)
 	if !ok {
@@ -159,7 +152,8 @@ func (t *Tracer) TraceBatchQuery(ctx context.Context, conn *pgx.Conn, data pgx.T
 	segment.ParameterizedQuery += data.SQL + "\n"
 }
 
-// TraceBatchEnd implement pgx.BatchTracer. In this method we will get segment from context and fill it with
+// TraceBatchEnd is called at the end of a batch. Here we will terminate the datastore segment we started when
+// the batch was started.
 func (t *Tracer) TraceBatchEnd(ctx context.Context, conn *pgx.Conn, data pgx.TraceBatchEndData) {
 	segment, ok := ctx.Value(batchSegmentKey).(*newrelic.DatastoreSegment)
 	if !ok {
@@ -169,13 +163,14 @@ func (t *Tracer) TraceBatchEnd(ctx context.Context, conn *pgx.Conn, data pgx.Tra
 }
 
 // TracePrepareStart is called at the beginning of Prepare calls. The returned context is used for the
-// rest of the call and will be passed to TracePrepareEnd. // implement pgx.PrepareTracer
-// The Query and QueryRow will call prepare. Fill this function will make the datastore segment called twice.
-// So this function woudln't do anything and just return the context.
+// rest of the call and will be passed to TracePrepareEnd.
+//
+// The Query and QueryRow will call prepare, so here we don't do any additional work (otherwise
+// we'd duplicate segment data).
 func (t *Tracer) TracePrepareStart(ctx context.Context, conn *pgx.Conn, data pgx.TracePrepareStartData) context.Context {
 	return ctx
 }
 
-// TracePrepareEnd implement pgx.PrepareTracer. In this function nothing happens.
+// TracePrepareEnd implements pgx.PrepareTracer.
 func (t *Tracer) TracePrepareEnd(ctx context.Context, conn *pgx.Conn, data pgx.TracePrepareEndData) {
 }

From 886f5fa81a93cfdaa4fb2563fb2130a68d0eb269 Mon Sep 17 00:00:00 2001
From: Steve Willoughby <swilloughby@newrelic.com>
Date: Thu, 28 Sep 2023 14:37:07 -0700
Subject: [PATCH 2/5] added tracer configuration option

---
 v3/integrations/nrpgx5/example/pgx/main.go | 11 +++++-
 v3/integrations/nrpgx5/nrpgx5.go           | 42 ++++++++++++++++++++--
 2 files changed, 50 insertions(+), 3 deletions(-)

diff --git a/v3/integrations/nrpgx5/example/pgx/main.go b/v3/integrations/nrpgx5/example/pgx/main.go
index 758af98bb..d156a6557 100644
--- a/v3/integrations/nrpgx5/example/pgx/main.go
+++ b/v3/integrations/nrpgx5/example/pgx/main.go
@@ -18,7 +18,7 @@ func main() {
 		panic(err)
 	}
 
-	cfg.Tracer = nrpgx5.NewTracer()
+	cfg.Tracer = nrpgx5.NewTracer(nrpgx5.WithQueryParameters(true))
 	conn, err := pgx.ConnectConfig(context.Background(), cfg)
 	if err != nil {
 		panic(err)
@@ -46,6 +46,15 @@ func main() {
 		log.Println(err)
 	}
 
+	var a, b int
+	rows, _ := conn.Query(ctx, "select n, n*2 from generate_series(1, $1) n", 3)
+	_, err = pgx.ForEachRow(rows, []any{&a, &b}, func() error {
+		fmt.Printf("%v %v\n", a, b)
+		return nil
+	})
+	if err != nil {
+		panic(err)
+	}
 	txn.End()
 	app.Shutdown(5 * time.Second)
 
diff --git a/v3/integrations/nrpgx5/nrpgx5.go b/v3/integrations/nrpgx5/nrpgx5.go
index b51bb4ab5..b0762e644 100644
--- a/v3/integrations/nrpgx5/nrpgx5.go
+++ b/v3/integrations/nrpgx5/nrpgx5.go
@@ -65,11 +65,49 @@ const (
 	batchSegmentKey   nrPgxSegmentType = "batchNrPgx5Segment"
 )
 
-func NewTracer() *Tracer {
-	return &Tracer{
+type TracerOption func(*Tracer)
+
+// NewTracer creates a new value which implements pgx.BatchTracer, pgx.ConnectTracer, pgx.PrepareTracer, and pgx.QueryTracer.
+// This value will be used to facilitate instrumentation of the database operations performed.
+// When establishing a connection to the database, the recommended usage is to do something like the following:
+//    cfg, err := pgx.ParseConfig("...")
+//    if err != nil { ... }
+//    cfg.Tracer = nrpgx5.NewTracer()
+//    conn, err := pgx.ConnectConfig(context.Background(), cfg)
+//
+// If you do not wish to have SQL query parameters included in the telemetry data, add the WithQueryParameters
+// option, like so:
+//    cfg.Tracer = nrpgx5.NewTracer(nrpgx5.WithQueryParameters(false))
+//
+// (The default is to collect query parameters, but you can explicitly select this by passing true to WithQueryParameters.)
+//
+// Note that query parameters may nevertheless be suppressed from the telemetry data due to agent configuration,
+// agent feature set, or policy independint of whether it's enabled here.
+func NewTracer(o ...TracerOption) *Tracer {
+	t := &Tracer{
 		ParseQuery:          sqlparse.ParseQuery,
 		SendQueryParameters: true,
 	}
+
+	for _, opt := range o {
+		opt(t)
+	}
+
+	return t
+}
+
+// WithQueryParameters is an option which may be passed to a call to NewTracer. It controls
+// whether or not to include the SQL query parameters in the telemetry data collected as part of
+// instrumenting database operations.
+//
+// By default this is enabled. To disable it, call NewTracer as NewTracer(WithQueryParameters(false)).
+//
+// Note that query parameters may nevertheless be suppressed from the telemetry data due to agent configuration,
+// agent feature set, or policy independint of whether it's enabled here.
+func WithQueryParameters(enabled bool) TracerOption {
+	return func(t *Tracer) {
+		t.SendQueryParameters = enabled
+	}
 }
 
 // TraceConnectStart is called at the beginning of Connect and ConnectConfig calls, as

From bc1604b90eb42bb20db10a7b144e27192c6b0977 Mon Sep 17 00:00:00 2001
From: Steve Willoughby <swilloughby@newrelic.com>
Date: Thu, 28 Sep 2023 14:53:47 -0700
Subject: [PATCH 3/5] fixed security agent calls

---
 v3/integrations/nrpgx5/nrpgx5.go | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/v3/integrations/nrpgx5/nrpgx5.go b/v3/integrations/nrpgx5/nrpgx5.go
index b0762e644..e14a6cbab 100644
--- a/v3/integrations/nrpgx5/nrpgx5.go
+++ b/v3/integrations/nrpgx5/nrpgx5.go
@@ -63,6 +63,7 @@ const (
 	querySegmentKey   nrPgxSegmentType = "nrPgx5Segment"
 	prepareSegmentKey nrPgxSegmentType = "prepareNrPgx5Segment"
 	batchSegmentKey   nrPgxSegmentType = "batchNrPgx5Segment"
+	querySecurityKey  nrPgxSegmentType = "nrPgx5SecurityToken"
 )
 
 type TracerOption func(*Tracer)
@@ -143,8 +144,8 @@ func (t *Tracer) TraceQueryStart(ctx context.Context, conn *pgx.Conn, data pgx.T
 	// fill Operation and Collection
 	t.ParseQuery(&segment, data.SQL)
 	if newrelic.IsSecurityAgentPresent() {
-		sa := newrelic.GetSecurityAgentInterface()
-		defer sa.SendExitEvent(sa.SendEvent("SQL", data.SQL, data.Args), nil) // TODO: need to refine this so the call to SendExitEvent happens in TraceQueryEnd without running afoul of any runtime issues caused by multiple parallel database operations. For now this allows us to have the functionality required as the top priority.
+		stoken := newrelic.GetSecurityAgentInterface().SendEvent("SQL", data.SQL, data.Args)
+		ctx = context.WithValue(ctx, querySecurityKey, stoken)
 	}
 
 	return context.WithValue(ctx, querySegmentKey, &segment)
@@ -157,6 +158,12 @@ func (t *Tracer) TraceQueryEnd(ctx context.Context, conn *pgx.Conn, data pgx.Tra
 	if !ok {
 		return
 	}
+	if newrelic.IsSecurityAgentPresent() {
+		if stoken := ctx.Value(querySecurityKey); stoken != nil {
+			newrelic.GetSecurityAgentInterface().SendExitEvent(stoken, nil)
+			ctx = context.WithValue(ctx, querySecurityKey, nil)
+		}
+	}
 	segment.End()
 }
 

From c9a553e428bd77d7a7102a2c3275a2504fd8e128 Mon Sep 17 00:00:00 2001
From: Steve Willoughby <swilloughby@newrelic.com>
Date: Thu, 28 Sep 2023 15:12:56 -0700
Subject: [PATCH 4/5] doc formatting

---
 v3/integrations/nrpgx5/nrpgx5.go | 29 ++++++++++++++++-------------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/v3/integrations/nrpgx5/nrpgx5.go b/v3/integrations/nrpgx5/nrpgx5.go
index e14a6cbab..6331064fb 100644
--- a/v3/integrations/nrpgx5/nrpgx5.go
+++ b/v3/integrations/nrpgx5/nrpgx5.go
@@ -1,3 +1,6 @@
+// Copyright 2020 New Relic Corporation. All rights reserved.
+// SPDX-License-Identifier: Apache-2.0
+
 // Package nrpgx5 instruments https://github.com/jackc/pgx/v5.
 //
 // Use this package to instrument your PostgreSQL calls using the pgx
@@ -14,25 +17,25 @@
 // For example:
 //
 //    import (
-//    	"github.com/jackc/pgx/v5"
-// 	   "github.com/newrelic/go-agent/v3/integrations/nrpgx5"
-//    	"github.com/newrelic/go-agent/v3/newrelic"
+//       "github.com/jackc/pgx/v5"
+//       "github.com/newrelic/go-agent/v3/integrations/nrpgx5"
+//       "github.com/newrelic/go-agent/v3/newrelic"
 //    )
 //
 //    func main() {
-// 	   cfg, err := pgx.ParseConfig("postgres://postgres:postgres@localhost:5432") // OR pgxpools.ParseConfig(...)
-// 	   if err != nil {
-//        panic(err)
-//     }
+//       cfg, err := pgx.ParseConfig("postgres://postgres:postgres@localhost:5432") // OR pgxpools.ParseConfig(...)
+//       if err != nil {
+//          panic(err)
+//       }
 //
-// 	   cfg.Tracer = nrpgx5.NewTracer()
-//     conn, err := pgx.ConnectConfig(context.Background(), cfg)
-//     if err != nil {
-//        panic(err)
-//     }
+//       cfg.Tracer = nrpgx5.NewTracer()
+//       conn, err := pgx.ConnectConfig(context.Background(), cfg)
+//       if err != nil {
+//          panic(err)
+//       }
+//    }
 //
 // See the programs in the example directory for working examples of each use case.
-
 package nrpgx5
 
 import (

From c32cee336d5bfb7e6ac68b626ed3dff6a65ef585 Mon Sep 17 00:00:00 2001
From: Steve Willoughby <swilloughby@newrelic.com>
Date: Thu, 28 Sep 2023 18:13:46 -0700
Subject: [PATCH 5/5] cleansed go.mod files

---
 v3/go.mod                                     | 10 -------
 .../logcontext-v2/logWriter/go.mod            |  2 +-
 v3/integrations/logcontext-v2/nrlogrus/go.mod |  2 +-
 v3/integrations/logcontext-v2/nrwriter/go.mod |  2 +-
 v3/integrations/logcontext-v2/nrzap/go.mod    |  2 +-
 .../logcontext-v2/nrzerolog/go.mod            |  2 +-
 .../logcontext-v2/zerologWriter/go.mod        |  2 +-
 .../logcontext/nrlogrusplugin/go.mod          |  2 +-
 v3/integrations/nrawssdk-v1/go.mod            |  2 +-
 v3/integrations/nrawssdk-v2/go.mod            |  2 +-
 v3/integrations/nrb3/go.mod                   |  2 +-
 v3/integrations/nrecho-v3/go.mod              |  2 +-
 v3/integrations/nrecho-v4/go.mod              |  2 +-
 v3/integrations/nrelasticsearch-v7/go.mod     |  2 +-
 v3/integrations/nrfasthttp/go.mod             |  3 +-
 v3/integrations/nrgin/go.mod                  |  2 +-
 v3/integrations/nrgorilla/go.mod              |  2 +-
 v3/integrations/nrgraphgophers/go.mod         |  2 +-
 v3/integrations/nrgraphqlgo/example/go.mod    |  2 +-
 v3/integrations/nrgraphqlgo/go.mod            |  2 +-
 v3/integrations/nrgrpc/go.mod                 |  2 +-
 v3/integrations/nrhttprouter/go.mod           |  2 +-
 v3/integrations/nrlambda/go.mod               |  2 +-
 v3/integrations/nrlogrus/go.mod               |  2 +-
 v3/integrations/nrlogxi/go.mod                |  2 +-
 v3/integrations/nrmicro/go.mod                |  2 +-
 v3/integrations/nrmongo/go.mod                |  2 +-
 v3/integrations/nrmssql/go.mod                |  2 +-
 v3/integrations/nrmysql/go.mod                |  2 +-
 v3/integrations/nrnats/go.mod                 |  2 +-
 v3/integrations/nrnats/test/go.mod            |  2 +-
 v3/integrations/nrpgx/example/sqlx/go.mod     |  2 +-
 v3/integrations/nrpgx/go.mod                  |  2 +-
 v3/integrations/nrpgx5/go.mod                 | 30 +------------------
 v3/integrations/nrpkgerrors/go.mod            |  2 +-
 v3/integrations/nrpq/example/sqlx/go.mod      |  2 +-
 v3/integrations/nrpq/go.mod                   |  2 +-
 v3/integrations/nrredis-v7/go.mod             |  2 +-
 v3/integrations/nrredis-v8/go.mod             |  2 +-
 v3/integrations/nrredis-v9/go.mod             |  2 +-
 v3/integrations/nrsarama/go.mod               |  2 +-
 v3/integrations/nrsecurityagent/go.mod        |  2 +-
 v3/integrations/nrsnowflake/go.mod            |  2 +-
 v3/integrations/nrsqlite3/go.mod              |  2 +-
 v3/integrations/nrstan/examples/go.mod        |  2 +-
 v3/integrations/nrstan/go.mod                 |  2 +-
 v3/integrations/nrstan/test/go.mod            |  2 +-
 v3/integrations/nrzap/go.mod                  |  2 +-
 48 files changed, 48 insertions(+), 85 deletions(-)

diff --git a/v3/go.mod b/v3/go.mod
index f3717dad6..dbef3bf7d 100644
--- a/v3/go.mod
+++ b/v3/go.mod
@@ -8,16 +8,6 @@ require (
 	google.golang.org/grpc v1.54.0
 )
 
-require (
-	github.com/andybalholm/brotli v1.0.5 // indirect
-	github.com/klauspost/compress v1.16.3 // indirect
-	github.com/valyala/bytebufferpool v1.0.0 // indirect
-	golang.org/x/net v0.8.0 // indirect
-	golang.org/x/sys v0.6.0 // indirect
-	golang.org/x/text v0.8.0 // indirect
-	google.golang.org/genproto v0.0.0-20230110181048-76db0878b65f // indirect
-	google.golang.org/protobuf v1.28.1 // indirect
-)
 
 retract v3.22.0 // release process error corrected in v3.22.1
 
diff --git a/v3/integrations/logcontext-v2/logWriter/go.mod b/v3/integrations/logcontext-v2/logWriter/go.mod
index c54a7f096..00b3f09fc 100644
--- a/v3/integrations/logcontext-v2/logWriter/go.mod
+++ b/v3/integrations/logcontext-v2/logWriter/go.mod
@@ -3,7 +3,7 @@ module github.com/newrelic/go-agent/v3/integrations/logcontext-v2/logWriter
 go 1.19
 
 require (
-	github.com/newrelic/go-agent/v3 v3.24.1
+	github.com/newrelic/go-agent/v3 v3.26.0
 	github.com/newrelic/go-agent/v3/integrations/logcontext-v2/nrwriter v1.0.0
 )
 
diff --git a/v3/integrations/logcontext-v2/nrlogrus/go.mod b/v3/integrations/logcontext-v2/nrlogrus/go.mod
index 1a98c954c..7d6e2dbea 100644
--- a/v3/integrations/logcontext-v2/nrlogrus/go.mod
+++ b/v3/integrations/logcontext-v2/nrlogrus/go.mod
@@ -3,7 +3,7 @@ module github.com/newrelic/go-agent/v3/integrations/logcontext-v2/nrlogrus
 go 1.19
 
 require (
-	github.com/newrelic/go-agent/v3 v3.24.1
+	github.com/newrelic/go-agent/v3 v3.26.0
 	github.com/sirupsen/logrus v1.8.1
 )
 
diff --git a/v3/integrations/logcontext-v2/nrwriter/go.mod b/v3/integrations/logcontext-v2/nrwriter/go.mod
index 345714015..bf5a5bcc1 100644
--- a/v3/integrations/logcontext-v2/nrwriter/go.mod
+++ b/v3/integrations/logcontext-v2/nrwriter/go.mod
@@ -2,7 +2,7 @@ module github.com/newrelic/go-agent/v3/integrations/logcontext-v2/nrwriter
 
 go 1.19
 
-require github.com/newrelic/go-agent/v3 v3.24.1
+require github.com/newrelic/go-agent/v3 v3.26.0
 
 
 replace github.com/newrelic/go-agent/v3 => ../../..
diff --git a/v3/integrations/logcontext-v2/nrzap/go.mod b/v3/integrations/logcontext-v2/nrzap/go.mod
index ed6f9d046..2ebe79303 100644
--- a/v3/integrations/logcontext-v2/nrzap/go.mod
+++ b/v3/integrations/logcontext-v2/nrzap/go.mod
@@ -3,7 +3,7 @@ module github.com/newrelic/go-agent/v3/integrations/logcontext-v2/nrzap
 go 1.19
 
 require (
-	github.com/newrelic/go-agent/v3 v3.24.1
+	github.com/newrelic/go-agent/v3 v3.26.0
 	go.uber.org/zap v1.24.0
 )
 
diff --git a/v3/integrations/logcontext-v2/nrzerolog/go.mod b/v3/integrations/logcontext-v2/nrzerolog/go.mod
index 41ca371cf..9cb9cc32e 100644
--- a/v3/integrations/logcontext-v2/nrzerolog/go.mod
+++ b/v3/integrations/logcontext-v2/nrzerolog/go.mod
@@ -3,7 +3,7 @@ module github.com/newrelic/go-agent/v3/integrations/logcontext-v2/nrzerolog
 go 1.19
 
 require (
-	github.com/newrelic/go-agent/v3 v3.24.1
+	github.com/newrelic/go-agent/v3 v3.26.0
 	github.com/rs/zerolog v1.26.1
 )
 
diff --git a/v3/integrations/logcontext-v2/zerologWriter/go.mod b/v3/integrations/logcontext-v2/zerologWriter/go.mod
index c32084511..1a831bbac 100644
--- a/v3/integrations/logcontext-v2/zerologWriter/go.mod
+++ b/v3/integrations/logcontext-v2/zerologWriter/go.mod
@@ -3,7 +3,7 @@ module github.com/newrelic/go-agent/v3/integrations/logcontext-v2/zerologWriter
 go 1.19
 
 require (
-	github.com/newrelic/go-agent/v3 v3.24.1
+	github.com/newrelic/go-agent/v3 v3.26.0
 	github.com/newrelic/go-agent/v3/integrations/logcontext-v2/nrwriter v1.0.0
 	github.com/rs/zerolog v1.27.0
 )
diff --git a/v3/integrations/logcontext/nrlogrusplugin/go.mod b/v3/integrations/logcontext/nrlogrusplugin/go.mod
index e05ef56ed..f882e9e4c 100644
--- a/v3/integrations/logcontext/nrlogrusplugin/go.mod
+++ b/v3/integrations/logcontext/nrlogrusplugin/go.mod
@@ -5,7 +5,7 @@ module github.com/newrelic/go-agent/v3/integrations/logcontext/nrlogrusplugin
 go 1.19
 
 require (
-	github.com/newrelic/go-agent/v3 v3.24.1
+	github.com/newrelic/go-agent/v3 v3.26.0
 	// v1.4.0 is required for for the log.WithContext.
 	github.com/sirupsen/logrus v1.4.0
 )
diff --git a/v3/integrations/nrawssdk-v1/go.mod b/v3/integrations/nrawssdk-v1/go.mod
index 76366a29e..01328d13f 100644
--- a/v3/integrations/nrawssdk-v1/go.mod
+++ b/v3/integrations/nrawssdk-v1/go.mod
@@ -8,7 +8,7 @@ go 1.19
 require (
 	// v1.15.0 is the first aws-sdk-go version with module support.
 	github.com/aws/aws-sdk-go v1.34.0
-	github.com/newrelic/go-agent/v3 v3.24.1
+	github.com/newrelic/go-agent/v3 v3.26.0
 )
 
 
diff --git a/v3/integrations/nrawssdk-v2/go.mod b/v3/integrations/nrawssdk-v2/go.mod
index d611471b8..b8913611b 100644
--- a/v3/integrations/nrawssdk-v2/go.mod
+++ b/v3/integrations/nrawssdk-v2/go.mod
@@ -11,7 +11,7 @@ require (
 	github.com/aws/aws-sdk-go-v2/service/lambda v1.24.5
 	github.com/aws/aws-sdk-go-v2/service/s3 v1.27.10
 	github.com/aws/smithy-go v1.13.3
-	github.com/newrelic/go-agent/v3 v3.24.1
+	github.com/newrelic/go-agent/v3 v3.26.0
 )
 
 
diff --git a/v3/integrations/nrb3/go.mod b/v3/integrations/nrb3/go.mod
index 87dc80d84..dc2a7e3c0 100644
--- a/v3/integrations/nrb3/go.mod
+++ b/v3/integrations/nrb3/go.mod
@@ -2,7 +2,7 @@ module github.com/newrelic/go-agent/v3/integrations/nrb3
 
 go 1.19
 
-require github.com/newrelic/go-agent/v3 v3.24.1
+require github.com/newrelic/go-agent/v3 v3.26.0
 
 
 replace github.com/newrelic/go-agent/v3 => ../..
diff --git a/v3/integrations/nrecho-v3/go.mod b/v3/integrations/nrecho-v3/go.mod
index c4709c7a4..590bcc584 100644
--- a/v3/integrations/nrecho-v3/go.mod
+++ b/v3/integrations/nrecho-v3/go.mod
@@ -8,7 +8,7 @@ require (
 	// v3.1.0 is the earliest v3 version of Echo that works with modules due
 	// to the github.com/rsc/letsencrypt import of v3.0.0.
 	github.com/labstack/echo v3.1.0+incompatible
-	github.com/newrelic/go-agent/v3 v3.24.1
+	github.com/newrelic/go-agent/v3 v3.26.0
 )
 
 
diff --git a/v3/integrations/nrecho-v4/go.mod b/v3/integrations/nrecho-v4/go.mod
index 93fee962f..fd871b086 100644
--- a/v3/integrations/nrecho-v4/go.mod
+++ b/v3/integrations/nrecho-v4/go.mod
@@ -6,7 +6,7 @@ go 1.19
 
 require (
 	github.com/labstack/echo/v4 v4.9.0
-	github.com/newrelic/go-agent/v3 v3.24.1
+	github.com/newrelic/go-agent/v3 v3.26.0
 )
 
 
diff --git a/v3/integrations/nrelasticsearch-v7/go.mod b/v3/integrations/nrelasticsearch-v7/go.mod
index 54a4c4fbe..43a3290a6 100644
--- a/v3/integrations/nrelasticsearch-v7/go.mod
+++ b/v3/integrations/nrelasticsearch-v7/go.mod
@@ -6,7 +6,7 @@ go 1.19
 
 require (
 	github.com/elastic/go-elasticsearch/v7 v7.17.0
-	github.com/newrelic/go-agent/v3 v3.24.1
+	github.com/newrelic/go-agent/v3 v3.26.0
 )
 
 
diff --git a/v3/integrations/nrfasthttp/go.mod b/v3/integrations/nrfasthttp/go.mod
index d4e207230..7f2b81134 100644
--- a/v3/integrations/nrfasthttp/go.mod
+++ b/v3/integrations/nrfasthttp/go.mod
@@ -3,7 +3,8 @@ module github.com/newrelic/go-agent/v3/integrations/nrfasthttp
 go 1.19
 
 require (
-	github.com/newrelic/go-agent/v3 v3.23.1
+	github.com/newrelic/go-agent/v3 v3.26.0
 	github.com/stretchr/testify v1.8.4
 	github.com/valyala/fasthttp v1.48.0
 )
+replace github.com/newrelic/go-agent/v3 => ../..
diff --git a/v3/integrations/nrgin/go.mod b/v3/integrations/nrgin/go.mod
index 369dd7a08..1440cd132 100644
--- a/v3/integrations/nrgin/go.mod
+++ b/v3/integrations/nrgin/go.mod
@@ -6,7 +6,7 @@ go 1.19
 
 require (
 	github.com/gin-gonic/gin v1.9.1
-	github.com/newrelic/go-agent/v3 v3.24.1
+	github.com/newrelic/go-agent/v3 v3.26.0
 )
 
 
diff --git a/v3/integrations/nrgorilla/go.mod b/v3/integrations/nrgorilla/go.mod
index 41b9e7e56..59abf7323 100644
--- a/v3/integrations/nrgorilla/go.mod
+++ b/v3/integrations/nrgorilla/go.mod
@@ -7,7 +7,7 @@ go 1.19
 require (
 	// v1.7.0 is the earliest version of Gorilla using modules.
 	github.com/gorilla/mux v1.7.0
-	github.com/newrelic/go-agent/v3 v3.24.1
+	github.com/newrelic/go-agent/v3 v3.26.0
 )
 
 
diff --git a/v3/integrations/nrgraphgophers/go.mod b/v3/integrations/nrgraphgophers/go.mod
index e599d6646..e75730ad9 100644
--- a/v3/integrations/nrgraphgophers/go.mod
+++ b/v3/integrations/nrgraphgophers/go.mod
@@ -7,7 +7,7 @@ go 1.19
 require (
 	// graphql-go has no tagged releases as of Jan 2020.
 	github.com/graph-gophers/graphql-go v1.3.0
-	github.com/newrelic/go-agent/v3 v3.24.1
+	github.com/newrelic/go-agent/v3 v3.26.0
 )
 
 
diff --git a/v3/integrations/nrgraphqlgo/example/go.mod b/v3/integrations/nrgraphqlgo/example/go.mod
index b3993842a..cb5bfcbfb 100644
--- a/v3/integrations/nrgraphqlgo/example/go.mod
+++ b/v3/integrations/nrgraphqlgo/example/go.mod
@@ -3,7 +3,7 @@ go 1.19
 require (
 	github.com/graphql-go/graphql v0.7.9
 	github.com/graphql-go/graphql-go-handler v0.2.3
-	github.com/newrelic/go-agent/v3 v3.24.1
+	github.com/newrelic/go-agent/v3 v3.26.0
 	github.com/newrelic/go-agent/v3/integrations/nrgraphqlgo v1.0.0
 )
 replace github.com/newrelic/go-agent/v3/integrations/nrgraphqlgo => ../
diff --git a/v3/integrations/nrgraphqlgo/go.mod b/v3/integrations/nrgraphqlgo/go.mod
index b400e34b6..e88d3ae77 100644
--- a/v3/integrations/nrgraphqlgo/go.mod
+++ b/v3/integrations/nrgraphqlgo/go.mod
@@ -4,7 +4,7 @@ go 1.19
 
 require (
 	github.com/graphql-go/graphql v0.7.9
-	github.com/newrelic/go-agent/v3 v3.24.1
+	github.com/newrelic/go-agent/v3 v3.26.0
 )
 
 
diff --git a/v3/integrations/nrgrpc/go.mod b/v3/integrations/nrgrpc/go.mod
index c9c1a2e1a..738fa628f 100644
--- a/v3/integrations/nrgrpc/go.mod
+++ b/v3/integrations/nrgrpc/go.mod
@@ -6,7 +6,7 @@ require (
 	// protobuf v1.3.0 is the earliest version using modules, we use v1.3.1
 	// because all dependencies were removed in this version.
 	github.com/golang/protobuf v1.5.3
-	github.com/newrelic/go-agent/v3 v3.24.1
+	github.com/newrelic/go-agent/v3 v3.26.0
 	github.com/newrelic/go-agent/v3/integrations/nrsecurityagent v1.1.0
 	// v1.15.0 is the earliest version of grpc using modules.
 	google.golang.org/grpc v1.54.0
diff --git a/v3/integrations/nrhttprouter/go.mod b/v3/integrations/nrhttprouter/go.mod
index 16b02cc00..f0d35c659 100644
--- a/v3/integrations/nrhttprouter/go.mod
+++ b/v3/integrations/nrhttprouter/go.mod
@@ -7,7 +7,7 @@ go 1.19
 require (
 	// v1.3.0 is the earliest version of httprouter using modules.
 	github.com/julienschmidt/httprouter v1.3.0
-	github.com/newrelic/go-agent/v3 v3.24.1
+	github.com/newrelic/go-agent/v3 v3.26.0
 )
 
 
diff --git a/v3/integrations/nrlambda/go.mod b/v3/integrations/nrlambda/go.mod
index e95062b69..d5742a6e1 100644
--- a/v3/integrations/nrlambda/go.mod
+++ b/v3/integrations/nrlambda/go.mod
@@ -4,7 +4,7 @@ go 1.19
 
 require (
 	github.com/aws/aws-lambda-go v1.41.0
-	github.com/newrelic/go-agent/v3 v3.24.1
+	github.com/newrelic/go-agent/v3 v3.26.0
 )
 
 
diff --git a/v3/integrations/nrlogrus/go.mod b/v3/integrations/nrlogrus/go.mod
index 065faeda8..2c2041181 100644
--- a/v3/integrations/nrlogrus/go.mod
+++ b/v3/integrations/nrlogrus/go.mod
@@ -5,7 +5,7 @@ module github.com/newrelic/go-agent/v3/integrations/nrlogrus
 go 1.19
 
 require (
-	github.com/newrelic/go-agent/v3 v3.24.1
+	github.com/newrelic/go-agent/v3 v3.26.0
 	// v1.1.0 is required for the Logger.GetLevel method, and is the earliest
 	// version of logrus using modules.
 	github.com/sirupsen/logrus v1.1.0
diff --git a/v3/integrations/nrlogxi/go.mod b/v3/integrations/nrlogxi/go.mod
index 2d94808a4..ea0a44d0f 100644
--- a/v3/integrations/nrlogxi/go.mod
+++ b/v3/integrations/nrlogxi/go.mod
@@ -7,7 +7,7 @@ go 1.19
 require (
 	// 'v1', at commit aebf8a7d67ab, is the only logxi release.
 	github.com/mgutz/logxi v0.0.0-20161027140823-aebf8a7d67ab
-	github.com/newrelic/go-agent/v3 v3.24.1
+	github.com/newrelic/go-agent/v3 v3.26.0
 )
 
 
diff --git a/v3/integrations/nrmicro/go.mod b/v3/integrations/nrmicro/go.mod
index 517cc9a51..1f9307f25 100644
--- a/v3/integrations/nrmicro/go.mod
+++ b/v3/integrations/nrmicro/go.mod
@@ -7,7 +7,7 @@ go 1.19
 require (
 	github.com/golang/protobuf v1.5.3
 	github.com/micro/go-micro v1.8.0
-	github.com/newrelic/go-agent/v3 v3.24.1
+	github.com/newrelic/go-agent/v3 v3.26.0
 )
 
 
diff --git a/v3/integrations/nrmongo/go.mod b/v3/integrations/nrmongo/go.mod
index b29aeadf5..532268674 100644
--- a/v3/integrations/nrmongo/go.mod
+++ b/v3/integrations/nrmongo/go.mod
@@ -5,7 +5,7 @@ module github.com/newrelic/go-agent/v3/integrations/nrmongo
 go 1.19
 
 require (
-	github.com/newrelic/go-agent/v3 v3.24.1
+	github.com/newrelic/go-agent/v3 v3.26.0
 	// mongo-driver does not support modules as of Nov 2019.
 	go.mongodb.org/mongo-driver v1.10.2
 )
diff --git a/v3/integrations/nrmssql/go.mod b/v3/integrations/nrmssql/go.mod
index b1ab6a925..1ff5415ce 100644
--- a/v3/integrations/nrmssql/go.mod
+++ b/v3/integrations/nrmssql/go.mod
@@ -4,7 +4,7 @@ go 1.19
 
 require (
 	github.com/microsoft/go-mssqldb v0.19.0
-	github.com/newrelic/go-agent/v3 v3.24.1
+	github.com/newrelic/go-agent/v3 v3.26.0
 )
 
 
diff --git a/v3/integrations/nrmysql/go.mod b/v3/integrations/nrmysql/go.mod
index b40b1b208..54607bb30 100644
--- a/v3/integrations/nrmysql/go.mod
+++ b/v3/integrations/nrmysql/go.mod
@@ -7,7 +7,7 @@ require (
 	// v1.5.0 is the first mysql version to support gomod
 	github.com/go-sql-driver/mysql v1.6.0
 	// v3.3.0 includes the new location of ParseQuery
-	github.com/newrelic/go-agent/v3 v3.24.1
+	github.com/newrelic/go-agent/v3 v3.26.0
 )
 
 replace github.com/newrelic/go-agent/v3 => ../..
diff --git a/v3/integrations/nrnats/go.mod b/v3/integrations/nrnats/go.mod
index c44399cd0..4f191be64 100644
--- a/v3/integrations/nrnats/go.mod
+++ b/v3/integrations/nrnats/go.mod
@@ -7,7 +7,7 @@ go 1.19
 require (
 	github.com/nats-io/nats-server v1.4.1
 	github.com/nats-io/nats.go v1.28.0
-	github.com/newrelic/go-agent/v3 v3.24.1
+	github.com/newrelic/go-agent/v3 v3.26.0
 )
 
 
diff --git a/v3/integrations/nrnats/test/go.mod b/v3/integrations/nrnats/test/go.mod
index 25f8ba71d..0c2807f24 100644
--- a/v3/integrations/nrnats/test/go.mod
+++ b/v3/integrations/nrnats/test/go.mod
@@ -8,7 +8,7 @@ replace github.com/newrelic/go-agent/v3/integrations/nrnats v1.0.0 => ../
 require (
 	github.com/nats-io/nats-server v1.4.1
 	github.com/nats-io/nats.go v1.17.0
-	github.com/newrelic/go-agent/v3 v3.24.1
+	github.com/newrelic/go-agent/v3 v3.26.0
 	github.com/newrelic/go-agent/v3/integrations/nrnats v1.0.0
 )
 
diff --git a/v3/integrations/nrpgx/example/sqlx/go.mod b/v3/integrations/nrpgx/example/sqlx/go.mod
index afbaf8901..c052f3364 100644
--- a/v3/integrations/nrpgx/example/sqlx/go.mod
+++ b/v3/integrations/nrpgx/example/sqlx/go.mod
@@ -4,7 +4,7 @@ module github.com/newrelic/go-agent/v3/integrations/nrpgx/example/sqlx
 go 1.19
 require (
 	github.com/jmoiron/sqlx v1.2.0
-	github.com/newrelic/go-agent/v3 v3.24.1
+	github.com/newrelic/go-agent/v3 v3.26.0
 	github.com/newrelic/go-agent/v3/integrations/nrpgx v0.0.0
 )
 replace github.com/newrelic/go-agent/v3/integrations/nrpgx => ../../
diff --git a/v3/integrations/nrpgx/go.mod b/v3/integrations/nrpgx/go.mod
index ffd24993f..3b09e3bb5 100644
--- a/v3/integrations/nrpgx/go.mod
+++ b/v3/integrations/nrpgx/go.mod
@@ -5,7 +5,7 @@ go 1.19
 require (
 	github.com/jackc/pgx v3.6.2+incompatible
 	github.com/jackc/pgx/v4 v4.13.0
-	github.com/newrelic/go-agent/v3 v3.24.1
+	github.com/newrelic/go-agent/v3 v3.26.0
 )
 
 
diff --git a/v3/integrations/nrpgx5/go.mod b/v3/integrations/nrpgx5/go.mod
index 7c388899a..006c1f5ac 100644
--- a/v3/integrations/nrpgx5/go.mod
+++ b/v3/integrations/nrpgx5/go.mod
@@ -5,37 +5,9 @@ go 1.19
 require (
 	github.com/egon12/pgsnap v0.0.0-20221022154027-2847f0124ed8
 	github.com/jackc/pgx/v5 v5.0.3
-	github.com/newrelic/go-agent/v3 v3.24.1
+	github.com/newrelic/go-agent/v3 v3.26.0
 	github.com/stretchr/testify v1.8.0
 )
 
-require (
-	github.com/andybalholm/brotli v1.0.5 // indirect
-	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/golang/protobuf v1.5.3 // indirect
-	github.com/jackc/chunkreader/v2 v2.0.1 // indirect
-	github.com/jackc/pgconn v1.10.0 // indirect
-	github.com/jackc/pgio v1.0.0 // indirect
-	github.com/jackc/pgmock v0.0.0-20210724152146-4ad1a8207f65 // indirect
-	github.com/jackc/pgpassfile v1.0.0 // indirect
-	github.com/jackc/pgproto3/v2 v2.1.1 // indirect
-	github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b // indirect
-	github.com/jackc/pgtype v1.8.1 // indirect
-	github.com/jackc/pgx/v4 v4.13.0 // indirect
-	github.com/jackc/puddle/v2 v2.0.0 // indirect
-	github.com/klauspost/compress v1.16.3 // indirect
-	github.com/pmezard/go-difflib v1.0.0 // indirect
-	github.com/rogpeppe/go-internal v1.11.0 // indirect
-	github.com/valyala/bytebufferpool v1.0.0 // indirect
-	github.com/valyala/fasthttp v1.49.0 // indirect
-	golang.org/x/crypto v0.7.0 // indirect
-	golang.org/x/net v0.8.0 // indirect
-	golang.org/x/sys v0.6.0 // indirect
-	golang.org/x/text v0.8.0 // indirect
-	google.golang.org/genproto v0.0.0-20230110181048-76db0878b65f // indirect
-	google.golang.org/grpc v1.54.0 // indirect
-	google.golang.org/protobuf v1.28.1 // indirect
-	gopkg.in/yaml.v3 v3.0.1 // indirect
-)
 
 replace github.com/newrelic/go-agent/v3 => ../..
diff --git a/v3/integrations/nrpkgerrors/go.mod b/v3/integrations/nrpkgerrors/go.mod
index fe7e7d804..d0a991860 100644
--- a/v3/integrations/nrpkgerrors/go.mod
+++ b/v3/integrations/nrpkgerrors/go.mod
@@ -5,7 +5,7 @@ module github.com/newrelic/go-agent/v3/integrations/nrpkgerrors
 go 1.19
 
 require (
-	github.com/newrelic/go-agent/v3 v3.24.1
+	github.com/newrelic/go-agent/v3 v3.26.0
 	// v0.8.0 was the last release in 2016, and when
 	// major development on pkg/errors stopped.
 	github.com/pkg/errors v0.8.0
diff --git a/v3/integrations/nrpq/example/sqlx/go.mod b/v3/integrations/nrpq/example/sqlx/go.mod
index 1a285c05d..d134e7874 100644
--- a/v3/integrations/nrpq/example/sqlx/go.mod
+++ b/v3/integrations/nrpq/example/sqlx/go.mod
@@ -5,7 +5,7 @@ go 1.19
 require (
 	github.com/jmoiron/sqlx v1.2.0
 	github.com/lib/pq v1.1.0
-	github.com/newrelic/go-agent/v3 v3.24.1
+	github.com/newrelic/go-agent/v3 v3.26.0
 	github.com/newrelic/go-agent/v3/integrations/nrpq v0.0.0
 )
 replace github.com/newrelic/go-agent/v3/integrations/nrpq => ../../
diff --git a/v3/integrations/nrpq/go.mod b/v3/integrations/nrpq/go.mod
index 359be4df9..c55872d06 100644
--- a/v3/integrations/nrpq/go.mod
+++ b/v3/integrations/nrpq/go.mod
@@ -6,7 +6,7 @@ require (
 	// NewConnector dsn parsing tests expect v1.1.0 error return behavior.
 	github.com/lib/pq v1.1.0
 	// v3.3.0 includes the new location of ParseQuery
-	github.com/newrelic/go-agent/v3 v3.24.1
+	github.com/newrelic/go-agent/v3 v3.26.0
 )
 
 
diff --git a/v3/integrations/nrredis-v7/go.mod b/v3/integrations/nrredis-v7/go.mod
index 63840c5de..71c502f25 100644
--- a/v3/integrations/nrredis-v7/go.mod
+++ b/v3/integrations/nrredis-v7/go.mod
@@ -5,7 +5,7 @@ go 1.19
 
 require (
 	github.com/go-redis/redis/v7 v7.0.0-beta.5
-	github.com/newrelic/go-agent/v3 v3.24.1
+	github.com/newrelic/go-agent/v3 v3.26.0
 )
 
 
diff --git a/v3/integrations/nrredis-v8/go.mod b/v3/integrations/nrredis-v8/go.mod
index 249d7c69c..8378b9271 100644
--- a/v3/integrations/nrredis-v8/go.mod
+++ b/v3/integrations/nrredis-v8/go.mod
@@ -5,7 +5,7 @@ go 1.19
 
 require (
 	github.com/go-redis/redis/v8 v8.4.0
-	github.com/newrelic/go-agent/v3 v3.24.1
+	github.com/newrelic/go-agent/v3 v3.26.0
 )
 
 
diff --git a/v3/integrations/nrredis-v9/go.mod b/v3/integrations/nrredis-v9/go.mod
index cd54f7ab4..c1a0a2c62 100644
--- a/v3/integrations/nrredis-v9/go.mod
+++ b/v3/integrations/nrredis-v9/go.mod
@@ -4,7 +4,7 @@ module github.com/newrelic/go-agent/v3/integrations/nrredis-v9
 go 1.19
 
 require (
-	github.com/newrelic/go-agent/v3 v3.24.1
+	github.com/newrelic/go-agent/v3 v3.26.0
 	github.com/redis/go-redis/v9 v9.0.2
 )
 
diff --git a/v3/integrations/nrsarama/go.mod b/v3/integrations/nrsarama/go.mod
index dde9f9011..acd484829 100644
--- a/v3/integrations/nrsarama/go.mod
+++ b/v3/integrations/nrsarama/go.mod
@@ -4,7 +4,7 @@ go 1.19
 
 require (
 	github.com/Shopify/sarama v1.38.1
-	github.com/newrelic/go-agent/v3 v3.24.1
+	github.com/newrelic/go-agent/v3 v3.26.0
 	github.com/stretchr/testify v1.8.1
 )
 
diff --git a/v3/integrations/nrsecurityagent/go.mod b/v3/integrations/nrsecurityagent/go.mod
index 990ec08c0..4fc26a9ff 100644
--- a/v3/integrations/nrsecurityagent/go.mod
+++ b/v3/integrations/nrsecurityagent/go.mod
@@ -4,7 +4,7 @@ go 1.19
 
 require (
 	github.com/newrelic/csec-go-agent v0.4.0
-	github.com/newrelic/go-agent/v3 v3.24.1
+	github.com/newrelic/go-agent/v3 v3.26.0
 	github.com/newrelic/go-agent/v3/integrations/nrsqlite3 v1.2.0
 	gopkg.in/yaml.v2 v2.4.0
 )
diff --git a/v3/integrations/nrsnowflake/go.mod b/v3/integrations/nrsnowflake/go.mod
index 18eef2db6..272453b9c 100644
--- a/v3/integrations/nrsnowflake/go.mod
+++ b/v3/integrations/nrsnowflake/go.mod
@@ -3,7 +3,7 @@ module github.com/newrelic/go-agent/v3/integrations/nrsnowflake
 go 1.19
 
 require (
-	github.com/newrelic/go-agent/v3 v3.24.1
+	github.com/newrelic/go-agent/v3 v3.26.0
 	github.com/snowflakedb/gosnowflake v1.6.19
 )
 
diff --git a/v3/integrations/nrsqlite3/go.mod b/v3/integrations/nrsqlite3/go.mod
index 4b8596e25..38c6e4d6b 100644
--- a/v3/integrations/nrsqlite3/go.mod
+++ b/v3/integrations/nrsqlite3/go.mod
@@ -7,7 +7,7 @@ go 1.19
 require (
 	github.com/mattn/go-sqlite3 v1.0.0
 	// v3.3.0 includes the new location of ParseQuery
-	github.com/newrelic/go-agent/v3 v3.24.1
+	github.com/newrelic/go-agent/v3 v3.26.0
 )
 
 
diff --git a/v3/integrations/nrstan/examples/go.mod b/v3/integrations/nrstan/examples/go.mod
index cf57fbccd..b69488b45 100644
--- a/v3/integrations/nrstan/examples/go.mod
+++ b/v3/integrations/nrstan/examples/go.mod
@@ -3,7 +3,7 @@ module github.com/newrelic/go-agent/v3/integrations/nrstan/examples
 go 1.19
 require (
 	github.com/nats-io/stan.go v0.5.0
-	github.com/newrelic/go-agent/v3 v3.24.1
+	github.com/newrelic/go-agent/v3 v3.26.0
 	github.com/newrelic/go-agent/v3/integrations/nrnats v0.0.0
 	github.com/newrelic/go-agent/v3/integrations/nrstan v0.0.0
 )
diff --git a/v3/integrations/nrstan/go.mod b/v3/integrations/nrstan/go.mod
index f79d32ddf..d40cbad24 100644
--- a/v3/integrations/nrstan/go.mod
+++ b/v3/integrations/nrstan/go.mod
@@ -6,7 +6,7 @@ go 1.19
 
 require (
 	github.com/nats-io/stan.go v0.10.4
-	github.com/newrelic/go-agent/v3 v3.24.1
+	github.com/newrelic/go-agent/v3 v3.26.0
 )
 
 
diff --git a/v3/integrations/nrstan/test/go.mod b/v3/integrations/nrstan/test/go.mod
index aabad5475..6002bc674 100644
--- a/v3/integrations/nrstan/test/go.mod
+++ b/v3/integrations/nrstan/test/go.mod
@@ -7,7 +7,7 @@ go 1.19
 require (
 	github.com/nats-io/nats-streaming-server v0.24.3
 	github.com/nats-io/stan.go v0.10.4
-	github.com/newrelic/go-agent/v3 v3.24.1
+	github.com/newrelic/go-agent/v3 v3.26.0
 	github.com/newrelic/go-agent/v3/integrations/nrstan v0.0.0
 )
 
diff --git a/v3/integrations/nrzap/go.mod b/v3/integrations/nrzap/go.mod
index dae7df3a3..1dac957b7 100644
--- a/v3/integrations/nrzap/go.mod
+++ b/v3/integrations/nrzap/go.mod
@@ -5,7 +5,7 @@ module github.com/newrelic/go-agent/v3/integrations/nrzap
 go 1.19
 
 require (
-	github.com/newrelic/go-agent/v3 v3.24.1
+	github.com/newrelic/go-agent/v3 v3.26.0
 	// v1.12.0 is the earliest version of zap using modules.
 	go.uber.org/zap v1.12.0
 )