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.

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

Centralize retrieving instrumentation scope framework conversion for all signals #339

Merged
merged 4 commits into from
Aug 9, 2024

Conversation

Mpdreamz
Copy link
Member

@Mpdreamz Mpdreamz commented Aug 8, 2024

Addresses: #325

This PR ensures we map OpenTelemetry Instrumentation Scope to Service.Framework.* for all signal types.

@Mpdreamz Mpdreamz requested a review from a team as a code owner August 8, 2024 09:20
@obltmachine obltmachine added the safe-to-test Changes are safe to run in the CI label Aug 8, 2024
Copy link
Contributor

@lahsivjar lahsivjar left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM! Can we add a test for metrics and logs (similar to

func TestInstrumentationLibrary(t *testing.T) {
traces, spans := newTracesSpans()
spans.Scope().SetName("library-name")
spans.Scope().SetVersion("1.2.3")
otelSpan := spans.Spans().AppendEmpty()
otelSpan.SetTraceID(pcommon.TraceID{1})
otelSpan.SetSpanID(pcommon.SpanID{2})
events := transformTraces(t, traces)
event := (*events)[0]
assert.Equal(t, "library-name", event.Service.Framework.Name)
assert.Equal(t, "1.2.3", event.Service.Framework.Version)
}
)?

simitt
simitt previously requested changes Aug 8, 2024
Copy link
Contributor

@simitt simitt left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The PR is missing a description and a link to the issue it fixes.

@Mpdreamz
Copy link
Member Author

Mpdreamz commented Aug 8, 2024

I think metrics is already covered in the tests that I updated here: 1d6ac13 (#339)

Added an additional test for logs @lahsivjar

@Mpdreamz Mpdreamz requested a review from simitt August 8, 2024 09:42
Copy link
Contributor

@lahsivjar lahsivjar left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM! Thanks for adding the tests.

@simitt simitt dismissed their stale review August 9, 2024 11:42

concerns were addressed

@lahsivjar lahsivjar merged commit 81d7764 into elastic:main Aug 9, 2024
5 checks passed
@akhileshpok
Copy link

@lahsivjar - When will this enhancement become available for customers? Is it only applicable to MIS? Thanks

@akhileshpok
Copy link

@simitt - Wondering if you can help me with the timelines/release for availability of this enhancement! Thanks

@simitt
Copy link
Contributor

simitt commented Aug 20, 2024

Hi @akhileshpok , apologies, I missed your previous message.
The change can be brought back to the next minor version of the apm-sever and also be brought back to the serverless offering.

@lahsivjar could you cut a release for this and ensure that automation picks up the new version?

@lahsivjar
Copy link
Contributor

lahsivjar commented Aug 21, 2024

@akhileshpok Apologies about missing the previous ping, it fell through the cracks 😓

@lahsivjar could you cut a release for this and ensure that automation picks up the new version?

Will do!

@lahsivjar
Copy link
Contributor

@akhileshpok @simitt Here is the PR for adding the fix to APM-Server. It will be merged soon and should be available with 8.16.0 release.

@Mpdreamz Mpdreamz deleted the feature/instrumentation-scope-all branch October 15, 2024 15:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
safe-to-test Changes are safe to run in the CI
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants