Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support template paths as part of span names for go versions >= 1.22 #740

Merged
merged 17 commits into from
May 1, 2024
Merged

Support template paths as part of span names for go versions >= 1.22 #740

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
b894f53
Support template paths as part of span names for go versions >= 1.22
RonFed Mar 27, 2024
faa7740
Add http.route if a path template is available. Update nethttp e2e test
RonFed Mar 28, 2024
a911e1d
Update databasesql test results
RonFed Mar 28, 2024
fd46105
update offsets
RonFed Mar 28, 2024
4710c94
Merge branch 'main' into http_server_template_path
RonFed Mar 29, 2024
3b5362e
Changelog
RonFed Mar 29, 2024
d5cd59b
Merge branch 'main' into http_server_template_path
RonFed Apr 6, 2024
7b5f9a6
code review fix
RonFed Apr 6, 2024
e689298
update offsets
RonFed Apr 6, 2024
3a307ab
Merge branch 'main' into http_server_template_path
RonFed Apr 25, 2024
276d2fa
Update offsets
RonFed Apr 25, 2024
55cbd29
update verify.bats
RonFed Apr 25, 2024
78de785
Fix copyright comment
RonFed Apr 26, 2024
f9716d5
Merge branch 'main' into http_server_template_path
RonFed May 1, 2024
36593e3
update offsets
RonFed May 1, 2024
48d883b
update test files for nethttp
RonFed May 1, 2024
1b7d0f8
fix changelog
RonFed May 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@ OpenTelemetry Go Automatic Instrumentation adheres to [Semantic Versioning](http

## [Unreleased]

### Added

- Support http server path templated from go version 1.22 (`http.route` attribute and modified span name) ([#740](https://github.com/open-telemetry/opentelemetry-go-instrumentation/pull/740))
MrAlias marked this conversation as resolved.
Show resolved Hide resolved


## [v0.11.0-alpha] - 2024-03-26

Expand Down
324 changes: 324 additions & 0 deletions internal/pkg/inject/offset_results.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2750,6 +2750,168 @@
]
}
]
},
{
"field": "pat",
"offsets": [
{
"offset": 24,
"versions": [
"1.12.0",
"1.12.1",
"1.12.2",
"1.12.3",
"1.12.4",
"1.12.5",
"1.12.6",
"1.12.7",
"1.12.8",
"1.12.9",
"1.12.10",
"1.12.11",
"1.12.12",
"1.12.13",
"1.12.14",
"1.12.15",
"1.12.16",
"1.12.17",
"1.13.0",
"1.13.1",
"1.13.2",
"1.13.3",
"1.13.4",
"1.13.5",
"1.13.6",
"1.13.7",
"1.13.8",
"1.13.9",
"1.13.10",
"1.13.11",
"1.13.12",
"1.13.13",
"1.13.14",
"1.13.15",
"1.14.0",
"1.14.1",
"1.14.2",
"1.14.3",
"1.14.4",
"1.14.5",
"1.14.6",
"1.14.7",
"1.14.8",
"1.14.9",
"1.14.10",
"1.14.11",
"1.14.12",
"1.14.13",
"1.14.14",
"1.14.15",
"1.15.0",
"1.15.1",
"1.15.2",
"1.15.3",
"1.15.4",
"1.15.5",
"1.15.6",
"1.15.7",
"1.15.8",
"1.15.9",
"1.15.10",
"1.15.11",
"1.15.12",
"1.15.13",
"1.15.14",
"1.15.15",
"1.16.0",
"1.16.1",
"1.16.2",
"1.16.3",
"1.16.4",
"1.16.5",
"1.16.6",
"1.16.7",
"1.16.8",
"1.16.9",
"1.16.10",
"1.16.11",
"1.16.12",
"1.16.13",
"1.16.14",
"1.16.15",
"1.17.0",
"1.17.1",
"1.17.2",
"1.17.3",
"1.17.4",
"1.17.5",
"1.17.6",
"1.17.7",
"1.17.8",
"1.17.9",
"1.17.10",
"1.17.11",
"1.17.12",
"1.17.13",
"1.18.0",
"1.18.1",
"1.18.2",
"1.18.3",
"1.18.4",
"1.18.5",
"1.18.6",
"1.18.7",
"1.18.8",
"1.18.9",
"1.18.10",
"1.19.0",
"1.19.1",
"1.19.2",
"1.19.3",
"1.19.4",
"1.19.5",
"1.19.6",
"1.19.7",
"1.19.8",
"1.19.9",
"1.19.10",
"1.19.11",
"1.19.12",
"1.19.13",
"1.20.0",
"1.20.1",
"1.20.2",
"1.20.3",
"1.20.4",
"1.20.5",
"1.20.6",
MrAlias marked this conversation as resolved.
Show resolved Hide resolved
"1.20.7",
"1.20.8",
"1.20.9",
"1.20.10",
"1.20.11",
"1.20.12",
"1.20.13",
"1.20.14",
"1.21.0",
"1.21.1",
"1.21.2",
"1.21.3",
"1.21.4",
"1.21.5",
"1.21.6",
"1.21.7",
"1.21.8"
]
},
{
"offset": 248,
"versions": [
"1.22.0",
"1.22.1"
]
}
]
}
]
},
Expand Down Expand Up @@ -2915,6 +3077,168 @@
}
]
},
{
"struct": "pattern",
MrAlias marked this conversation as resolved.
Show resolved Hide resolved
"fields": [
{
"field": "str",
"offsets": [
{
"offset": 0,
"versions": [
"1.12.0",
"1.12.1",
"1.12.2",
"1.12.3",
"1.12.4",
"1.12.5",
"1.12.6",
"1.12.7",
"1.12.8",
"1.12.9",
"1.12.10",
"1.12.11",
"1.12.12",
"1.12.13",
"1.12.14",
"1.12.15",
"1.12.16",
"1.12.17",
"1.13.0",
"1.13.1",
"1.13.2",
"1.13.3",
"1.13.4",
"1.13.5",
"1.13.6",
"1.13.7",
"1.13.8",
"1.13.9",
"1.13.10",
"1.13.11",
"1.13.12",
"1.13.13",
"1.13.14",
"1.13.15",
"1.14.0",
"1.14.1",
"1.14.2",
"1.14.3",
"1.14.4",
"1.14.5",
"1.14.6",
"1.14.7",
"1.14.8",
"1.14.9",
"1.14.10",
"1.14.11",
"1.14.12",
"1.14.13",
"1.14.14",
"1.14.15",
"1.15.0",
"1.15.1",
"1.15.2",
"1.15.3",
"1.15.4",
"1.15.5",
"1.15.6",
"1.15.7",
"1.15.8",
"1.15.9",
"1.15.10",
"1.15.11",
"1.15.12",
"1.15.13",
"1.15.14",
"1.15.15",
"1.16.0",
"1.16.1",
"1.16.2",
"1.16.3",
"1.16.4",
"1.16.5",
"1.16.6",
"1.16.7",
"1.16.8",
"1.16.9",
"1.16.10",
"1.16.11",
"1.16.12",
"1.16.13",
"1.16.14",
"1.16.15",
"1.17.0",
"1.17.1",
"1.17.2",
"1.17.3",
"1.17.4",
"1.17.5",
"1.17.6",
"1.17.7",
"1.17.8",
"1.17.9",
"1.17.10",
"1.17.11",
"1.17.12",
"1.17.13",
"1.18.0",
"1.18.1",
"1.18.2",
"1.18.3",
"1.18.4",
"1.18.5",
"1.18.6",
"1.18.7",
"1.18.8",
"1.18.9",
"1.18.10",
"1.19.0",
"1.19.1",
"1.19.2",
"1.19.3",
"1.19.4",
"1.19.5",
"1.19.6",
"1.19.7",
"1.19.8",
"1.19.9",
"1.19.10",
"1.19.11",
"1.19.12",
"1.19.13",
"1.20.0",
"1.20.1",
"1.20.2",
"1.20.3",
"1.20.4",
"1.20.5",
"1.20.6",
"1.20.7",
"1.20.8",
"1.20.9",
"1.20.10",
"1.20.11",
"1.20.12",
"1.20.13",
"1.20.14",
"1.21.0",
"1.21.1",
"1.21.2",
"1.21.3",
"1.21.4",
"1.21.5",
"1.21.6",
"1.21.7",
"1.21.8",
"1.22.0",
"1.22.1"
]
}
]
}
]
},
{
"struct": "response",
"fields": [
Expand Down
37 changes: 37 additions & 0 deletions internal/pkg/instrumentation/bpf/net/http/http_event.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
package http

import (
"errors"
"net"
"strconv"
"strings"
Expand Down Expand Up @@ -61,3 +62,39 @@ func NetPeerAddressPortAttributes(host []byte) (addr attribute.KeyValue, port at
}
return
}

var (
// ErrEmptyPattern is returned when the input pattern is empty.
ErrEmptyPattern = errors.New("empty pattern")
// ErrMissingPathOrHost is returned when the input pattern is missing path or host.
ErrMissingPathOrHost = errors.New("missing path or host")
)

// The string's syntax is
//
// [METHOD] [HOST]/[PATH]
//
// https://cs.opensource.google/go/go/+/master:src/net/http/pattern.go;l=84;drc=b47f2febea5c570fef4a5c27a46473f511fbdaa3?q=PATTERN%20STRUCT&ss=go%2Fgo
MrAlias marked this conversation as resolved.
Show resolved Hide resolved
func ParsePattern(s string) (method, host, path string, err error) {
MrAlias marked this conversation as resolved.
Show resolved Hide resolved
if len(s) == 0 {
return "", "", "", ErrEmptyPattern
}

method, rest, found := s, "", false
if i := strings.IndexAny(s, " \t"); i >= 0 {
method, rest, found = s[:i], strings.TrimLeft(s[i+1:], " \t"), true
}
if !found {
rest = method
method = ""
}

i := strings.IndexByte(rest, '/')
if i < 0 {
return "", "", "", ErrMissingPathOrHost
}
host = rest[:i]
path = rest[i:]
err = nil
return
}
Loading
Loading