diff --git a/.github/auto_assign.yml b/.github/auto_assign.yml index 577a2b50a..d023b4236 100644 --- a/.github/auto_assign.yml +++ b/.github/auto_assign.yml @@ -2,7 +2,7 @@ addReviewers: true # Set to true to add assignees to pull requests -addAssignees: false +addAssignees: true # A list of reviewers to be added to pull requests (GitHub user name) reviewers: diff --git a/.github/workflows/autoassign.yml b/.github/workflows/autoassign.yml index 2960b1772..6ab6507ad 100644 --- a/.github/workflows/autoassign.yml +++ b/.github/workflows/autoassign.yml @@ -7,4 +7,4 @@ jobs: add-reviews: runs-on: ubuntu-latest steps: - - uses: kentaro-m/auto-assign-action@v1.2.0 \ No newline at end of file + - uses: kentaro-m/auto-assign-action@v2.0.0 diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index eb2f2684e..9780de023 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -4,7 +4,7 @@ name: Go Agent CI on: pull_request env: # Specifies which go version to run integration tests on - INTEGRATION_TESTS_GO_VERSION: 1.21.5 + INTEGRATION_TESTS_GO_VERSION: latest jobs: go-agent-v3: @@ -15,11 +15,13 @@ jobs: matrix: include: # Core Tests on 3 most recent major Go versions - - go-version: 1.19.0 + - go-version: 1.20.14 dirs: v3/newrelic,v3/internal,v3/examples - - go-version: 1.20.0 + - go-version: 1.21 dirs: v3/newrelic,v3/internal,v3/examples - - go-version: 1.21.0 + - go-version: latest + dirs: v3/newrelic,v3/internal,v3/examples + - go-version: 1.23rc2 dirs: v3/newrelic,v3/internal,v3/examples # Integration Tests on highest Supported Go Version @@ -68,6 +70,7 @@ jobs: - dirs: v3/integrations/nrgraphqlgo,v3/integrations/nrgraphqlgo/example - dirs: v3/integrations/nrmssql - dirs: v3/integrations/nropenai + - dirs: v3/integrations/nrslog steps: - name: Checkout Code uses: actions/checkout@v2 @@ -106,11 +109,11 @@ jobs: matrix: include: # Core Tests on 3 most recent major Go versions - - go-version: 1.19.0 + - go-version: 1.20.14 dirs: v3/newrelic,v3/internal,v3/examples - - go-version: 1.20.0 + - go-version: 1.21 dirs: v3/newrelic,v3/internal,v3/examples - - go-version: 1.21.0 + - go-version: latest dirs: v3/newrelic,v3/internal,v3/examples steps: - name: Checkout Code diff --git a/CHANGELOG.md b/CHANGELOG.md index d216f52ff..8920e6e0a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,18 @@ +## 3.34.0 +### Added + - logcontext-v2/nrlogrus can now collect user attributes + - logcontext-v2/nrslog can now collect user attributes + - use slog to manage Go agent logs with the new nrslog library + - use zerolog go manage Go agent logs with the new nrzerolog library + - support for `RegisterTLSConfig` in nrmysql +### Fixed + - logcontext-v2/nrlogrus will still print user logs without isses if the Go agent has already been shut down. + - switched protobuff to google.golang.org/protobuff in modfile +### 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.33.1 ### Added - Increased max span events default limit to 2,000 to align with agent specifications diff --git a/Dockerfile b/Dockerfile index 566e372ad..6c9e425f0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ # This file is used to build the docker image for the Go Agent's GitHub Action tests # Default go version if no arguments passed in -ARG GO_VERSION=1.19 +ARG GO_VERSION=1.20 # Takes in go version FROM golang:${GO_VERSION} as builder diff --git a/GUIDE.md b/GUIDE.md index 3813a1c1b..a6df00b9a 100644 --- a/GUIDE.md +++ b/GUIDE.md @@ -137,12 +137,13 @@ if nil == err { } ``` -Popular logging libraries `logrus`, `logxi` and `zap` are supported by +Popular logging libraries `logrus`, `logxi`, `zap` and `zerolog` are supported by integration packages: * [v3/integrations/nrlogrus](https://godoc.org/github.com/newrelic/go-agent/v3/integrations/nrlogrus/) * [v3/integrations/nrlogxi](https://godoc.org/github.com/newrelic/go-agent/v3/integrations/nrlogxi/) * [v3/integrations/nrzap](https://godoc.org/github.com/newrelic/go-agent/v3/integrations/nrzap/) +* [v3/integrations/nrzerolog](https://godoc.org/github.com/newrelic/go-agent/v3/integrations/nrzerolog/) ## Transactions diff --git a/README.md b/README.md index 063f837e1..8fe6b0921 100644 --- a/README.md +++ b/README.md @@ -112,11 +112,13 @@ package primitives can be found [here](GUIDE.md#datastore-segments). #### Agent Logging -| Project | Integration Package | | -| ------------- | ------------- | - | -| [sirupsen/logrus](https://github.com/sirupsen/logrus) | [v3/integrations/nrlogrus](https://godoc.org/github.com/newrelic/go-agent/v3/integrations/nrlogrus) | Send agent log messages to Logrus | -| [mgutz/logxi](https://github.com/mgutz/logxi) | [v3/integrations/nrlogxi](https://godoc.org/github.com/newrelic/go-agent/v3/integrations/nrlogxi) | Send agent log messages to Logxi | -| [uber-go/zap](https://github.com/uber-go/zap) | [v3/integrations/nrzap](https://godoc.org/github.com/newrelic/go-agent/v3/integrations/nrzap) | Send agent log messages to Zap | +| Project | Integration Package | | +|-------------------------------------------------------|-----------------------------------------------------------------------------------------------------|---------------------------------------| +| [sirupsen/logrus](https://github.com/sirupsen/logrus) | [v3/integrations/nrlogrus](https://godoc.org/github.com/newrelic/go-agent/v3/integrations/nrlogrus) | Send agent log messages to Logrus | +| [mgutz/logxi](https://github.com/mgutz/logxi) | [v3/integrations/nrlogxi](https://godoc.org/github.com/newrelic/go-agent/v3/integrations/nrlogxi) | Send agent log messages to Logxi | +| [uber-go/zap](https://github.com/uber-go/zap) | [v3/integrations/nrzap](https://godoc.org/github.com/newrelic/go-agent/v3/integrations/nrzap) | Send agent log messages to Zap | +| [log/slog](https://pkg.go.dev/log/slog) | [v3/integrations/nrslog](https://godoc.org/github.com/newrelic/go-agent/v3/integrations/nrslog) | Send agent log messages to `log/slog` | +| [rs/zerolog](https://github.com/rs/zerolog) | [v3/integrations/nrzerolog](https://godoc.org/github.com/newrelic/go-agent/v3/integrations/nrzerolog) | Send agent log messages to Zerolog | #### Logs in Context diff --git a/v3/go.mod b/v3/go.mod index afbca8df0..50c4379ff 100644 --- a/v3/go.mod +++ b/v3/go.mod @@ -3,7 +3,7 @@ module github.com/newrelic/go-agent/v3 go 1.20 require ( - github.com/golang/protobuf v1.5.3 + google.golang.org/protobuf v1.5.3 google.golang.org/grpc v1.56.3 ) diff --git a/v3/integrations/logcontext-v2/nrlogrus/formatter.go b/v3/integrations/logcontext-v2/nrlogrus/formatter.go index 323b4a4f2..6edc40231 100644 --- a/v3/integrations/logcontext-v2/nrlogrus/formatter.go +++ b/v3/integrations/logcontext-v2/nrlogrus/formatter.go @@ -30,8 +30,9 @@ func NewFormatter(app *newrelic.Application, formatter logrus.Formatter) Context // Format renders a single log entry. func (f ContextFormatter) Format(e *logrus.Entry) ([]byte, error) { logData := newrelic.LogData{ - Severity: e.Level.String(), - Message: e.Message, + Severity: e.Level.String(), + Message: e.Message, + Attributes: e.Data, } logBytes, err := f.formatter.Format(e) diff --git a/v3/integrations/logcontext-v2/nrlogrus/formatter_test.go b/v3/integrations/logcontext-v2/nrlogrus/formatter_test.go index 0b8ca71b7..a53f6891b 100644 --- a/v3/integrations/logcontext-v2/nrlogrus/formatter_test.go +++ b/v3/integrations/logcontext-v2/nrlogrus/formatter_test.go @@ -114,6 +114,32 @@ func TestBackgroundLog(t *testing.T) { }) } +func TestBackgroundLogWithFields(t *testing.T) { + app := integrationsupport.NewTestApp(integrationsupport.SampleEverythingReplyFn, + newrelic.ConfigAppLogDecoratingEnabled(true), + newrelic.ConfigAppLogForwardingEnabled(true), + ) + out := bytes.NewBuffer([]byte{}) + log := newTextLogger(out, app.Application) + message := "Hello World!" + log.WithField("test field", []string{"a", "b"}).Info(message) + logcontext.ValidateDecoratedOutput(t, out, &logcontext.DecorationExpect{ + EntityGUID: integrationsupport.TestEntityGUID, + Hostname: host, + EntityName: integrationsupport.SampleAppName, + }) + app.ExpectLogEvents(t, []internal.WantLog{ + { + Severity: logrus.InfoLevel.String(), + Message: message, + Timestamp: internal.MatchAnyUnixMilli, + Attributes: map[string]interface{}{ + "test field": []string{"a", "b"}, + }, + }, + }) +} + func TestJSONBackgroundLog(t *testing.T) { app := integrationsupport.NewTestApp(integrationsupport.SampleEverythingReplyFn, newrelic.ConfigAppLogDecoratingEnabled(true), @@ -192,3 +218,39 @@ func TestLogInContext(t *testing.T) { txn.End() } + +func TestLogInContextWithFields(t *testing.T) { + app := integrationsupport.NewTestApp(integrationsupport.SampleEverythingReplyFn, + newrelic.ConfigAppLogDecoratingEnabled(true), + newrelic.ConfigAppLogForwardingEnabled(true), + ) + out := bytes.NewBuffer([]byte{}) + log := newTextLogger(out, app.Application) + txn := app.StartTransaction("test txn") + + ctx := newrelic.NewContext(context.Background(), txn) + message := "Hello World!" + log.WithField("hi", 1).WithContext(ctx).Info(message) + + logcontext.ValidateDecoratedOutput(t, out, &logcontext.DecorationExpect{ + EntityGUID: integrationsupport.TestEntityGUID, + Hostname: host, + EntityName: integrationsupport.SampleAppName, + TraceID: txn.GetLinkingMetadata().TraceID, + SpanID: txn.GetLinkingMetadata().SpanID, + }) + txn.ExpectLogEvents(t, []internal.WantLog{ + { + Severity: logrus.InfoLevel.String(), + Message: message, + Timestamp: internal.MatchAnyUnixMilli, + SpanID: txn.GetLinkingMetadata().SpanID, + TraceID: txn.GetLinkingMetadata().TraceID, + Attributes: map[string]interface{}{ + "hi": 1, + }, + }, + }) + + txn.End() +} diff --git a/v3/integrations/logcontext-v2/nrslog/example/main.go b/v3/integrations/logcontext-v2/nrslog/example/main.go index 2544fb3b6..247d018d4 100644 --- a/v3/integrations/logcontext-v2/nrslog/example/main.go +++ b/v3/integrations/logcontext-v2/nrslog/example/main.go @@ -12,6 +12,7 @@ import ( func main() { app, err := newrelic.NewApplication( + newrelic.ConfigAppName("slog example app"), newrelic.ConfigFromEnvironment(), newrelic.ConfigAppLogEnabled(true), ) @@ -27,7 +28,11 @@ func main() { txn := app.StartTransaction("example transaction") ctx := newrelic.NewContext(context.Background(), txn) - log.InfoContext(ctx, "I am a log inside a transaction") + log.InfoContext(ctx, "I am a log inside a transaction with custom attributes!", + slog.String("foo", "bar"), + slog.Int("answer", 42), + slog.Any("some_map", map[string]interface{}{"a": 1.0, "b": 2}), + ) // pretend to do some work time.Sleep(500 * time.Millisecond) diff --git a/v3/integrations/logcontext-v2/nrslog/handler.go b/v3/integrations/logcontext-v2/nrslog/handler.go index 4e0d3c90f..9c476910f 100644 --- a/v3/integrations/logcontext-v2/nrslog/handler.go +++ b/v3/integrations/logcontext-v2/nrslog/handler.go @@ -129,10 +129,18 @@ func (h NRHandler) Enabled(ctx context.Context, lvl slog.Level) bool { // - If a group has no Attrs (even if it has a non-empty key), // ignore it. func (h NRHandler) Handle(ctx context.Context, record slog.Record) error { + attrs := map[string]interface{}{} + + record.Attrs(func(attr slog.Attr) bool { + attrs[attr.Key] = attr.Value.Any() + return true + }) + data := newrelic.LogData{ - Severity: record.Level.String(), - Timestamp: record.Time.UnixMilli(), - Message: record.Message, + Severity: record.Level.String(), + Timestamp: record.Time.UnixMilli(), + Message: record.Message, + Attributes: attrs, } if h.txn != nil { h.txn.RecordLog(data) diff --git a/v3/integrations/logcontext-v2/nrslog/handler_test.go b/v3/integrations/logcontext-v2/nrslog/handler_test.go index 550650dd3..4e3d6d774 100644 --- a/v3/integrations/logcontext-v2/nrslog/handler_test.go +++ b/v3/integrations/logcontext-v2/nrslog/handler_test.go @@ -4,6 +4,7 @@ import ( "bytes" "context" "log/slog" + "os" "strings" "testing" @@ -225,6 +226,45 @@ func TestWithAttributes(t *testing.T) { } +func TestWithAttributesFromContext(t *testing.T) { + app := integrationsupport.NewTestApp(integrationsupport.SampleEverythingReplyFn, + newrelic.ConfigAppLogDecoratingEnabled(false), + newrelic.ConfigAppLogForwardingEnabled(true), + ) + log := slog.New(TextHandler(app.Application, os.Stdout, &slog.HandlerOptions{})) + + log.Info("I am a log message") + + txn := app.StartTransaction("example transaction") + ctx := newrelic.NewContext(context.Background(), txn) + + log.InfoContext(ctx, "I am a log inside a transaction with custom attributes!", + slog.String("foo", "bar"), + slog.Int("answer", 42), + slog.Any("some_map", map[string]interface{}{"a": 1.0, "b": 2}), + ) + + txn.End() + + app.ExpectLogEvents(t, []internal.WantLog{ + { + Severity: slog.LevelInfo.String(), + Message: "I am a log message", + Timestamp: internal.MatchAnyUnixMilli, + }, + { + Severity: slog.LevelInfo.String(), + Message: "I am a log inside a transaction with custom attributes!", + Timestamp: internal.MatchAnyUnixMilli, + Attributes: map[string]interface{}{ + "foo": "bar", + "answer": 42, + "some_map": map[string]interface{}{"a": 1.0, "b": 2}, + }, + }, + }) + +} func TestWithGroup(t *testing.T) { app := integrationsupport.NewTestApp(integrationsupport.SampleEverythingReplyFn, newrelic.ConfigAppLogDecoratingEnabled(false), diff --git a/v3/integrations/nrmssql/nrmssql.go b/v3/integrations/nrmssql/nrmssql.go index a78887432..72f7ef35c 100644 --- a/v3/integrations/nrmssql/nrmssql.go +++ b/v3/integrations/nrmssql/nrmssql.go @@ -1,9 +1,6 @@ // Copyright 2020 New Relic Corporation. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -//go:build go1.10 -// +build go1.10 - // Package nrmssql instruments github.com/microsoft/go-mssqldb. // // Use this package to instrument your MSSQL calls without having to manually diff --git a/v3/integrations/nrmysql/nrmysql.go b/v3/integrations/nrmysql/nrmysql.go index a955856aa..a446515fe 100644 --- a/v3/integrations/nrmysql/nrmysql.go +++ b/v3/integrations/nrmysql/nrmysql.go @@ -1,6 +1,7 @@ // Copyright 2020 New Relic Corporation. All rights reserved. // SPDX-License-Identifier: Apache-2.0 +//go:build go1.10 // +build go1.10 // Package nrmysql instruments https://github.com/go-sql-driver/mysql. @@ -48,6 +49,7 @@ package nrmysql import ( + "crypto/tls" "database/sql" "net" @@ -67,6 +69,10 @@ var ( } ) +func RegisterTLSConfig(key string, config *tls.Config) error { + return mysql.RegisterTLSConfig(key, config) +} + func init() { sql.Register("nrmysql", newrelic.InstrumentSQLDriver(mysql.MySQLDriver{}, baseBuilder)) internal.TrackUsage("integration", "driver", "mysql") diff --git a/v3/integrations/nrslog/LICENSE.txt b/v3/integrations/nrslog/LICENSE.txt new file mode 100644 index 000000000..cee548c2d --- /dev/null +++ b/v3/integrations/nrslog/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/nrslog/README.md b/v3/integrations/nrslog/README.md new file mode 100644 index 000000000..29673ad29 --- /dev/null +++ b/v3/integrations/nrslog/README.md @@ -0,0 +1,10 @@ +# v3/integrations/nrslog [![GoDoc](https://godoc.org/github.com/newrelic/go-agent/v3/integrations/nrslog?status.svg)](https://godoc.org/github.com/newrelic/go-agent/v3/integrations/nrslog) + +Package `nrslog` supports `log/slog`. + +```go +import "github.com/newrelic/go-agent/v3/integrations/nrslog" +``` + +For more information, see +[godocs](https://godoc.org/github.com/newrelic/go-agent/v3/integrations/nrslog). diff --git a/v3/integrations/nrslog/example_test.go b/v3/integrations/nrslog/example_test.go new file mode 100644 index 000000000..24b1ecb52 --- /dev/null +++ b/v3/integrations/nrslog/example_test.go @@ -0,0 +1,172 @@ +package nrslog_test + +import ( + "bytes" + "log/slog" + "testing" + + "github.com/stretchr/testify/assert" + + "github.com/newrelic/go-agent/v3/integrations/nrslog" + "github.com/newrelic/go-agent/v3/newrelic" +) + +func Example() { + // Get the default logger or create a new one: + l := slog.Default() + + _, err := newrelic.NewApplication( + newrelic.ConfigAppName("Example App"), + newrelic.ConfigLicense("__YOUR_NEWRELIC_LICENSE_KEY__"), + // Use nrslog to register the logger with the agent: + nrslog.ConfigLogger(l.WithGroup("newrelic")), + ) + if err != nil { + panic(err) + } +} + +func TestLogs(t *testing.T) { + type args struct { + message string + EnabledLevel slog.Level + } + + tests := []struct { + name string + args args + logFunc func(logger newrelic.Logger, message string, attrs map[string]interface{}) + want string + }{ + { + name: "Error", + args: args{ + message: "error message", + EnabledLevel: slog.LevelError, + }, + logFunc: newrelic.Logger.Error, + want: "level=ERROR msg=\"error message\" key=val\n", + }, + { + name: "Warn", + args: args{ + message: "warning message", + EnabledLevel: slog.LevelWarn, + }, + logFunc: newrelic.Logger.Warn, + want: "level=WARN msg=\"warning message\" key=val\n", + }, + { + name: "Info", + args: args{ + message: "informational message", + EnabledLevel: slog.LevelInfo, + }, + logFunc: newrelic.Logger.Info, + want: "level=INFO msg=\"informational message\" key=val\n", + }, + { + name: "Debug", + args: args{ + message: "debug message", + EnabledLevel: slog.LevelDebug, + }, + logFunc: newrelic.Logger.Debug, + want: "level=DEBUG msg=\"debug message\" key=val\n", + }, + { + name: "Disabled", + args: args{ + message: "disabled message", + EnabledLevel: slog.LevelError, + }, + logFunc: newrelic.Logger.Debug, + want: "", + }, + } + + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + // Create slog to record logs at the specified level: + buf := new(bytes.Buffer) + handler := slog.NewTextHandler(buf, &slog.HandlerOptions{ + Level: tt.args.EnabledLevel, + ReplaceAttr: func(groups []string, a slog.Attr) slog.Attr { + // Remove time from the output for predictable test output. + if a.Key == slog.TimeKey { + return slog.Attr{} + } + return a + }, + }) + logger := slog.New(handler) + + // Create test logger using nrslog.Transform: + testLogger := nrslog.Transform(logger) + + // Define attributes for the test log message: + attrs := map[string]interface{}{ + "key": "val", + } + + // Log the message and attributes using the test logger: + tt.logFunc(testLogger, tt.args.message, attrs) + + assert.Equal(t, tt.want, buf.String()) + }) + } +} + +func TestDebugEnabled(t *testing.T) { + type args struct { + EnabledLevel slog.Level + } + + tests := []struct { + name string + args args + want bool + }{ + { + name: "Debug", + args: args{ + EnabledLevel: slog.LevelDebug, + }, + want: true, + }, + { + name: "Info", + args: args{ + EnabledLevel: slog.LevelInfo, + }, + want: false, + }, + { + name: "Warn", + args: args{ + EnabledLevel: slog.LevelWarn, + }, + want: false, + }, + { + name: "Error", + args: args{ + EnabledLevel: slog.LevelError, + }, + want: false, + }, + } + + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + handler := slog.NewJSONHandler( + new(bytes.Buffer), + &slog.HandlerOptions{Level: tt.args.EnabledLevel}, + ) + logger := slog.New(handler) + testLogger := nrslog.Transform(logger) + + assert.Equal(t, tt.want, testLogger.DebugEnabled()) + }) + } +} diff --git a/v3/integrations/nrslog/go.mod b/v3/integrations/nrslog/go.mod new file mode 100644 index 000000000..aad673e83 --- /dev/null +++ b/v3/integrations/nrslog/go.mod @@ -0,0 +1,11 @@ +module github.com/newrelic/go-agent/v3/integrations/nrslog + +// The new log/slog package in Go 1.21 brings structured logging to the standard library. +go 1.21 + +require ( + github.com/newrelic/go-agent/v3 v3.33.1 + github.com/stretchr/testify v1.9.0 +) + +replace github.com/newrelic/go-agent/v3 => ../.. diff --git a/v3/integrations/nrslog/nrslog.go b/v3/integrations/nrslog/nrslog.go new file mode 100644 index 000000000..9e8f079d1 --- /dev/null +++ b/v3/integrations/nrslog/nrslog.go @@ -0,0 +1,53 @@ +// Package nrslog supports `log/slog` +// +// Wrap your slog Logger using nrslog.Transform to send agent log messages to standard log library. +package nrslog + +import ( + "context" + "log/slog" + + "github.com/newrelic/go-agent/v3/internal" + "github.com/newrelic/go-agent/v3/newrelic" +) + +func init() { internal.TrackUsage("integration", "logging", "slog") } + +func transformAttributes(c map[string]interface{}) []any { + attrs := make([]any, 0, len(c)) + for k, v := range c { + attrs = append(attrs, slog.Any(k, v)) + } + return attrs +} + +type shim struct{ logger *slog.Logger } + +func (s *shim) Error(msg string, c map[string]interface{}) { + s.logger.Error(msg, transformAttributes(c)...) +} + +func (s *shim) Warn(msg string, c map[string]interface{}) { + s.logger.Warn(msg, transformAttributes(c)...) +} + +func (s *shim) Info(msg string, c map[string]interface{}) { + s.logger.Info(msg, transformAttributes(c)...) +} + +func (s *shim) Debug(msg string, c map[string]interface{}) { + s.logger.Debug(msg, transformAttributes(c)...) +} + +func (s *shim) DebugEnabled() bool { + return s.logger.Enabled(context.Background(), slog.LevelDebug) +} + +// Transform turns a *slog.Logger into a newrelic.Logger. +func Transform(l *slog.Logger) newrelic.Logger { return &shim{logger: l} } + +// ConfigLogger configures the newrelic.Application to send log messages to the +// provided slog. +func ConfigLogger(l *slog.Logger) newrelic.ConfigOption { + return newrelic.ConfigLogger(Transform(l)) +} diff --git a/v3/integrations/nrzerolog/LICENSE.md b/v3/integrations/nrzerolog/LICENSE.md new file mode 100644 index 000000000..cee548c2d --- /dev/null +++ b/v3/integrations/nrzerolog/LICENSE.md @@ -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/nrzerolog/README.md b/v3/integrations/nrzerolog/README.md new file mode 100644 index 000000000..e4c426502 --- /dev/null +++ b/v3/integrations/nrzerolog/README.md @@ -0,0 +1,10 @@ +# v3/integrations/nrzerolog [![GoDoc](https://godoc.org/github.com/newrelic/go-agent/v3/integrations/nrzerolog?status.svg)](https://godoc.org/github.com/newrelic/go-agent/v3/integrations/nrzerolog) + +Package `nrzerolog` supports https://github.com/rs/zerolog + +```go +import "github.com/newrelic/go-agent/v3/integrations/nrzerolog" +``` + +For more information, see +[godocs](https://godoc.org/github.com/newrelic/go-agent/v3/integrations/nrzerolog). diff --git a/v3/integrations/nrzerolog/example_test.go b/v3/integrations/nrzerolog/example_test.go new file mode 100644 index 000000000..22e9e7b42 --- /dev/null +++ b/v3/integrations/nrzerolog/example_test.go @@ -0,0 +1,23 @@ +// Copyright 2020 New Relic Corporation. All rights reserved. +// SPDX-License-Identifier: Apache-2.0 + +package nrzerolog_test + +import ( + "os" + + newrelic "github.com/newrelic/go-agent" + "github.com/rs/zerolog" +) + +func Example() { + // Create a new zerolog logger: + zl := zerolog.New(os.Stderr) + + newrelic.NewApplication( + newrelic.ConfigAppName("Example App"), + newrelic.ConfigLicense("__YOUR_NEWRELIC_LICENSE_KEY__"), + // Use nrzerolog to register the logger with the agent: + nrzerolog.ConfigLogger(&zl), + ) +} diff --git a/v3/integrations/nrzerolog/go.mod b/v3/integrations/nrzerolog/go.mod new file mode 100644 index 000000000..e2eb6cf41 --- /dev/null +++ b/v3/integrations/nrzerolog/go.mod @@ -0,0 +1,8 @@ +module github.com/newrelic/go-agent/v3/integrations/nrzerolog + +go 1.19 + +require ( + github.com/newrelic/go-agent/v3 v3.20.2 + github.com/rs/zerolog v1.28.0 +) diff --git a/v3/integrations/nrzerolog/nrzerolog.go b/v3/integrations/nrzerolog/nrzerolog.go new file mode 100644 index 000000000..d66303868 --- /dev/null +++ b/v3/integrations/nrzerolog/nrzerolog.go @@ -0,0 +1,42 @@ +// Copyright 2021 New Relic Corporation. All rights reserved. +// SPDX-License-Identifier: Apache-2.0 + +// Package nrzerolog supports https://github.com/rs/zerolog +// +// Wrap your zerolog Logger using nrzerolog.Transform to send agent log messages to zerolog. +package nrzerolog + +import ( + "github.com/newrelic/go-agent/v3/internal" + "github.com/newrelic/go-agent/v3/newrelic" + "github.com/rs/zerolog" +) + +func init() { internal.TrackUsage("integration", "logging", "zerolog") } + +type shim struct{ logger *zerolog.Logger } + +func (s *shim) Error(msg string, c map[string]interface{}) { + s.logger.Error().Fields(c).Msg(msg) +} +func (s *shim) Warn(msg string, c map[string]interface{}) { + s.logger.Warn().Fields(c).Msg(msg) +} +func (s *shim) Info(msg string, c map[string]interface{}) { + s.logger.Info().Fields(c).Msg(msg) +} +func (s *shim) Debug(msg string, c map[string]interface{}) { + s.logger.Debug().Fields(c).Msg(msg) +} +func (s *shim) DebugEnabled() bool { + return s.logger.GetLevel() == zerolog.DebugLevel +} + +// Transform turns a *zerolog.Logger into a newrelic.Logger. +func Transform(l *zerolog.Logger) newrelic.Logger { return &shim{logger: l} } + +// ConfigLogger configures the newrelic.Application to send log messsages to the +// provided zerolog logger. +func ConfigLogger(l *zerolog.Logger) newrelic.ConfigOption { + return newrelic.ConfigLogger(Transform(l)) +} diff --git a/v3/newrelic/internal_app.go b/v3/newrelic/internal_app.go index b85365a86..54b7b4fdc 100644 --- a/v3/newrelic/internal_app.go +++ b/v3/newrelic/internal_app.go @@ -255,7 +255,7 @@ func (app *app) process() { // Remove the run before merging any final data to // ensure a bounded number of receives from dataChan. - app.setState(nil, errors.New("application shut down")) + app.setState(nil, errApplicationShutDown) if obs := app.getObserver(); obs != nil { if err := obs.shutdown(timeout); err != nil { @@ -541,6 +541,7 @@ var ( errHighSecurityEnabled = errors.New("high security enabled") errCustomEventsDisabled = errors.New("custom events disabled") errCustomEventsRemoteDisabled = errors.New("custom events disabled by server") + errApplicationShutDown = errors.New("application shut down") ) // RecordCustomEvent implements newrelic.Application's RecordCustomEvent. diff --git a/v3/newrelic/log.go b/v3/newrelic/log.go index 6eaba3541..7c939b958 100644 --- a/v3/newrelic/log.go +++ b/v3/newrelic/log.go @@ -16,7 +16,8 @@ import ( // level. logrus, logxi, and zap are supported by the integration packages // https://godoc.org/github.com/newrelic/go-agent/v3/integrations/nrlogrus, // https://godoc.org/github.com/newrelic/go-agent/v3/integrations/nrlogxi, -// and https://godoc.org/github.com/newrelic/go-agent/v3/integrations/nrzap +// https://godoc.org/github.com/newrelic/go-agent/v3/integrations/nrzap, +// and https://godoc.org/github.com/newrelic/go-agent/v3/integrations/nrzerolog // respectively. type Logger interface { Error(msg string, context map[string]interface{}) diff --git a/v3/newrelic/log_event.go b/v3/newrelic/log_event.go index 700be9d24..ff7e46d01 100644 --- a/v3/newrelic/log_event.go +++ b/v3/newrelic/log_event.go @@ -186,6 +186,12 @@ func EnrichLog(buf *bytes.Buffer, opts EnricherOption) error { reply, err := app.app.getState() if err != nil { + app.app.Debug("cannot enrich logs, unable to reach application", map[string]interface{}{"error": err.Error()}) + // If the application is shut down, don't return an error so the log can still be written. + // If debug logging is enabled, the error will be logged there. + if err == errApplicationShutDown { + return nil + } return err } diff --git a/v3/newrelic/sql_driver.go b/v3/newrelic/sql_driver.go index c32fa1f08..d2b783f83 100644 --- a/v3/newrelic/sql_driver.go +++ b/v3/newrelic/sql_driver.go @@ -1,9 +1,6 @@ // Copyright 2020 New Relic Corporation. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -//go:build go1.10 -// +build go1.10 - package newrelic import ( diff --git a/v3/newrelic/trace_observer.go b/v3/newrelic/trace_observer.go index 4274c05ed..7e73aa207 100644 --- a/v3/newrelic/trace_observer.go +++ b/v3/newrelic/trace_observer.go @@ -1,11 +1,6 @@ // Copyright 2020 New Relic Corporation. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -//go:build go1.9 -// +build go1.9 - -// This build tag is necessary because GRPC/ProtoBuf libraries only support Go version 1.9 and up. - package newrelic import ( diff --git a/v3/newrelic/trace_observer_impl_test.go b/v3/newrelic/trace_observer_impl_test.go index 17b66035b..b6272bca4 100644 --- a/v3/newrelic/trace_observer_impl_test.go +++ b/v3/newrelic/trace_observer_impl_test.go @@ -1,11 +1,6 @@ // Copyright 2020 New Relic Corporation. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -//go:build go1.9 -// +build go1.9 - -// This build tag is necessary because Infinite Tracing is only supported for Go version 1.9 and up - package newrelic import ( diff --git a/v3/newrelic/trace_observer_test.go b/v3/newrelic/trace_observer_test.go index ee1f9f2c1..00d918508 100644 --- a/v3/newrelic/trace_observer_test.go +++ b/v3/newrelic/trace_observer_test.go @@ -1,11 +1,6 @@ // Copyright 2020 New Relic Corporation. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -//go:build go1.9 -// +build go1.9 - -// This build tag is necessary because Infinite Tracing is only supported for Go version 1.9 and up - package newrelic import ( diff --git a/v3/newrelic/version.go b/v3/newrelic/version.go index ebc211672..9f569ad00 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.33.1" + Version = "3.34.0" ) var (