diff --git a/CHANGELOG.md b/CHANGELOG.md index 62c28161b..ef6ed4c77 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,15 @@ +## 3.29.0 +### Added + * Security agent integration `nrsecurityagent` now reports security configuraiton information along with the overall Go Agent configuration values. (Updates `nrsecurityagent` to v1.2.0.) + * Code-Level Metrics collection efficiency enhancement allows user callback function for as-needed (and just-in-time) evaluation of custom code locations rather than up-front location overrides, via the `WithCodeLocationCallback` CLM option. Deprecates `WithCodeLocation` option (although the latter function is still supported for compatibility with existing code). + * Added extended synthetics support for new `X-Newrelic-Synthetics-Info` HTTP headers. + * Documentation fixes. + * Removed deprecated `ROADMAP.md` file. + +### 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](/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.28.1 ### Added Added Supportability Metrics to `nrfasthttp` (brings `nrfasthttp` version to v1.0.1). @@ -1128,7 +1140,7 @@ feedback that you would like to pass along, please open up an issue [here](https://github.com/newrelic/go-agent/issues/new) and be sure to include the label `3.0`. * For normal (non-3.0) issues/questions we request that you report them via - our [support site](http://support.newrelic.com/) or our + our [support site](https://support.newrelic.com/) or our [community forum](https://discuss.newrelic.com). Please only report questions related to the 3.0 pre-release directly via GitHub. @@ -1162,7 +1174,7 @@ include: ### Bug Fixes * Fixed an issue in the - [`nrhttprouter`](http://godoc.org/github.com/newrelic/go-agent/_integrations/nrhttprouter) + [`nrhttprouter`](https://godoc.org/github.com/newrelic/go-agent/_integrations/nrhttprouter) integration where the transaction was not being added to the requests context. This resulted in an inability to access the transaction from within an @@ -1208,7 +1220,7 @@ package. // (see https://docs.newrelic.com/docs/understand-dependencies/distributed-tracing/enable-configure/enable-distributed-tracing) txn := currentTxn() - req, err := http.NewRequest("GET", "http://example.com", nil) + req, err := http.NewRequest("GET", "https://example.com", nil) if nil != err { log.Fatalln(err) } @@ -1384,9 +1396,9 @@ It can be configured as follows: ### New Features * Added support for [HttpRouter](https://github.com/julienschmidt/httprouter) in - the new [_integrations/nrhttprouter](http://godoc.org/github.com/newrelic/go-agent/_integrations/nrhttprouter) package. This package allows you to easily instrument inbound requests through the HttpRouter framework. + the new [_integrations/nrhttprouter](https://godoc.org/github.com/newrelic/go-agent/_integrations/nrhttprouter) package. This package allows you to easily instrument inbound requests through the HttpRouter framework. - * [Documentation](http://godoc.org/github.com/newrelic/go-agent/_integrations/nrhttprouter) + * [Documentation](https://godoc.org/github.com/newrelic/go-agent/_integrations/nrhttprouter) * [Example](_integrations/nrhttprouter/example/main.go) * Added support for [github.com/uber-go/zap](https://github.com/uber-go/zap) in @@ -1469,7 +1481,7 @@ package. This package supports instrumentation for servers, clients, publishers * Added support for creating static `WebRequest` instances manually via the `NewStaticWebRequest` function. This can be useful when you want to create a web transaction but don't have an `http.Request` object. Here's an example of creating a static `WebRequest` and using it to mark a transaction as a web transaction: ```go hdrs := http.Headers{} - u, _ := url.Parse("http://example.com") + u, _ := url.Parse("https://example.com") webReq := newrelic.NewStaticWebRequest(hdrs, u, "GET", newrelic.TransportHTTP) txn := app.StartTransaction("My-Transaction", nil, nil) txn.SetWebRequest(webReq) @@ -1701,8 +1713,8 @@ package. This package supports instrumentation for servers and clients. When using these SDKs, a segment will be created for each out going request. For DynamoDB calls, these will be Datastore segments and for all others they will be External segments. - * [v1 Documentation](http://godoc.org/github.com/newrelic/go-agent/_integrations/nrawssdk/v1) - * [v2 Documentation](http://godoc.org/github.com/newrelic/go-agent/_integrations/nrawssdk/v2) + * [v1 Documentation](https://godoc.org/github.com/newrelic/go-agent/_integrations/nrawssdk/v1) + * [v2 Documentation](https://godoc.org/github.com/newrelic/go-agent/_integrations/nrawssdk/v2) * Added span event and transaction trace segment attribute configuration. You may control which attributes are captured in span events and transaction trace @@ -1801,7 +1813,7 @@ txn.Application().RecordCustomEvent("customerOrder", map[string]interface{}{ * Added support for [Echo](https://echo.labstack.com) in the new `nrecho` package. - * [Documentation](http://godoc.org/github.com/newrelic/go-agent/_integrations/nrecho) + * [Documentation](https://godoc.org/github.com/newrelic/go-agent/_integrations/nrecho) * [Example](_integrations/nrecho/example/main.go) * Introduced `Transaction.SetWebResponse(http.ResponseWriter)` method which sets @@ -1864,7 +1876,7 @@ transactions. Example use: ```go client := &http.Client{} client.Transport = newrelic.NewRoundTripper(nil, client.Transport) -request, _ := http.NewRequest("GET", "http://example.com", nil) +request, _ := http.NewRequest("GET", "https://example.com", nil) request = newrelic.RequestWithTransactionContext(request, txn) resp, err := client.Do(request) ``` @@ -2027,7 +2039,7 @@ txn.NoticeError(newrelic.Error{ * Added support for [github.com/gin-gonic/gin](https://github.com/gin-gonic/gin) in the new `nrgin` package. - * [Documentation](http://godoc.org/github.com/newrelic/go-agent/_integrations/nrgin/v1) + * [Documentation](https://godoc.org/github.com/newrelic/go-agent/_integrations/nrgin/v1) * [Example](examples/_gin/main.go) ## 1.8.0 @@ -2040,9 +2052,9 @@ txn.NoticeError(newrelic.Error{ ## 1.7.0 -* Added support for [gorilla/mux](http://github.com/gorilla/mux) in the new `nrgorilla` +* Added support for [gorilla/mux](https://github.com/gorilla/mux) in the new `nrgorilla` package. - * [Documentation](http://godoc.org/github.com/newrelic/go-agent/_integrations/nrgorilla/v1) + * [Documentation](https://godoc.org/github.com/newrelic/go-agent/_integrations/nrgorilla/v1) * [Example](examples/_gorilla/main.go) ## 1.6.0 diff --git a/GUIDE.md b/GUIDE.md index e20d4777d..3813a1c1b 100644 --- a/GUIDE.md +++ b/GUIDE.md @@ -127,7 +127,7 @@ app, err := newrelic.NewApplication( To log at info level to a file, set: ```go -w, err := os.OpenFile("my_log_file", os.O_CREATE|os.O_APPEND|os.O_WRONLY, 0644) +w, err := os.OpenFile("my_log_file", os.O_CREATE|os.O_APPEND|os.O_WRONLY, 0600) if nil == err { app, _ := newrelic.NewApplication( newrelic.ConfigAppName("Your Application Name"), @@ -400,7 +400,7 @@ ways to use this functionality: ```go client := &http.Client{} client.Transport = newrelic.NewRoundTripper(client.Transport) - request, _ := http.NewRequest("GET", "http://example.com", nil) + request, _ := http.NewRequest("GET", "https://example.com", nil) // Put transaction in the request's context: request = newrelic.RequestWithTransactionContext(request, txn) resp, err := client.Do(request) diff --git a/MIGRATION.md b/MIGRATION.md index 1b74019d1..b3368c123 100644 --- a/MIGRATION.md +++ b/MIGRATION.md @@ -455,7 +455,7 @@ var _ newrelic.ErrorAttributer = MyErrorType{} ```go client := &http.Client{} client.Transport = newrelic.NewRoundTripper(txn, client.Transport) - req, _ := http.NewRequest("GET", "http://example.com", nil) + req, _ := http.NewRequest("GET", "https://example.com", nil) client.Do(req) ``` diff --git a/ROADMAP.md b/ROADMAP.md deleted file mode 100644 index bf21381e1..000000000 --- a/ROADMAP.md +++ /dev/null @@ -1,26 +0,0 @@ -# Go Agent Roadmap - -## Product Vision -The goal of the Go agent is to provide complete visibility into the health of your service. The agent provides metrics about the runtime health of your service and the process it runs in, and traces that show how specific requests are performing. It also provides information about the environment in which it is running, so you can identify issues with specific hosts, regions, deployments, and other facets. - -New Relic is moving toward OpenTelemetry. OpenTelemetry is a unified standard for service instrumentation. You can use our [OpenTelemetry Exporter](https://github.com/newrelic/opentelemetry-exporter-go) today, and will soon see a shim will convert New Relic Go Agent data to OpenTelemetry. OpenTelemetry will include a broad set of high-quality community-contributed instrumentation and a powerful vendor-neutral API for adding your own instrumentation. - - -## Roadmap -**The Go instrumentation roadmap project is found [here](https://github.com/orgs/newrelic/projects/24)**. - -This roadmap project is broken down into the following sections: - -- **Done**: - - This section contains features that were recently completed. -- **Now**: - - This section contains features that are currently in progress. -- **Next**: - - This section contains work planned within the next three months. These features may still be de-prioritized and moved to Future. -- **Future**: - - This section is for ideas for future work that is aligned with the product vision and possible opportunities for community contribution. It contains a list of features that anyone can implement. No guarantees can be provided on if or when these features will be completed. - - - -### Disclaimers -This roadmap is subject to change at any time. Future items should not be considered commitments. diff --git a/v3/examples/server/main.go b/v3/examples/server/main.go index c012e349b..856ed6cfc 100644 --- a/v3/examples/server/main.go +++ b/v3/examples/server/main.go @@ -159,7 +159,7 @@ func message(w http.ResponseWriter, r *http.Request) { func external(w http.ResponseWriter, r *http.Request) { txn := newrelic.FromContext(r.Context()) - req, _ := http.NewRequest("GET", "http://example.com", nil) + req, _ := http.NewRequest("GET", "https://example.com", nil) // Using StartExternalSegment is recommended because it does distributed // tracing header setup, but if you don't have an *http.Request and @@ -193,7 +193,7 @@ func roundtripper(w http.ResponseWriter, r *http.Request) { client := &http.Client{} client.Transport = newrelic.NewRoundTripper(client.Transport) - request, _ := http.NewRequest("GET", "http://example.com", nil) + request, _ := http.NewRequest("GET", "https://example.com", nil) // Since the transaction is already added to the inbound request's // context by WrapHandleFunc, we just need to copy the context from the // inbound request to the external request. diff --git a/v3/integrations/logcontext-v2/logWriter/go.mod b/v3/integrations/logcontext-v2/logWriter/go.mod index 214b032e2..8d5034bb7 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.28.1 + github.com/newrelic/go-agent/v3 v3.29.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 f5b6977c5..1baca3fb9 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.28.1 + github.com/newrelic/go-agent/v3 v3.29.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 4f3003f68..b701a55a4 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.28.1 +require github.com/newrelic/go-agent/v3 v3.29.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 178cc204a..7f7a3f466 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.28.1 + github.com/newrelic/go-agent/v3 v3.29.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 1c42aad04..1fba1fe6f 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.28.1 + github.com/newrelic/go-agent/v3 v3.29.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 8fd5bbc83..af56d3300 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.28.1 + github.com/newrelic/go-agent/v3 v3.29.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 c650a5c85..2a69317ca 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.28.1 + github.com/newrelic/go-agent/v3 v3.29.0 // v1.4.0 is required for for the log.WithContext. github.com/sirupsen/logrus v1.4.0 ) diff --git a/v3/integrations/nramqp/go.mod b/v3/integrations/nramqp/go.mod index a8546b821..fa6049ed2 100644 --- a/v3/integrations/nramqp/go.mod +++ b/v3/integrations/nramqp/go.mod @@ -3,7 +3,7 @@ module github.com/newrelic/go-agent/v3/integrations/nramqp go 1.19 require ( - github.com/newrelic/go-agent/v3 v3.28.1 + github.com/newrelic/go-agent/v3 v3.29.0 github.com/rabbitmq/amqp091-go v1.9.0 ) replace github.com/newrelic/go-agent/v3 => ../.. diff --git a/v3/integrations/nrawssdk-v1/go.mod b/v3/integrations/nrawssdk-v1/go.mod index 905961ca5..bd5c735c3 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.28.1 + github.com/newrelic/go-agent/v3 v3.29.0 ) diff --git a/v3/integrations/nrawssdk-v2/go.mod b/v3/integrations/nrawssdk-v2/go.mod index ab91cb896..abf08dbaf 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.28.1 + github.com/newrelic/go-agent/v3 v3.29.0 ) diff --git a/v3/integrations/nrb3/go.mod b/v3/integrations/nrb3/go.mod index c6f90dff0..449b727d5 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.28.1 +require github.com/newrelic/go-agent/v3 v3.29.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 53be4654e..a99898545 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.28.1 + github.com/newrelic/go-agent/v3 v3.29.0 ) diff --git a/v3/integrations/nrecho-v4/go.mod b/v3/integrations/nrecho-v4/go.mod index 44bc0bb9c..5a4187a9c 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.28.1 + github.com/newrelic/go-agent/v3 v3.29.0 ) diff --git a/v3/integrations/nrelasticsearch-v7/go.mod b/v3/integrations/nrelasticsearch-v7/go.mod index be403fdf7..dd57e78dd 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.28.1 + github.com/newrelic/go-agent/v3 v3.29.0 ) diff --git a/v3/integrations/nrfasthttp/examples/client-fasthttp/go.mod b/v3/integrations/nrfasthttp/examples/client-fasthttp/go.mod index 20d149c3e..e79b77a6f 100644 --- a/v3/integrations/nrfasthttp/examples/client-fasthttp/go.mod +++ b/v3/integrations/nrfasthttp/examples/client-fasthttp/go.mod @@ -3,7 +3,7 @@ module client-example go 1.19 require ( - github.com/newrelic/go-agent/v3 v3.28.1 + github.com/newrelic/go-agent/v3 v3.29.0 github.com/newrelic/go-agent/v3/integrations/nrfasthttp v1.0.0 github.com/valyala/fasthttp v1.49.0 ) diff --git a/v3/integrations/nrfasthttp/examples/server-fasthttp/go.mod b/v3/integrations/nrfasthttp/examples/server-fasthttp/go.mod index ae1d50411..e73b032a8 100644 --- a/v3/integrations/nrfasthttp/examples/server-fasthttp/go.mod +++ b/v3/integrations/nrfasthttp/examples/server-fasthttp/go.mod @@ -3,7 +3,7 @@ module server-example go 1.19 require ( - github.com/newrelic/go-agent/v3 v3.28.1 + github.com/newrelic/go-agent/v3 v3.29.0 github.com/newrelic/go-agent/v3/integrations/nrfasthttp v1.0.0 github.com/valyala/fasthttp v1.49.0 ) diff --git a/v3/integrations/nrfasthttp/go.mod b/v3/integrations/nrfasthttp/go.mod index af82630a3..8ceeba214 100644 --- a/v3/integrations/nrfasthttp/go.mod +++ b/v3/integrations/nrfasthttp/go.mod @@ -3,6 +3,7 @@ module github.com/newrelic/go-agent/v3/integrations/nrfasthttp go 1.19 require ( - github.com/newrelic/go-agent/v3 v3.28.1 + github.com/newrelic/go-agent/v3 v3.29.0 github.com/valyala/fasthttp v1.49.0 ) +replace github.com/newrelic/go-agent/v3 => ../.. diff --git a/v3/integrations/nrgin/go.mod b/v3/integrations/nrgin/go.mod index 561f0f43d..ff78e2e91 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.28.1 + github.com/newrelic/go-agent/v3 v3.29.0 ) diff --git a/v3/integrations/nrgorilla/go.mod b/v3/integrations/nrgorilla/go.mod index 4a70c63e9..edcd838f9 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.28.1 + github.com/newrelic/go-agent/v3 v3.29.0 ) diff --git a/v3/integrations/nrgraphgophers/go.mod b/v3/integrations/nrgraphgophers/go.mod index 7ca579c3c..3f0320e48 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.28.1 + github.com/newrelic/go-agent/v3 v3.29.0 ) diff --git a/v3/integrations/nrgraphqlgo/example/go.mod b/v3/integrations/nrgraphqlgo/example/go.mod index b50183e43..a8857df20 100644 --- a/v3/integrations/nrgraphqlgo/example/go.mod +++ b/v3/integrations/nrgraphqlgo/example/go.mod @@ -5,7 +5,7 @@ go 1.19 require ( github.com/graphql-go/graphql v0.8.1 github.com/graphql-go/graphql-go-handler v0.2.3 - github.com/newrelic/go-agent/v3 v3.28.1 + github.com/newrelic/go-agent/v3 v3.29.0 github.com/newrelic/go-agent/v3/integrations/nrgraphqlgo v1.0.0 ) diff --git a/v3/integrations/nrgraphqlgo/go.mod b/v3/integrations/nrgraphqlgo/go.mod index f953df2e9..150f95c65 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.8.1 - github.com/newrelic/go-agent/v3 v3.28.1 + github.com/newrelic/go-agent/v3 v3.29.0 ) diff --git a/v3/integrations/nrgrpc/go.mod b/v3/integrations/nrgrpc/go.mod index 95611af41..e7ffc254e 100644 --- a/v3/integrations/nrgrpc/go.mod +++ b/v3/integrations/nrgrpc/go.mod @@ -6,13 +6,14 @@ 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.28.1 + github.com/newrelic/go-agent/v3 v3.29.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.56.3 google.golang.org/protobuf v1.30.0 ) -replace github.com/newrelic/go-agent/v3 => ../.. + replace github.com/newrelic/go-agent/v3/integrations/nrsecurityagent => ../../integrations/nrsecurityagent +replace github.com/newrelic/go-agent/v3 => ../.. diff --git a/v3/integrations/nrhttprouter/go.mod b/v3/integrations/nrhttprouter/go.mod index 67fa9ed59..9c90605b8 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.28.1 + github.com/newrelic/go-agent/v3 v3.29.0 ) diff --git a/v3/integrations/nrlambda/go.mod b/v3/integrations/nrlambda/go.mod index caaf942e0..f35e2129b 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.28.1 + github.com/newrelic/go-agent/v3 v3.29.0 ) diff --git a/v3/integrations/nrlogrus/go.mod b/v3/integrations/nrlogrus/go.mod index 6ffdefe1e..d32b04d62 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.28.1 + github.com/newrelic/go-agent/v3 v3.29.0 github.com/newrelic/go-agent/v3/integrations/logcontext-v2/nrlogrus v1.0.0 // v1.1.0 is required for the Logger.GetLevel method, and is the earliest // version of logrus using modules. diff --git a/v3/integrations/nrlogxi/go.mod b/v3/integrations/nrlogxi/go.mod index 1e616823c..3e77dc57a 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.28.1 + github.com/newrelic/go-agent/v3 v3.29.0 ) diff --git a/v3/integrations/nrmicro/go.mod b/v3/integrations/nrmicro/go.mod index fda594e34..858eacc21 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.28.1 + github.com/newrelic/go-agent/v3 v3.29.0 google.golang.org/protobuf v1.31.0 ) diff --git a/v3/integrations/nrmongo/go.mod b/v3/integrations/nrmongo/go.mod index 1d160f728..9722c5b61 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.28.1 + github.com/newrelic/go-agent/v3 v3.29.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 e333594be..93b23230b 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.28.1 + github.com/newrelic/go-agent/v3 v3.29.0 ) diff --git a/v3/integrations/nrmysql/go.mod b/v3/integrations/nrmysql/go.mod index bcff44a48..4802182fe 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.28.1 + github.com/newrelic/go-agent/v3 v3.29.0 ) diff --git a/v3/integrations/nrnats/go.mod b/v3/integrations/nrnats/go.mod index 5353a14c5..915559ac1 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.28.1 + github.com/newrelic/go-agent/v3 v3.29.0 ) diff --git a/v3/integrations/nrnats/test/go.mod b/v3/integrations/nrnats/test/go.mod index 4f0374419..ee109042d 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.28.1 + github.com/newrelic/go-agent/v3 v3.29.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 201d17a88..1c9f06b85 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.28.1 + github.com/newrelic/go-agent/v3 v3.29.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 d2abbb24c..a572b3d3c 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.28.1 + github.com/newrelic/go-agent/v3 v3.29.0 ) diff --git a/v3/integrations/nrpgx5/go.mod b/v3/integrations/nrpgx5/go.mod index f77d380a6..d08534f2b 100644 --- a/v3/integrations/nrpgx5/go.mod +++ b/v3/integrations/nrpgx5/go.mod @@ -5,7 +5,7 @@ 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.28.1 + github.com/newrelic/go-agent/v3 v3.29.0 github.com/stretchr/testify v1.8.0 ) diff --git a/v3/integrations/nrpkgerrors/go.mod b/v3/integrations/nrpkgerrors/go.mod index 731c91ec0..e2c9255a9 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.28.1 + github.com/newrelic/go-agent/v3 v3.29.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 80079a086..3a9092fe9 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.28.1 + github.com/newrelic/go-agent/v3 v3.29.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 0d336ec7b..75dc70749 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.28.1 + github.com/newrelic/go-agent/v3 v3.29.0 ) diff --git a/v3/integrations/nrredis-v7/go.mod b/v3/integrations/nrredis-v7/go.mod index b59fa2752..a5ef1349a 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.28.1 + github.com/newrelic/go-agent/v3 v3.29.0 ) diff --git a/v3/integrations/nrredis-v8/go.mod b/v3/integrations/nrredis-v8/go.mod index a10699607..b038e14de 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.28.1 + github.com/newrelic/go-agent/v3 v3.29.0 ) diff --git a/v3/integrations/nrredis-v9/go.mod b/v3/integrations/nrredis-v9/go.mod index cee95494d..ba8c2d2f0 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.28.1 + github.com/newrelic/go-agent/v3 v3.29.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 99e463697..854d87a72 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.28.1 + github.com/newrelic/go-agent/v3 v3.29.0 github.com/stretchr/testify v1.8.1 ) diff --git a/v3/integrations/nrsecurityagent/go.mod b/v3/integrations/nrsecurityagent/go.mod index a415d6b2f..ececdbd1a 100644 --- a/v3/integrations/nrsecurityagent/go.mod +++ b/v3/integrations/nrsecurityagent/go.mod @@ -4,9 +4,10 @@ go 1.19 require ( github.com/newrelic/csec-go-agent v0.5.1 - github.com/newrelic/go-agent/v3 v3.28.1 + github.com/newrelic/go-agent/v3 v3.29.0 github.com/newrelic/go-agent/v3/integrations/nrsqlite3 v1.2.0 gopkg.in/yaml.v2 v2.4.0 ) + replace github.com/newrelic/go-agent/v3 => ../.. diff --git a/v3/integrations/nrsecurityagent/nrsecurityagent.go b/v3/integrations/nrsecurityagent/nrsecurityagent.go index bb21f6765..3dedd4c41 100644 --- a/v3/integrations/nrsecurityagent/nrsecurityagent.go +++ b/v3/integrations/nrsecurityagent/nrsecurityagent.go @@ -65,6 +65,7 @@ func InitSecurityAgent(app *newrelic.Application, opts ...ConfigOption) error { if !isValid { return fmt.Errorf("Newrelic application value cannot be read; did you call newrelic.NewApplication?") } + app.UpdateSecurityConfig(c.Security) if !appConfig.HighSecurity && isSecurityAgentEnabled() { secureAgent := securityAgent.InitSecurityAgent(c.Security, appConfig.AppName, appConfig.License, appConfig.Logger.DebugEnabled()) app.RegisterSecurityAgent(secureAgent) diff --git a/v3/integrations/nrsnowflake/go.mod b/v3/integrations/nrsnowflake/go.mod index b458fbad5..30a381b61 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.28.1 + github.com/newrelic/go-agent/v3 v3.29.0 github.com/snowflakedb/gosnowflake v1.6.19 ) diff --git a/v3/integrations/nrsqlite3/go.mod b/v3/integrations/nrsqlite3/go.mod index dd443a584..eb3d1ee5f 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.28.1 + github.com/newrelic/go-agent/v3 v3.29.0 ) diff --git a/v3/integrations/nrstan/examples/go.mod b/v3/integrations/nrstan/examples/go.mod index 62ea0ae81..0cc4db9f0 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.28.1 + github.com/newrelic/go-agent/v3 v3.29.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 7c18fa067..fc2c4f3e6 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.28.1 + github.com/newrelic/go-agent/v3 v3.29.0 ) diff --git a/v3/integrations/nrstan/test/go.mod b/v3/integrations/nrstan/test/go.mod index 6921303fe..264d9af9d 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.25.6 github.com/nats-io/stan.go v0.10.4 - github.com/newrelic/go-agent/v3 v3.28.1 + github.com/newrelic/go-agent/v3 v3.29.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 840a344c6..e8bf50c28 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.28.1 + github.com/newrelic/go-agent/v3 v3.29.0 // v1.12.0 is the earliest version of zap using modules. go.uber.org/zap v1.12.0 ) diff --git a/v3/internal/cat/headers.go b/v3/internal/cat/headers.go index 6ca05cd67..c08fec28c 100644 --- a/v3/internal/cat/headers.go +++ b/v3/internal/cat/headers.go @@ -13,4 +13,5 @@ const ( NewRelicTxnName = "X-Newrelic-Transaction" NewRelicAppDataName = "X-Newrelic-App-Data" NewRelicSyntheticsName = "X-Newrelic-Synthetics" + NewRelicSyntheticsInfo = "X-Newrelic-Synthetics-Info" ) diff --git a/v3/internal/cat/synthetics.go b/v3/internal/cat/synthetics.go index b88c15476..59974f0a2 100644 --- a/v3/internal/cat/synthetics.go +++ b/v3/internal/cat/synthetics.go @@ -18,13 +18,30 @@ type SyntheticsHeader struct { MonitorID string } +// SyntheticsInfo represents a decoded synthetics info payload. +type SyntheticsInfo struct { + Version int + Type string + Initiator string + Attributes map[string]string +} + var ( - errInvalidSyntheticsJSON = errors.New("invalid synthetics JSON") - errInvalidSyntheticsVersion = errors.New("version is not a float64") - errInvalidSyntheticsAccountID = errors.New("account ID is not a float64") - errInvalidSyntheticsResourceID = errors.New("synthetics resource ID is not a string") - errInvalidSyntheticsJobID = errors.New("synthetics job ID is not a string") - errInvalidSyntheticsMonitorID = errors.New("synthetics monitor ID is not a string") + errInvalidSyntheticsJSON = errors.New("invalid synthetics JSON") + errInvalidSyntheticsInfoJSON = errors.New("invalid synthetics info JSON") + errInvalidSyntheticsVersion = errors.New("version is not a float64") + errInvalidSyntheticsAccountID = errors.New("account ID is not a float64") + errInvalidSyntheticsResourceID = errors.New("synthetics resource ID is not a string") + errInvalidSyntheticsJobID = errors.New("synthetics job ID is not a string") + errInvalidSyntheticsMonitorID = errors.New("synthetics monitor ID is not a string") + errInvalidSyntheticsInfoVersion = errors.New("synthetics info version is not a float64") + errMissingSyntheticsInfoVersion = errors.New("synthetics info version is missing from JSON object") + errInvalidSyntheticsInfoType = errors.New("synthetics info type is not a string") + errMissingSyntheticsInfoType = errors.New("synthetics info type is missing from JSON object") + errInvalidSyntheticsInfoInitiator = errors.New("synthetics info initiator is not a string") + errMissingSyntheticsInfoInitiator = errors.New("synthetics info initiator is missing from JSON object") + errInvalidSyntheticsInfoAttributes = errors.New("synthetics info attributes is not a map") + errInvalidSyntheticsInfoAttributeVal = errors.New("synthetics info keys and values must be strings") ) type errUnexpectedSyntheticsVersion int @@ -83,3 +100,80 @@ func (s *SyntheticsHeader) UnmarshalJSON(data []byte) error { return nil } + +const ( + versionKey = "version" + typeKey = "type" + initiatorKey = "initiator" + attributesKey = "attributes" +) + +// UnmarshalJSON unmarshalls a SyntheticsInfo from raw JSON. +func (s *SyntheticsInfo) UnmarshalJSON(data []byte) error { + var v any + + if err := json.Unmarshal(data, &v); err != nil { + return err + } + + m, ok := v.(map[string]any) + if !ok { + return errInvalidSyntheticsInfoJSON + } + + version, ok := m[versionKey] + if !ok { + return errMissingSyntheticsInfoVersion + } + + versionFloat, ok := version.(float64) + if !ok { + return errInvalidSyntheticsInfoVersion + } + + s.Version = int(versionFloat) + if s.Version != 1 { + return errUnexpectedSyntheticsVersion(s.Version) + } + + infoType, ok := m[typeKey] + if !ok { + return errMissingSyntheticsInfoType + } + + s.Type, ok = infoType.(string) + if !ok { + return errInvalidSyntheticsInfoType + } + + initiator, ok := m[initiatorKey] + if !ok { + return errMissingSyntheticsInfoInitiator + } + + s.Initiator, ok = initiator.(string) + if !ok { + return errInvalidSyntheticsInfoInitiator + } + + attrs, ok := m[attributesKey] + if ok { + attrMap, ok := attrs.(map[string]any) + if !ok { + return errInvalidSyntheticsInfoAttributes + } + for k, v := range attrMap { + val, ok := v.(string) + if !ok { + return errInvalidSyntheticsInfoAttributeVal + } + if s.Attributes == nil { + s.Attributes = map[string]string{k: val} + } else { + s.Attributes[k] = val + } + } + } + + return nil +} diff --git a/v3/internal/cat/synthetics_test.go b/v3/internal/cat/synthetics_test.go index 120d1f53c..b20b01f94 100644 --- a/v3/internal/cat/synthetics_test.go +++ b/v3/internal/cat/synthetics_test.go @@ -5,6 +5,7 @@ package cat import ( "encoding/json" + "fmt" "testing" ) @@ -118,3 +119,129 @@ func TestSyntheticsUnmarshalValid(t *testing.T) { } } } + +func TestSyntheticsInfoUnmarshal(t *testing.T) { + type testCase struct { + name string + json string + syntheticsInfo SyntheticsInfo + expectedError error + } + + testCases := []testCase{ + { + name: "missing type field", + json: `{"version":1,"initiator":"cli"}`, + syntheticsInfo: SyntheticsInfo{}, + expectedError: errMissingSyntheticsInfoType, + }, + { + name: "invalid type field", + json: `{"version":1,"initiator":"cli","type":1}`, + syntheticsInfo: SyntheticsInfo{}, + expectedError: errInvalidSyntheticsInfoType, + }, + { + name: "missing initiator field", + json: `{"version":1,"type":"scheduled"}`, + syntheticsInfo: SyntheticsInfo{}, + expectedError: errMissingSyntheticsInfoInitiator, + }, + { + name: "invalid initiator field", + json: `{"version":1,"initiator":1,"type":"scheduled"}`, + syntheticsInfo: SyntheticsInfo{}, + expectedError: errInvalidSyntheticsInfoInitiator, + }, + { + name: "missing version field", + json: `{"type":"scheduled"}`, + syntheticsInfo: SyntheticsInfo{}, + expectedError: errMissingSyntheticsInfoVersion, + }, + { + name: "invalid version field", + json: `{"version":"1","initiator":"cli","type":"scheduled"}`, + syntheticsInfo: SyntheticsInfo{}, + expectedError: errInvalidSyntheticsInfoVersion, + }, + { + name: "valid synthetics info", + json: `{"version":1,"type":"scheduled","initiator":"cli"}`, + syntheticsInfo: SyntheticsInfo{ + Version: 1, + Type: "scheduled", + Initiator: "cli", + }, + expectedError: nil, + }, + { + name: "valid synthetics info with attributes", + json: `{"version":1,"type":"scheduled","initiator":"cli","attributes":{"hi":"hello"}}`, + syntheticsInfo: SyntheticsInfo{ + Version: 1, + Type: "scheduled", + Initiator: "cli", + Attributes: map[string]string{"hi": "hello"}, + }, + expectedError: nil, + }, + { + name: "valid synthetics info with invalid attributes", + json: `{"version":1,"type":"scheduled","initiator":"cli","attributes":{"hi":1}}`, + syntheticsInfo: SyntheticsInfo{ + Version: 1, + Type: "scheduled", + Initiator: "cli", + Attributes: nil, + }, + expectedError: errInvalidSyntheticsInfoAttributeVal, + }, + } + + for _, testCase := range testCases { + syntheticsInfo := SyntheticsInfo{} + err := syntheticsInfo.UnmarshalJSON([]byte(testCase.json)) + if testCase.expectedError == nil { + if err != nil { + recordError(t, testCase.name, fmt.Sprintf("expected synthetics info to unmarshal without error, but got error: %v", err)) + } + + expect := testCase.syntheticsInfo + if expect.Version != syntheticsInfo.Version { + recordError(t, testCase.name, fmt.Sprintf(`expected version "%d", but got "%d"`, expect.Version, syntheticsInfo.Version)) + } + + if expect.Type != syntheticsInfo.Type { + recordError(t, testCase.name, fmt.Sprintf(`expected version "%s", but got "%s"`, expect.Type, syntheticsInfo.Type)) + } + + if expect.Initiator != syntheticsInfo.Initiator { + recordError(t, testCase.name, fmt.Sprintf(`expected version "%s", but got "%s"`, expect.Initiator, syntheticsInfo.Initiator)) + } + + if len(expect.Attributes) != 0 { + if len(syntheticsInfo.Attributes) == 0 { + recordError(t, testCase.name, fmt.Sprintf(`expected attribute array to have %d elements, but it only had %d`, len(expect.Attributes), len(syntheticsInfo.Attributes))) + } + for ek, ev := range expect.Attributes { + v, ok := syntheticsInfo.Attributes[ek] + if !ok { + recordError(t, testCase.name, fmt.Sprintf(`expected attributes to contain key "%s", but it did not`, ek)) + } + if ev != v { + recordError(t, testCase.name, fmt.Sprintf(`expected attributes to contain "%s":"%s", but it contained "%s":"%s"`, ek, ev, ek, v)) + } + } + } + } else { + if err != testCase.expectedError { + recordError(t, testCase.name, fmt.Sprintf(`expected synthetics info to unmarshal with error "%v", but got "%v"`, testCase.expectedError, err)) + } + } + } +} + +func recordError(t *testing.T, test, err string) { + t.Errorf("%s: %s", test, err) +} diff --git a/v3/newrelic/code_level_metrics.go b/v3/newrelic/code_level_metrics.go index 561435e54..7fb9b4399 100644 --- a/v3/newrelic/code_level_metrics.go +++ b/v3/newrelic/code_level_metrics.go @@ -90,6 +90,7 @@ type traceOptSet struct { DemandCLM bool IgnoredPrefixes []string PathPrefixes []string + LocationCallback func() *CodeLocation } // @@ -106,12 +107,37 @@ type TraceOption func(*traceOptSet) // This is probably a value previously obtained by calling // ThisCodeLocation(). // +// Deprecated: This function requires the caller to do the work +// up-front to calculate the code location, which may be a waste +// of effort if code level metrics happens to be disabled. Instead, +// use the WithCodeLocationCallback function. +// func WithCodeLocation(loc *CodeLocation) TraceOption { return func(o *traceOptSet) { o.LocationOverride = loc } } +// +// WithCodeLocationCallback adds a callback function which the agent +// will call if it needs to report the code location with an explicit +// value provided by the caller. This will only be called if code +// level metrics is enabled, saving unnecessary work if those metrics +// are not enabled. +// +// If the callback function value passed here is nil, then no callback +// function will be used (same as if this function were never called). +// If the callback function itself returns nil instead of a pointer to +// a CodeLocation, then it is assumed the callback function was not able +// to determine the code location, and the CLM reporting code's normal +// method for determining the code location is used instead. +// +func WithCodeLocationCallback(locf func() *CodeLocation) TraceOption { + return func(o *traceOptSet) { + o.LocationCallback = locf + } +} + // // WithIgnoredPrefix indicates that the code location reported // for Code Level Metrics should be the first function in the @@ -385,6 +411,9 @@ func withPreparedOptions(newOptions *traceOptSet) TraceOption { if newOptions.LocationOverride != nil { o.LocationOverride = newOptions.LocationOverride } + if newOptions.LocationCallback != nil { + o.LocationCallback = newOptions.LocationCallback + } o.SuppressCLM = newOptions.SuppressCLM o.DemandCLM = newOptions.DemandCLM if newOptions.IgnoredPrefixes != nil { @@ -542,9 +571,16 @@ func resolveCLMTraceOptions(options []TraceOption) *traceOptSet { func reportCodeLevelMetrics(tOpts traceOptSet, run *appRun, setAttr func(string, string, interface{})) { var location CodeLocation + var locationp *CodeLocation + + if tOpts.LocationCallback != nil { + locationp = tOpts.LocationCallback() + } else { + locationp = tOpts.LocationOverride + } - if tOpts.LocationOverride != nil { - location = *tOpts.LocationOverride + if locationp != nil { + location = *locationp } else { pcs := make([]uintptr, 20) depth := runtime.Callers(2, pcs) diff --git a/v3/newrelic/config.go b/v3/newrelic/config.go index 69f324a4e..5d79bf8fa 100644 --- a/v3/newrelic/config.go +++ b/v3/newrelic/config.go @@ -448,6 +448,8 @@ type Config struct { // This list of ignored prefixes itself is not reported outside the agent. IgnoredPrefixes []string } + // Security is used to post security configuration on UI. + Security interface{} `json:"Security,omitempty"` } // CodeLevelMetricsScope is a bit-encoded value. Each such value describes diff --git a/v3/newrelic/cross_process_http.go b/v3/newrelic/cross_process_http.go index b05d3267f..050bff1f6 100644 --- a/v3/newrelic/cross_process_http.go +++ b/v3/newrelic/cross_process_http.go @@ -43,9 +43,10 @@ func httpHeaderToMetadata(header http.Header) crossProcessMetadata { } return crossProcessMetadata{ - ID: header.Get(cat.NewRelicIDName), - TxnData: header.Get(cat.NewRelicTxnName), - Synthetics: header.Get(cat.NewRelicSyntheticsName), + ID: header.Get(cat.NewRelicIDName), + TxnData: header.Get(cat.NewRelicTxnName), + Synthetics: header.Get(cat.NewRelicSyntheticsName), + SyntheticsInfo: header.Get(cat.NewRelicSyntheticsInfo), } } @@ -64,6 +65,11 @@ func metadataToHTTPHeader(metadata crossProcessMetadata) http.Header { if metadata.Synthetics != "" { header.Add(cat.NewRelicSyntheticsName, metadata.Synthetics) + + // This header will only be present when the `X-NewRelic-Synthetics` header is present + if metadata.SyntheticsInfo != "" { + header.Add(cat.NewRelicSyntheticsInfo, metadata.SyntheticsInfo) + } } return header diff --git a/v3/newrelic/examples_test.go b/v3/newrelic/examples_test.go index f553eeea6..96458486a 100644 --- a/v3/newrelic/examples_test.go +++ b/v3/newrelic/examples_test.go @@ -81,7 +81,7 @@ func ExampleNewRoundTripper() { // requests done by this client with external segments. client.Transport = newrelic.NewRoundTripper(client.Transport) - request, _ := http.NewRequest("GET", "http://example.com", nil) + request, _ := http.NewRequest("GET", "https://example.com", nil) // Be sure to add the current Transaction to each request's context so // the Transport has access to it. @@ -160,7 +160,7 @@ func ExampleError() { func ExampleExternalSegment() { txn := currentTransaction() client := &http.Client{} - request, _ := http.NewRequest("GET", "http://www.example.com", nil) + request, _ := http.NewRequest("GET", "https://www.example.com", nil) segment := newrelic.StartExternalSegment(txn, request) response, _ := client.Do(request) segment.Response = response @@ -186,7 +186,7 @@ func ExampleExternalSegment_url() { func ExampleStartExternalSegment() { txn := currentTransaction() client := &http.Client{} - request, _ := http.NewRequest("GET", "http://www.example.com", nil) + request, _ := http.NewRequest("GET", "https://www.example.com", nil) segment := newrelic.StartExternalSegment(txn, request) response, _ := client.Do(request) segment.Response = response @@ -195,7 +195,7 @@ func ExampleStartExternalSegment() { func ExampleStartExternalSegment_context() { txn := currentTransaction() - request, _ := http.NewRequest("GET", "http://www.example.com", nil) + request, _ := http.NewRequest("GET", "https://www.example.com", nil) // If the transaction is added to the request's context then it does not // need to be provided as a parameter to StartExternalSegment. @@ -214,7 +214,7 @@ func doSendRequest(*http.Request) int { return 418 } // http.Response and still want to record the response status code. func ExampleExternalSegment_SetStatusCode() { txn := currentTransaction() - request, _ := http.NewRequest("GET", "http://www.example.com", nil) + request, _ := http.NewRequest("GET", "https://www.example.com", nil) segment := newrelic.StartExternalSegment(txn, request) statusCode := doSendRequest(request) segment.SetStatusCode(statusCode) @@ -234,7 +234,7 @@ func ExampleTransaction_SetWebRequest() { func ExampleTransaction_SetWebRequestHTTP() { app := getApp() - inboundRequest, _ := http.NewRequest("GET", "http://example.com", nil) + inboundRequest, _ := http.NewRequest("GET", "https://example.com", nil) txn := app.StartTransaction("My-Transaction") // Mark transaction as a web transaction, record attributes based on the // inbound request, and read any available distributed tracing headers. diff --git a/v3/newrelic/secure_agent.go b/v3/newrelic/secure_agent.go index c7f546a80..6c0057c10 100644 --- a/v3/newrelic/secure_agent.go +++ b/v3/newrelic/secure_agent.go @@ -46,6 +46,13 @@ func (app *Application) RegisterSecurityAgent(s securityAgent) { } } +func (app *Application) UpdateSecurityConfig(s interface{}) { + if app == nil || app.app == nil { + return + } + app.app.config.Config.Security = s +} + func getLinkedMetaData(app *app) map[string]string { runningAppData := make(map[string]string) if app != nil && app.run != nil { diff --git a/v3/newrelic/txn_cross_process.go b/v3/newrelic/txn_cross_process.go index ad14237ef..f6ed3eed4 100644 --- a/v3/newrelic/txn_cross_process.go +++ b/v3/newrelic/txn_cross_process.go @@ -53,19 +53,26 @@ type txnCrossProcess struct { ReferringPathHash string ReferringTxnGUID string Synthetics *cat.SyntheticsHeader + SyntheticsInfo *cat.SyntheticsInfo // The encoded synthetics header received as part of the request headers, if // any. By storing this here, we avoid needing to marshal the invariant // Synthetics struct above each time an external segment is created. SyntheticsHeader string + + // The encoded synthetics info header received as part of the request headers, if + // any. By storing this here, we avoid needing to marshal the invariant + // Synthetics struct above each time an external segment is created. + SyntheticsInfoHeader string } // crossProcessMetadata represents the metadata that must be transmitted with // an external request for CAT to work. type crossProcessMetadata struct { - ID string - TxnData string - Synthetics string + ID string + TxnData string + Synthetics string + SyntheticsInfo string } // Init initialises a txnCrossProcess based on the given application connect @@ -88,6 +95,7 @@ func (txp *txnCrossProcess) CreateCrossProcessMetadata(txnName, appName string) // outbound request headers. if txp.IsSynthetics() { metadata.Synthetics = txp.SyntheticsHeader + metadata.SyntheticsInfo = txp.SyntheticsInfoHeader } if txp.Enabled { @@ -142,7 +150,7 @@ func (txp *txnCrossProcess) IsSynthetics() bool { // pointer should be sufficient to determine if this is a synthetics // transaction. Nevertheless, it's convenient to have the Type field be // non-zero if any CAT behaviour has occurred. - return 0 != (txp.Type&txnCrossProcessSynthetics) && nil != txp.Synthetics + return (txp.Type&txnCrossProcessSynthetics) != 0 && txp.Synthetics != nil } // ParseAppData decodes the given appData value. @@ -247,6 +255,11 @@ func (txp *txnCrossProcess) handleInboundRequestHeaders(metadata crossProcessMet if err := txp.handleInboundRequestEncodedSynthetics(metadata.Synthetics); err != nil { return err } + if metadata.SyntheticsInfo != "" { + if err := txp.handleInboundRequestEncodedSyntheticsInfo(metadata.SyntheticsInfo); err != nil { + return err + } + } } return nil @@ -338,6 +351,36 @@ func (txp *txnCrossProcess) handleInboundRequestSynthetics(raw []byte) error { return nil } +func (txp *txnCrossProcess) handleInboundRequestEncodedSyntheticsInfo(encoded string) error { + raw, err := deobfuscate(encoded, txp.EncodingKey) + if err != nil { + return err + } + + if err := txp.handleInboundRequestSyntheticsInfo(raw); err != nil { + return err + } + + txp.SyntheticsInfoHeader = encoded + return nil +} + +func (txp *txnCrossProcess) handleInboundRequestSyntheticsInfo(raw []byte) error { + synthetics := &cat.SyntheticsInfo{} + if err := json.Unmarshal(raw, synthetics); err != nil { + return err + } + + // The specced behaviour here if the account isn't trusted is to disable the + // synthetics handling, but not CAT in general, so we won't return an error + // here. + if txp.IsSynthetics() { + txp.SyntheticsInfo = synthetics + } + + return nil +} + func (txp *txnCrossProcess) outboundID() (string, error) { return obfuscate(txp.CrossProcessID, txp.EncodingKey) } diff --git a/v3/newrelic/txn_cross_process_test.go b/v3/newrelic/txn_cross_process_test.go index de07d4890..8e8807d3c 100644 --- a/v3/newrelic/txn_cross_process_test.go +++ b/v3/newrelic/txn_cross_process_test.go @@ -85,6 +85,18 @@ func (req *request) withSynthetics(account int, encodingKey string) *request { } req.Header.Add(cat.NewRelicSyntheticsName, string(obfuscated)) + + return req.withSyntheticsInfo("cli", "scheduled", encodingKey) +} + +func (req *request) withSyntheticsInfo(initiator, synthType, encodingKey string) *request { + header := fmt.Sprintf(`{"version":1,"type":"%s","initiator":"%s"}`, synthType, initiator) + obfuscated, err := obfuscate([]byte(header), []byte(encodingKey)) + if err != nil { + panic(err) + } + + req.Header.Add(cat.NewRelicSyntheticsInfo, string(obfuscated)) return req } @@ -168,14 +180,16 @@ func TestTxnCrossProcessInit(t *testing.T) { id := "" txnData := "" synthetics := "" + syntheticsInfo := "" if tc.req != nil { id = tc.req.Header.Get(cat.NewRelicIDName) txnData = tc.req.Header.Get(cat.NewRelicTxnName) synthetics = tc.req.Header.Get(cat.NewRelicSyntheticsName) + syntheticsInfo = tc.req.Header.Get(cat.NewRelicSyntheticsInfo) } actual.Init(tc.enabled, false, tc.reply) - err := actual.handleInboundRequestHeaders(crossProcessMetadata{id, txnData, synthetics}) + err := actual.handleInboundRequestHeaders(crossProcessMetadata{id, txnData, synthetics, syntheticsInfo}) if tc.expectedError == false && err != nil { t.Errorf("%s: unexpected error returned from Init: %v", tc.name, err) @@ -241,7 +255,8 @@ func TestTxnCrossProcessCreateCrossProcessMetadata(t *testing.T) { appName: "app", expectedError: false, expectedMetadata: crossProcessMetadata{ - Synthetics: mustObfuscate(`[1,1,"resource","job","monitor"]`, "foo"), + Synthetics: mustObfuscate(`[1,1,"resource","job","monitor"]`, "foo"), + SyntheticsInfo: mustObfuscate(`{"version":1,"type":"scheduled","initiator":"cli"}`, "foo"), }, }, { @@ -253,7 +268,8 @@ func TestTxnCrossProcessCreateCrossProcessMetadata(t *testing.T) { appName: "app", expectedError: false, expectedMetadata: crossProcessMetadata{ - Synthetics: mustObfuscate(`[1,1,"resource","job","monitor"]`, "foo"), + Synthetics: mustObfuscate(`[1,1,"resource","job","monitor"]`, "foo"), + SyntheticsInfo: mustObfuscate(`{"version":1,"type":"scheduled","initiator":"cli"}`, "foo"), }, }, { @@ -278,9 +294,10 @@ func TestTxnCrossProcessCreateCrossProcessMetadata(t *testing.T) { appName: "app", expectedError: false, expectedMetadata: crossProcessMetadata{ - ID: mustObfuscate(`1#1`, "foo"), - TxnData: mustObfuscate(`["00000000",false,"00000000","b95be233"]`, "foo"), - Synthetics: mustObfuscate(`[1,1,"resource","job","monitor"]`, "foo"), + ID: mustObfuscate(`1#1`, "foo"), + TxnData: mustObfuscate(`["00000000",false,"00000000","b95be233"]`, "foo"), + Synthetics: mustObfuscate(`[1,1,"resource","job","monitor"]`, "foo"), + SyntheticsInfo: mustObfuscate(`{"version":1,"type":"scheduled","initiator":"cli"}`, "foo"), }, }, { @@ -305,9 +322,10 @@ func TestTxnCrossProcessCreateCrossProcessMetadata(t *testing.T) { appName: "app", expectedError: false, expectedMetadata: crossProcessMetadata{ - ID: mustObfuscate(`1#1`, "foo"), - TxnData: mustObfuscate(`["00000000",false,"abcdefgh","cbec2654"]`, "foo"), - Synthetics: mustObfuscate(`[1,1,"resource","job","monitor"]`, "foo"), + ID: mustObfuscate(`1#1`, "foo"), + TxnData: mustObfuscate(`["00000000",false,"abcdefgh","cbec2654"]`, "foo"), + Synthetics: mustObfuscate(`[1,1,"resource","job","monitor"]`, "foo"), + SyntheticsInfo: mustObfuscate(`{"version":1,"type":"scheduled","initiator":"cli"}`, "foo"), }, }, } { diff --git a/v3/newrelic/txn_events.go b/v3/newrelic/txn_events.go index 61bd9aff4..2828c863b 100644 --- a/v3/newrelic/txn_events.go +++ b/v3/newrelic/txn_events.go @@ -5,6 +5,7 @@ package newrelic import ( "bytes" + "fmt" "sort" "strings" "time" @@ -113,6 +114,15 @@ func sharedTransactionIntrinsics(e *txnEvent, w *jsonFieldsWriter) { w.stringField("nr.syntheticsResourceId", e.CrossProcess.Synthetics.ResourceID) w.stringField("nr.syntheticsJobId", e.CrossProcess.Synthetics.JobID) w.stringField("nr.syntheticsMonitorId", e.CrossProcess.Synthetics.MonitorID) + if e.CrossProcess.SyntheticsInfo != nil { + w.stringField("nr.syntheticsType", e.CrossProcess.SyntheticsInfo.Type) + w.stringField("nr.syntheticsInitiator", e.CrossProcess.SyntheticsInfo.Initiator) + for attrName, attrValue := range e.CrossProcess.SyntheticsInfo.Attributes { + if attrName != "" { + w.stringField(fmt.Sprintf("nr.synthetics%s%s", strings.ToUpper(attrName[0:1]), attrName[1:]), attrValue) + } + } + } } } diff --git a/v3/newrelic/version.go b/v3/newrelic/version.go index af7c8d52c..a95cdce13 100644 --- a/v3/newrelic/version.go +++ b/v3/newrelic/version.go @@ -11,7 +11,7 @@ import ( const ( // Version is the full string version of this Go Agent. - Version = "3.28.1" + Version = "3.29.0" ) var (