Skip to content

Add instrumentation API usage and native OpenTelemetry implementation #771

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

Merged
merged 16 commits into from
Dec 21, 2023
Merged

Add instrumentation API usage and native OpenTelemetry implementation #771

Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
a0ab6c9
Initial otel instrumentation implementation
Anaethelion Dec 1, 2023
fdd920e
add otel integration into esapi
Anaethelion Dec 12, 2023
16cd26a
add tests for instrumentation integration within both APIs
Anaethelion Dec 13, 2023
d2c828e
query persistence logic is embedded in otel instrumentation
Anaethelion Dec 14, 2023
270a6f8
regroup cluster id and node name test in AfterResponse
Anaethelion Dec 14, 2023
45fa3c0
bump go.mod to 1.20, add opentelemetry dependency
Anaethelion Dec 14, 2023
7c0af4c
rename RecordQuery to RecordRequestBody
Anaethelion Dec 19, 2023
a4d6599
add esapi integration for otel traces
Anaethelion Dec 19, 2023
59ef2fb
add typedapi integration for otel traces
Anaethelion Dec 19, 2023
4165761
pin transport to commit 903383c until release
Anaethelion Dec 19, 2023
9dbd885
update internal dependencies
Anaethelion Dec 20, 2023
fe883a2
replace nilcheck in typedapi with type assertion
Anaethelion Dec 20, 2023
8c24eec
add changelog for 8.12.0 with otel
Anaethelion Dec 21, 2023
e6e0e5c
fix naming to please linting
Anaethelion Dec 21, 2023
9806944
update examples dependencies
Anaethelion Dec 21, 2023
aac334e
go mod tidy for xkcdsearch
Anaethelion Dec 21, 2023
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
Prev Previous commit
Next Next commit
regroup cluster id and node name test in AfterResponse
  • Loading branch information
@Anaethelion
Anaethelion committed Dec 14, 2023
commit 270a6f8ca675c83a18ffbb46da47af932e282591
15 changes: 8 additions & 7 deletions elasticsearch_internal_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1008,12 +1008,13 @@ func (c *FakeInstrumentation) RecordError(ctx context.Context, err error) {
c.Error = err
}

func (c *FakeInstrumentation) RecordClusterId(ctx context.Context, id string) {
c.ClusterId = id
}

func (c *FakeInstrumentation) RecordNodeName(ctx context.Context, name string) {
c.NodeName = name
func (c *FakeInstrumentation) AfterResponse(ctx context.Context, res *http.Response) {
if id := res.Header.Get("X-Found-Handling-Cluster"); id != "" {
c.ClusterId = id
}
if name := res.Header.Get("X-Found-Handling-Instance"); name != "" {
c.NodeName = name
}
}

func (c *FakeInstrumentation) RecordPathPart(ctx context.Context, pathPart, value string) {
Expand All @@ -1025,7 +1026,7 @@ func (c *FakeInstrumentation) RecordQuery(ctx context.Context, endpoint string,
if !c.PersistQuery {
return nil
}

buf := bytes.Buffer{}
buf.ReadFrom(query)
c.Query = buf.String()
Expand Down