Skip to content

Commit ab9e248

Browse files
authored
Merge pull request #751 from newrelic/develop
Release 3.23.1
2 parents 45ed3ee + 182f9e3 commit ab9e248

File tree

17 files changed

+296
-13
lines changed

17 files changed

+296
-13
lines changed

.github/workflows/ci.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ jobs:
2525
dirs: v3/newrelic,v3/internal,v3/examples
2626

2727
# v3 integrations
28+
- go-version: 1.19.x
29+
dirs: v3/integrations/nrsarama
2830
- go-version: 1.18.x
2931
dirs: v3/integrations/logcontext/nrlogrusplugin
3032
extratesting: go get -u github.com/sirupsen/logrus@master
@@ -70,7 +72,6 @@ jobs:
7072
dirs: v3/integrations/nrgraphgophers
7173
- go-version: 1.18.x
7274
dirs: v3/integrations/nrlogrus
73-
extratesting: go get -u github.com/sirupsen/logrus@master
7475
- go-version: 1.18.x
7576
dirs: v3/integrations/nrlogxi
7677
extratesting: go get -u github.com/mgutz/logxi@master
@@ -179,7 +180,6 @@ jobs:
179180
fail-fast: false
180181
matrix:
181182
include:
182-
- go-version: 1.17.10
183183
- go-version: 1.18.6
184184
- go-version: 1.19.1
185185
steps:

CHANGELOG.md

+16
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,19 @@
1+
## 3.23.1
2+
3+
## Added
4+
* Added newrelic.ConfigDatastoreRawQuery(true) configuration option to allow raw SQL queries to appear in new relic dashboards
5+
* Added license file to nrsecurityagent integration
6+
* Added enriched serverless debug logging for faster debugging
7+
8+
## Fixed
9+
* Removed timeouts on two tests in trace_observer_test.go
10+
* Bumped nrnats test to go1.19
11+
* Bumped graphql-go to v1.3.0 in the nrgraphgophers integration
12+
13+
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/)
14+
15+
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.
16+
117
## 3.23.0
218
### Added
319
* Adds the `nrsecurityagent` integration for performing Interactive Application Security Testing (IAST) of your application.

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[![Community Plus header](https://github.com/newrelic/opensource-website/raw/main/src/images/categories/Community_Plus.png)](https://opensource.newrelic.com/oss-category/#community-plus)
22

3-
# New Relic Go Agent [![GoDoc](https://godoc.org/github.com/newrelic/go-agent?status.svg)](https://godoc.org/github.com/newrelic/go-agent/v3/newrelic/) [![Go Report Card](https://goreportcard.com/badge/github.com/newrelic/go-agent)](https://goreportcard.com/report/github.com/newrelic/go-agent)
3+
# New Relic Go Agent [![GoDoc](https://godoc.org/github.com/newrelic/go-agent?status.svg)](https://godoc.org/github.com/newrelic/go-agent/v3/newrelic/) [![Go Report Card](https://goreportcard.com/badge/github.com/newrelic/go-agent)](https://goreportcard.com/report/github.com/newrelic/go-agent) [![codecov](https://codecov.io/github/newrelic/go-agent/branch/master/graph/badge.svg?token=UEWy0clWYW)](https://codecov.io/github/newrelic/go-agent)
44

55
The New Relic Go Agent allows you to monitor your Go applications with New
66
Relic. It helps you track transactions, outbound requests, database calls, and

v3/integrations/nrgraphgophers/go.mod

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
module github.com/newrelic/go-agent/v3/integrations/nrgraphgophers
2+
23
// As of Jan 2020, the graphql-go go.mod file uses 1.13:
34
// https://github.com/graph-gophers/graphql-go/blob/master/go.mod
45
go 1.13
6+
57
require (
68
// graphql-go has no tagged releases as of Jan 2020.
7-
github.com/graph-gophers/graphql-go v0.0.0-20200207002730-8334863f2c8b
9+
github.com/graph-gophers/graphql-go v1.3.0
810
github.com/newrelic/go-agent/v3 v3.17.0
911
)

v3/integrations/nrnats/go.mod

+21-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,27 @@
11
module github.com/newrelic/go-agent/v3/integrations/nrnats
2-
// As of Dec 2019, 1.11 is the earliest version of Go tested by nats:
2+
3+
// As of Jun 2023, 1.19 is the earliest version of Go tested by nats:
34
// https://github.com/nats-io/nats.go/blob/master/.travis.yml
4-
go 1.18
5+
go 1.19
6+
57
require (
68
github.com/nats-io/nats-server v1.4.1
79
github.com/nats-io/nats.go v1.25.0
8-
github.com/newrelic/go-agent/v3 v3.21.0
10+
github.com/newrelic/go-agent/v3 v3.23.0
11+
)
12+
13+
require (
14+
github.com/golang/protobuf v1.5.3 // indirect
15+
github.com/nats-io/gnatsd v1.4.1 // indirect
16+
github.com/nats-io/go-nats v1.7.2 // indirect
17+
github.com/nats-io/nats-server/v2 v2.9.17 // indirect
18+
github.com/nats-io/nkeys v0.4.4 // indirect
19+
github.com/nats-io/nuid v1.0.1 // indirect
20+
golang.org/x/crypto v0.8.0 // indirect
21+
golang.org/x/net v0.9.0 // indirect
22+
golang.org/x/sys v0.7.0 // indirect
23+
golang.org/x/text v0.9.0 // indirect
24+
google.golang.org/genproto v0.0.0-20230110181048-76db0878b65f // indirect
25+
google.golang.org/grpc v1.54.0 // indirect
26+
google.golang.org/protobuf v1.28.1 // indirect
927
)

v3/integrations/nrpq/example/main.go

+1
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ func main() {
3737
newrelic.ConfigAppName("PostgreSQL App"),
3838
newrelic.ConfigLicense(os.Getenv("NEW_RELIC_LICENSE_KEY")),
3939
newrelic.ConfigDebugLogger(os.Stdout),
40+
newrelic.ConfigDatastoreRawQuery(true),
4041
)
4142
if nil != err {
4243
panic(err)
+206
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,206 @@
1+
Apache License
2+
Version 2.0, January 2004
3+
http://www.apache.org/licenses/
4+
5+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
6+
7+
1. Definitions.
8+
9+
"License" shall mean the terms and conditions for use, reproduction,
10+
and distribution as defined by Sections 1 through 9 of this document.
11+
12+
"Licensor" shall mean the copyright owner or entity authorized by
13+
the copyright owner that is granting the License.
14+
15+
"Legal Entity" shall mean the union of the acting entity and all
16+
other entities that control, are controlled by, or are under common
17+
control with that entity. For the purposes of this definition,
18+
"control" means (i) the power, direct or indirect, to cause the
19+
direction or management of such entity, whether by contract or
20+
otherwise, or (ii) ownership of fifty percent (50%) or more of the
21+
outstanding shares, or (iii) beneficial ownership of such entity.
22+
23+
"You" (or "Your") shall mean an individual or Legal Entity
24+
exercising permissions granted by this License.
25+
26+
"Source" form shall mean the preferred form for making modifications,
27+
including but not limited to software source code, documentation
28+
source, and configuration files.
29+
30+
"Object" form shall mean any form resulting from mechanical
31+
transformation or translation of a Source form, including but
32+
not limited to compiled object code, generated documentation,
33+
and conversions to other media types.
34+
35+
"Work" shall mean the work of authorship, whether in Source or
36+
Object form, made available under the License, as indicated by a
37+
copyright notice that is included in or attached to the work
38+
(an example is provided in the Appendix below).
39+
40+
"Derivative Works" shall mean any work, whether in Source or Object
41+
form, that is based on (or derived from) the Work and for which the
42+
editorial revisions, annotations, elaborations, or other modifications
43+
represent, as a whole, an original work of authorship. For the purposes
44+
of this License, Derivative Works shall not include works that remain
45+
separable from, or merely link (or bind by name) to the interfaces of,
46+
the Work and Derivative Works thereof.
47+
48+
"Contribution" shall mean any work of authorship, including
49+
the original version of the Work and any modifications or additions
50+
to that Work or Derivative Works thereof, that is intentionally
51+
submitted to Licensor for inclusion in the Work by the copyright owner
52+
or by an individual or Legal Entity authorized to submit on behalf of
53+
the copyright owner. For the purposes of this definition, "submitted"
54+
means any form of electronic, verbal, or written communication sent
55+
to the Licensor or its representatives, including but not limited to
56+
communication on electronic mailing lists, source code control systems,
57+
and issue tracking systems that are managed by, or on behalf of, the
58+
Licensor for the purpose of discussing and improving the Work, but
59+
excluding communication that is conspicuously marked or otherwise
60+
designated in writing by the copyright owner as "Not a Contribution."
61+
62+
"Contributor" shall mean Licensor and any individual or Legal Entity
63+
on behalf of whom a Contribution has been received by Licensor and
64+
subsequently incorporated within the Work.
65+
66+
2. Grant of Copyright License. Subject to the terms and conditions of
67+
this License, each Contributor hereby grants to You a perpetual,
68+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
69+
copyright license to reproduce, prepare Derivative Works of,
70+
publicly display, publicly perform, sublicense, and distribute the
71+
Work and such Derivative Works in Source or Object form.
72+
73+
3. Grant of Patent License. Subject to the terms and conditions of
74+
this License, each Contributor hereby grants to You a perpetual,
75+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
76+
(except as stated in this section) patent license to make, have made,
77+
use, offer to sell, sell, import, and otherwise transfer the Work,
78+
where such license applies only to those patent claims licensable
79+
by such Contributor that are necessarily infringed by their
80+
Contribution(s) alone or by combination of their Contribution(s)
81+
with the Work to which such Contribution(s) was submitted. If You
82+
institute patent litigation against any entity (including a
83+
cross-claim or counterclaim in a lawsuit) alleging that the Work
84+
or a Contribution incorporated within the Work constitutes direct
85+
or contributory patent infringement, then any patent licenses
86+
granted to You under this License for that Work shall terminate
87+
as of the date such litigation is filed.
88+
89+
4. Redistribution. You may reproduce and distribute copies of the
90+
Work or Derivative Works thereof in any medium, with or without
91+
modifications, and in Source or Object form, provided that You
92+
meet the following conditions:
93+
94+
(a) You must give any other recipients of the Work or
95+
Derivative Works a copy of this License; and
96+
97+
(b) You must cause any modified files to carry prominent notices
98+
stating that You changed the files; and
99+
100+
(c) You must retain, in the Source form of any Derivative Works
101+
that You distribute, all copyright, patent, trademark, and
102+
attribution notices from the Source form of the Work,
103+
excluding those notices that do not pertain to any part of
104+
the Derivative Works; and
105+
106+
(d) If the Work includes a "NOTICE" text file as part of its
107+
distribution, then any Derivative Works that You distribute must
108+
include a readable copy of the attribution notices contained
109+
within such NOTICE file, excluding those notices that do not
110+
pertain to any part of the Derivative Works, in at least one
111+
of the following places: within a NOTICE text file distributed
112+
as part of the Derivative Works; within the Source form or
113+
documentation, if provided along with the Derivative Works; or,
114+
within a display generated by the Derivative Works, if and
115+
wherever such third-party notices normally appear. The contents
116+
of the NOTICE file are for informational purposes only and
117+
do not modify the License. You may add Your own attribution
118+
notices within Derivative Works that You distribute, alongside
119+
or as an addendum to the NOTICE text from the Work, provided
120+
that such additional attribution notices cannot be construed
121+
as modifying the License.
122+
123+
You may add Your own copyright statement to Your modifications and
124+
may provide additional or different license terms and conditions
125+
for use, reproduction, or distribution of Your modifications, or
126+
for any such Derivative Works as a whole, provided Your use,
127+
reproduction, and distribution of the Work otherwise complies with
128+
the conditions stated in this License.
129+
130+
5. Submission of Contributions. Unless You explicitly state otherwise,
131+
any Contribution intentionally submitted for inclusion in the Work
132+
by You to the Licensor shall be under the terms and conditions of
133+
this License, without any additional terms or conditions.
134+
Notwithstanding the above, nothing herein shall supersede or modify
135+
the terms of any separate license agreement you may have executed
136+
with Licensor regarding such Contributions.
137+
138+
6. Trademarks. This License does not grant permission to use the trade
139+
names, trademarks, service marks, or product names of the Licensor,
140+
except as required for reasonable and customary use in describing the
141+
origin of the Work and reproducing the content of the NOTICE file.
142+
143+
7. Disclaimer of Warranty. Unless required by applicable law or
144+
agreed to in writing, Licensor provides the Work (and each
145+
Contributor provides its Contributions) on an "AS IS" BASIS,
146+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
147+
implied, including, without limitation, any warranties or conditions
148+
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
149+
PARTICULAR PURPOSE. You are solely responsible for determining the
150+
appropriateness of using or redistributing the Work and assume any
151+
risks associated with Your exercise of permissions under this License.
152+
153+
8. Limitation of Liability. In no event and under no legal theory,
154+
whether in tort (including negligence), contract, or otherwise,
155+
unless required by applicable law (such as deliberate and grossly
156+
negligent acts) or agreed to in writing, shall any Contributor be
157+
liable to You for damages, including any direct, indirect, special,
158+
incidental, or consequential damages of any character arising as a
159+
result of this License or out of the use or inability to use the
160+
Work (including but not limited to damages for loss of goodwill,
161+
work stoppage, computer failure or malfunction, or any and all
162+
other commercial damages or losses), even if such Contributor
163+
has been advised of the possibility of such damages.
164+
165+
9. Accepting Warranty or Additional Liability. While redistributing
166+
the Work or Derivative Works thereof, You may choose to offer,
167+
and charge a fee for, acceptance of support, warranty, indemnity,
168+
or other liability obligations and/or rights consistent with this
169+
License. However, in accepting such obligations, You may act only
170+
on Your own behalf and on Your sole responsibility, not on behalf
171+
of any other Contributor, and only if You agree to indemnify,
172+
defend, and hold each Contributor harmless for any liability
173+
incurred by, or claims asserted against, such Contributor by reason
174+
of your accepting any such warranty or additional liability.
175+
176+
END OF TERMS AND CONDITIONS
177+
178+
APPENDIX: How to apply the Apache License to your work.
179+
180+
To apply the Apache License to your work, attach the following
181+
boilerplate notice, with the fields enclosed by brackets "[]"
182+
replaced with your own identifying information. (Don't include
183+
the brackets!) The text should be enclosed in the appropriate
184+
comment syntax for the file format. We also recommend that a
185+
file or class name and description of purpose be included on the
186+
same "printed page" as the copyright notice for easier
187+
identification within third-party archives.
188+
189+
Copyright [yyyy] [name of copyright owner]
190+
191+
Licensed under the Apache License, Version 2.0 (the "License");
192+
you may not use this file except in compliance with the License.
193+
You may obtain a copy of the License at
194+
195+
http://www.apache.org/licenses/LICENSE-2.0
196+
197+
Unless required by applicable law or agreed to in writing, software
198+
distributed under the License is distributed on an "AS IS" BASIS,
199+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
200+
See the License for the specific language governing permissions and
201+
limitations under the License.
202+
203+
204+
Versions 3.8.0 and above for this project are licensed under Apache 2.0. For
205+
prior versions of this project, please see the LICENCE.txt file in the root
206+
directory of that version for more information.

v3/newrelic/config.go

+5
Original file line numberDiff line numberDiff line change
@@ -316,6 +316,10 @@ type Config struct {
316316
QueryParameters struct {
317317
Enabled bool
318318
}
319+
RawQuery struct {
320+
Enabled bool
321+
}
322+
319323
// SlowQuery controls the capture of slow query traces. Slow
320324
// query traces show you instances of your slowest datastore
321325
// segments.
@@ -653,6 +657,7 @@ func defaultConfig() Config {
653657
c.DatastoreTracer.QueryParameters.Enabled = true
654658
c.DatastoreTracer.SlowQuery.Enabled = true
655659
c.DatastoreTracer.SlowQuery.Threshold = 10 * time.Millisecond
660+
c.DatastoreTracer.RawQuery.Enabled = false
656661

657662
c.ServerlessMode.ApdexThreshold = 500 * time.Millisecond
658663
c.ServerlessMode.Enabled = false

v3/newrelic/config_options.go

+8
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,14 @@ func ConfigCodeLevelMetricsEnabled(enabled bool) ConfigOption {
6868
}
6969
}
7070

71+
// ConfigDatastoreRawQuery replaces a parameterized query in datastores
72+
// with the full raw query
73+
func ConfigDatastoreRawQuery(enabled bool) ConfigOption {
74+
return func(cfg *Config) {
75+
cfg.DatastoreTracer.RawQuery.Enabled = enabled
76+
}
77+
}
78+
7179
// ConfigCodeLevelMetricsIgnoredPrefix alters the way the Code Level Metrics
7280
// collection code searches for the right function to report for a given
7381
// telemetry trace. It will find the innermost function whose name does NOT

v3/newrelic/config_test.go

+2
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,7 @@ func TestCopyConfigReferenceFieldsPresent(t *testing.T) {
159159
"DatabaseNameReporting":{"Enabled":true},
160160
"InstanceReporting":{"Enabled":true},
161161
"QueryParameters":{"Enabled":true},
162+
"RawQuery":{"Enabled":false},
162163
"SlowQuery":{
163164
"Enabled":true,
164165
"Threshold":10000000
@@ -358,6 +359,7 @@ func TestCopyConfigReferenceFieldsAbsent(t *testing.T) {
358359
"DatabaseNameReporting":{"Enabled":true},
359360
"InstanceReporting":{"Enabled":true},
360361
"QueryParameters":{"Enabled":true},
362+
"RawQuery":{"Enabled":false},
361363
"SlowQuery":{
362364
"Enabled":true,
363365
"Threshold":10000000

v3/newrelic/internal_txn.go

+3
Original file line numberDiff line numberDiff line change
@@ -919,6 +919,9 @@ func endDatastore(s *DatastoreSegment) error {
919919
if !txn.Config.DatastoreTracer.QueryParameters.Enabled {
920920
s.QueryParameters = nil
921921
}
922+
if txn.Config.DatastoreTracer.RawQuery.Enabled {
923+
s.ParameterizedQuery = s.RawQuery
924+
}
922925
if txn.Reply.SecurityPolicies.RecordSQL.IsSet() {
923926
s.QueryParameters = nil
924927
if !txn.Reply.SecurityPolicies.RecordSQL.Enabled() {

v3/newrelic/segments.go

+3-1
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,9 @@ type DatastoreSegment struct {
5252
// ParameterizedQuery may be set to the query being performed. It must
5353
// not contain any raw parameters, only placeholders.
5454
ParameterizedQuery string
55+
// RawQuery stores the original raw query
56+
RawQuery string
57+
5558
// QueryParameters may be used to provide query parameters. Care should
5659
// be taken to only provide parameters which are not sensitive.
5760
// QueryParameters are ignored in high security mode. The keys must contain
@@ -310,7 +313,6 @@ func StartSegment(txn *Transaction, name string) *Segment {
310313
//
311314
// Using the same http.Client for all of your external requests? Check out
312315
// NewRoundTripper: You may not need to use StartExternalSegment at all!
313-
//
314316
func StartExternalSegment(txn *Transaction, request *http.Request) *ExternalSegment {
315317
if nil == txn {
316318
txn = transactionFromRequestContext(request)

0 commit comments

Comments
 (0)