diff --git a/error.go b/error.go
index 5eb53265a..b9ae9e4c6 100644
--- a/error.go
+++ b/error.go
@@ -309,7 +309,7 @@ func initStacktrace(e *Error, err error) {
 		for i, frame := range stackTrace {
 			pc[i] = uintptr(frame)
 		}
-		e.stacktrace = stacktrace.AppendCallerFrames(e.stacktrace[:0], pc)
+		e.stacktrace = stacktrace.AppendCallerFrames(e.stacktrace[:0], pc, -1)
 	}
 }
 
diff --git a/stacktrace/generate_library.bash b/stacktrace/generate_library.bash
index 1c8de0a61..559fe01b3 100644
--- a/stacktrace/generate_library.bash
+++ b/stacktrace/generate_library.bash
@@ -2,7 +2,7 @@
 
 set -e
 
-_PKGS=$(go list -f '{{printf "\t%q: true,\n" .ImportPath}}' "$@")
+_PKGS=$(go list -f '{{printf "\t%q,\n" .ImportPath}}' "$@")
 
 cat > library.go <<EOF
 // Code generated by "go generate". DO NOT EDIT.
@@ -15,9 +15,17 @@ import (
 	"github.com/elastic/apm-agent-go/internal/radix"
 )
 
-var libraryPackages = radix.NewFromMap(map[string]interface{}{
+var libraryPackages = newLibraryPackagesRadixTree(
 $_PKGS
-})
+)
+
+func newLibraryPackagesRadixTree(k ...string) *radix.Tree {
+	tree := radix.New()
+	for _, k := range k {
+		tree.Insert(k, true)
+	}
+	return tree
+}
 
 // RegisterLibraryPackage registers the given packages as being
 // well-known library path prefixes. This must not be called
diff --git a/stacktrace/library.go b/stacktrace/library.go
index 8c966d88a..1411a5b5b 100644
--- a/stacktrace/library.go
+++ b/stacktrace/library.go
@@ -8,194 +8,202 @@ import (
 	"github.com/elastic/apm-agent-go/internal/radix"
 )
 
-var libraryPackages = radix.NewFromMap(map[string]interface{}{
-	"archive/tar":                       true,
-	"archive/zip":                       true,
-	"bufio":                             true,
-	"bytes":                             true,
-	"compress/bzip2":                    true,
-	"compress/flate":                    true,
-	"compress/gzip":                     true,
-	"compress/lzw":                      true,
-	"compress/zlib":                     true,
-	"container/heap":                    true,
-	"container/list":                    true,
-	"container/ring":                    true,
-	"context":                           true,
-	"crypto":                            true,
-	"crypto/aes":                        true,
-	"crypto/cipher":                     true,
-	"crypto/des":                        true,
-	"crypto/dsa":                        true,
-	"crypto/ecdsa":                      true,
-	"crypto/elliptic":                   true,
-	"crypto/hmac":                       true,
-	"crypto/internal/cipherhw":          true,
-	"crypto/md5":                        true,
-	"crypto/rand":                       true,
-	"crypto/rc4":                        true,
-	"crypto/rsa":                        true,
-	"crypto/sha1":                       true,
-	"crypto/sha256":                     true,
-	"crypto/sha512":                     true,
-	"crypto/subtle":                     true,
-	"crypto/tls":                        true,
-	"crypto/x509":                       true,
-	"crypto/x509/pkix":                  true,
-	"database/sql":                      true,
-	"database/sql/driver":               true,
-	"debug/dwarf":                       true,
-	"debug/elf":                         true,
-	"debug/gosym":                       true,
-	"debug/macho":                       true,
-	"debug/pe":                          true,
-	"debug/plan9obj":                    true,
-	"encoding":                          true,
-	"encoding/ascii85":                  true,
-	"encoding/asn1":                     true,
-	"encoding/base32":                   true,
-	"encoding/base64":                   true,
-	"encoding/binary":                   true,
-	"encoding/csv":                      true,
-	"encoding/gob":                      true,
-	"encoding/hex":                      true,
-	"encoding/json":                     true,
-	"encoding/pem":                      true,
-	"encoding/xml":                      true,
-	"errors":                            true,
-	"expvar":                            true,
-	"flag":                              true,
-	"fmt":                               true,
-	"go/ast":                            true,
-	"go/build":                          true,
-	"go/constant":                       true,
-	"go/doc":                            true,
-	"go/format":                         true,
-	"go/importer":                       true,
-	"go/internal/gccgoimporter":         true,
-	"go/internal/gcimporter":            true,
-	"go/internal/srcimporter":           true,
-	"go/parser":                         true,
-	"go/printer":                        true,
-	"go/scanner":                        true,
-	"go/token":                          true,
-	"go/types":                          true,
-	"hash":                              true,
-	"hash/adler32":                      true,
-	"hash/crc32":                        true,
-	"hash/crc64":                        true,
-	"hash/fnv":                          true,
-	"html":                              true,
-	"html/template":                     true,
-	"image":                             true,
-	"image/color":                       true,
-	"image/color/palette":               true,
-	"image/draw":                        true,
-	"image/gif":                         true,
-	"image/internal/imageutil":          true,
-	"image/jpeg":                        true,
-	"image/png":                         true,
-	"index/suffixarray":                 true,
-	"internal/cpu":                      true,
-	"internal/nettrace":                 true,
-	"internal/poll":                     true,
-	"internal/race":                     true,
-	"internal/singleflight":             true,
-	"internal/syscall/unix":             true,
-	"internal/syscall/windows":          true,
-	"internal/syscall/windows/registry": true,
-	"internal/syscall/windows/sysdll":   true,
-	"internal/testenv":                  true,
-	"internal/testlog":                  true,
-	"internal/trace":                    true,
-	"io":                                true,
-	"io/ioutil":                         true,
-	"log":                               true,
-	"log/syslog":                        true,
-	"math":                              true,
-	"math/big":                          true,
-	"math/bits":                         true,
-	"math/cmplx":                        true,
-	"math/rand":                         true,
-	"mime":                              true,
-	"mime/multipart":                    true,
-	"mime/quotedprintable":              true,
-	"net":                            true,
-	"net/http":                       true,
-	"net/http/cgi":                   true,
-	"net/http/cookiejar":             true,
-	"net/http/fcgi":                  true,
-	"net/http/httptest":              true,
-	"net/http/httptrace":             true,
-	"net/http/httputil":              true,
-	"net/http/internal":              true,
-	"net/http/pprof":                 true,
-	"net/internal/socktest":          true,
-	"net/mail":                       true,
-	"net/rpc":                        true,
-	"net/rpc/jsonrpc":                true,
-	"net/smtp":                       true,
-	"net/textproto":                  true,
-	"net/url":                        true,
-	"os":                             true,
-	"os/exec":                        true,
-	"os/signal":                      true,
-	"os/signal/internal/pty":         true,
-	"os/user":                        true,
-	"path":                           true,
-	"path/filepath":                  true,
-	"plugin":                         true,
-	"reflect":                        true,
-	"regexp":                         true,
-	"regexp/syntax":                  true,
-	"runtime":                        true,
-	"runtime/cgo":                    true,
-	"runtime/debug":                  true,
-	"runtime/internal/atomic":        true,
-	"runtime/internal/sys":           true,
-	"runtime/pprof":                  true,
-	"runtime/pprof/internal/profile": true,
-	"runtime/race":                   true,
-	"runtime/trace":                  true,
-	"sort":                           true,
-	"strconv":                        true,
-	"strings":                        true,
-	"sync":                           true,
-	"sync/atomic":                    true,
-	"syscall":                        true,
-	"testing":                        true,
-	"testing/internal/testdeps":      true,
-	"testing/iotest":                 true,
-	"testing/quick":                  true,
-	"text/scanner":                   true,
-	"text/tabwriter":                 true,
-	"text/template":                  true,
-	"text/template/parse":            true,
-	"time":                           true,
-	"unicode":                        true,
-	"unicode/utf16":                  true,
-	"unicode/utf8":                   true,
-	"unsafe":                         true,
-	"vendor/golang_org/x/crypto/chacha20poly1305":                   true,
-	"vendor/golang_org/x/crypto/chacha20poly1305/internal/chacha20": true,
-	"vendor/golang_org/x/crypto/cryptobyte":                         true,
-	"vendor/golang_org/x/crypto/cryptobyte/asn1":                    true,
-	"vendor/golang_org/x/crypto/curve25519":                         true,
-	"vendor/golang_org/x/crypto/poly1305":                           true,
-	"vendor/golang_org/x/net/http2/hpack":                           true,
-	"vendor/golang_org/x/net/idna":                                  true,
-	"vendor/golang_org/x/net/internal/nettest":                      true,
-	"vendor/golang_org/x/net/lex/httplex":                           true,
-	"vendor/golang_org/x/net/nettest":                               true,
-	"vendor/golang_org/x/net/proxy":                                 true,
-	"vendor/golang_org/x/text/secure":                               true,
-	"vendor/golang_org/x/text/secure/bidirule":                      true,
-	"vendor/golang_org/x/text/transform":                            true,
-	"vendor/golang_org/x/text/unicode":                              true,
-	"vendor/golang_org/x/text/unicode/bidi":                         true,
-	"vendor/golang_org/x/text/unicode/norm":                         true,
-	"github.com/elastic/apm-agent-go":                               true,
-})
+var libraryPackages = newLibraryPackagesRadixTree(
+	"archive/tar",
+	"archive/zip",
+	"bufio",
+	"bytes",
+	"compress/bzip2",
+	"compress/flate",
+	"compress/gzip",
+	"compress/lzw",
+	"compress/zlib",
+	"container/heap",
+	"container/list",
+	"container/ring",
+	"context",
+	"crypto",
+	"crypto/aes",
+	"crypto/cipher",
+	"crypto/des",
+	"crypto/dsa",
+	"crypto/ecdsa",
+	"crypto/elliptic",
+	"crypto/hmac",
+	"crypto/internal/cipherhw",
+	"crypto/md5",
+	"crypto/rand",
+	"crypto/rc4",
+	"crypto/rsa",
+	"crypto/sha1",
+	"crypto/sha256",
+	"crypto/sha512",
+	"crypto/subtle",
+	"crypto/tls",
+	"crypto/x509",
+	"crypto/x509/pkix",
+	"database/sql",
+	"database/sql/driver",
+	"debug/dwarf",
+	"debug/elf",
+	"debug/gosym",
+	"debug/macho",
+	"debug/pe",
+	"debug/plan9obj",
+	"encoding",
+	"encoding/ascii85",
+	"encoding/asn1",
+	"encoding/base32",
+	"encoding/base64",
+	"encoding/binary",
+	"encoding/csv",
+	"encoding/gob",
+	"encoding/hex",
+	"encoding/json",
+	"encoding/pem",
+	"encoding/xml",
+	"errors",
+	"expvar",
+	"flag",
+	"fmt",
+	"go/ast",
+	"go/build",
+	"go/constant",
+	"go/doc",
+	"go/format",
+	"go/importer",
+	"go/internal/gccgoimporter",
+	"go/internal/gcimporter",
+	"go/internal/srcimporter",
+	"go/parser",
+	"go/printer",
+	"go/scanner",
+	"go/token",
+	"go/types",
+	"hash",
+	"hash/adler32",
+	"hash/crc32",
+	"hash/crc64",
+	"hash/fnv",
+	"html",
+	"html/template",
+	"image",
+	"image/color",
+	"image/color/palette",
+	"image/draw",
+	"image/gif",
+	"image/internal/imageutil",
+	"image/jpeg",
+	"image/png",
+	"index/suffixarray",
+	"internal/cpu",
+	"internal/nettrace",
+	"internal/poll",
+	"internal/race",
+	"internal/singleflight",
+	"internal/syscall/unix",
+	"internal/syscall/windows",
+	"internal/syscall/windows/registry",
+	"internal/syscall/windows/sysdll",
+	"internal/testenv",
+	"internal/testlog",
+	"internal/trace",
+	"io",
+	"io/ioutil",
+	"log",
+	"log/syslog",
+	"math",
+	"math/big",
+	"math/bits",
+	"math/cmplx",
+	"math/rand",
+	"mime",
+	"mime/multipart",
+	"mime/quotedprintable",
+	"net",
+	"net/http",
+	"net/http/cgi",
+	"net/http/cookiejar",
+	"net/http/fcgi",
+	"net/http/httptest",
+	"net/http/httptrace",
+	"net/http/httputil",
+	"net/http/internal",
+	"net/http/pprof",
+	"net/internal/socktest",
+	"net/mail",
+	"net/rpc",
+	"net/rpc/jsonrpc",
+	"net/smtp",
+	"net/textproto",
+	"net/url",
+	"os",
+	"os/exec",
+	"os/signal",
+	"os/signal/internal/pty",
+	"os/user",
+	"path",
+	"path/filepath",
+	"plugin",
+	"reflect",
+	"regexp",
+	"regexp/syntax",
+	"runtime",
+	"runtime/cgo",
+	"runtime/debug",
+	"runtime/internal/atomic",
+	"runtime/internal/sys",
+	"runtime/pprof",
+	"runtime/pprof/internal/profile",
+	"runtime/race",
+	"runtime/trace",
+	"sort",
+	"strconv",
+	"strings",
+	"sync",
+	"sync/atomic",
+	"syscall",
+	"testing",
+	"testing/internal/testdeps",
+	"testing/iotest",
+	"testing/quick",
+	"text/scanner",
+	"text/tabwriter",
+	"text/template",
+	"text/template/parse",
+	"time",
+	"unicode",
+	"unicode/utf16",
+	"unicode/utf8",
+	"unsafe",
+	"vendor/golang_org/x/crypto/chacha20poly1305",
+	"vendor/golang_org/x/crypto/chacha20poly1305/internal/chacha20",
+	"vendor/golang_org/x/crypto/cryptobyte",
+	"vendor/golang_org/x/crypto/cryptobyte/asn1",
+	"vendor/golang_org/x/crypto/curve25519",
+	"vendor/golang_org/x/crypto/poly1305",
+	"vendor/golang_org/x/net/http2/hpack",
+	"vendor/golang_org/x/net/idna",
+	"vendor/golang_org/x/net/internal/nettest",
+	"vendor/golang_org/x/net/lex/httplex",
+	"vendor/golang_org/x/net/nettest",
+	"vendor/golang_org/x/net/proxy",
+	"vendor/golang_org/x/text/secure",
+	"vendor/golang_org/x/text/secure/bidirule",
+	"vendor/golang_org/x/text/transform",
+	"vendor/golang_org/x/text/unicode",
+	"vendor/golang_org/x/text/unicode/bidi",
+	"vendor/golang_org/x/text/unicode/norm",
+	"github.com/elastic/apm-agent-go",
+)
+
+func newLibraryPackagesRadixTree(k ...string) *radix.Tree {
+	tree := radix.New()
+	for _, k := range k {
+		tree.Insert(k, true)
+	}
+	return tree
+}
 
 // RegisterLibraryPackage registers the given packages as being
 // well-known library path prefixes. This must not be called
diff --git a/stacktrace/stacktrace.go b/stacktrace/stacktrace.go
index ab1ce1d2a..9e5825523 100644
--- a/stacktrace/stacktrace.go
+++ b/stacktrace/stacktrace.go
@@ -27,7 +27,7 @@ func AppendStacktrace(frames []Frame, skip, n int) []Frame {
 		pc = pc[:runtime.Callers(skip+1, pc)]
 	} else {
 		// n is negative, get all frames.
-		n = 0
+		n := 0
 		pc = make([]uintptr, 10)
 		for {
 			n += runtime.Callers(skip+n+1, pc[n:])
@@ -38,19 +38,21 @@ func AppendStacktrace(frames []Frame, skip, n int) []Frame {
 			pc = append(pc, 0)
 		}
 	}
-	return AppendCallerFrames(frames, pc)
+	return AppendCallerFrames(frames, pc, n)
 }
 
-// AppendCallerFrames appends to frames for the PCs in callers,
-// and returns the extended slice.
+// AppendCallerFrames appends to n frames for the PCs in callers,
+// and returns the extended slice. If n is negative, all available
+// frames will be added. Multiple frames may exist for the same
+// caller/PC in the case of function call inlining.
 //
 // See RuntimeFrame for information on what details are included.
-func AppendCallerFrames(frames []Frame, callers []uintptr) []Frame {
+func AppendCallerFrames(frames []Frame, callers []uintptr, n int) []Frame {
 	if len(callers) == 0 {
 		return frames
 	}
 	runtimeFrames := runtime.CallersFrames(callers)
-	for {
+	for i := 0; n < 0 || i < n; i++ {
 		runtimeFrame, more := runtimeFrames.Next()
 		frames = append(frames, RuntimeFrame(runtimeFrame))
 		if !more {