Skip to content

Commit

Permalink
Merge pull request #846 from iamemilio/secure-trace-observer
Browse files Browse the repository at this point in the history
protect trace observer from leaking license keys on error
  • Loading branch information
nr-swilloughby committed Feb 15, 2024
2 parents 9bff0c9 + a414d2f commit db7dc50
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion v3/newrelic/trace_observer.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
// 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
Expand Down Expand Up @@ -184,10 +186,11 @@ func newDialOptions(cfg observerConfig) []grpc.DialOption {
func (to *gRPCtraceObserver) connectToTraceObserver() {
conn, err := grpc.Dial(to.endpoint.host, to.dialOptions...)
if nil != err {
errMsg := strings.Replace(err.Error(), to.license, "--REDACTED_LICENSE_KEY--", -1)
// this error is unrecoverable and will not be retried
to.log.Error("trace observer unable to dial grpc endpoint", map[string]interface{}{
"host": to.endpoint.host,
"err": err.Error(),
"err": errMsg,
})
return
}
Expand Down

0 comments on commit db7dc50

Please sign in to comment.