Tracing: Support multiple OTel propagators #61199

hairyhenderson · 2023-01-09T22:38:33Z

What is this feature?

Adds support for setting multiple OTel propagators.

Why do we need this feature?

When migrating from Jaeger to W3C propagation with OTel, it's helpful to be support both propagation formats simultaneously, so as not to break any traces.

Who is this feature for?

Anyone operating and monitoring Grafana

Which issue(s) does this PR fix?:

Fixes #61198

Special notes for your reviewer:

Signed-off-by: Dave Henderson [email protected]

grafanabot · 2023-02-03T17:54:51Z

This pull request was removed from the 9.4.0 milestone because 9.4.0 is currently being released.

grafanabot · 2023-03-06T02:05:42Z

This pull request has been automatically marked as stale because it has not had activity in the last 30 days. It will be closed in 2 weeks if no further activity occurs. Please feel free to give a status update now, ping for review, or re-open when it's ready. Thank you for your contributions!

bboreham · 2023-03-14T12:05:04Z

I want to use this change; I'm going to see if I can fix the tests.

hairyhenderson · 2023-03-14T15:43:41Z

Thanks @bboreham 🙇‍♂️ - I got pulled away to other things and couldn't focus on this 😞 (and then it turned out I don't actually need this). Let me know if you need anything from me!

bboreham · 2023-03-14T16:39:27Z

Here's one way to change it so the tests pass: 40ef798

CLAassistant · 2023-03-14T16:47:45Z

All committers have signed the CLA.

hairyhenderson · 2023-03-14T16:47:52Z

I'll rebase if this passes!

docs/sources/setup-grafana/configure-grafana/_index.md

chri2547

Docs suggestions added. Please make sure I didn't change the technical meaning. Please request re-review when you are done. Thanks!

chri2547

Docs look good, thank you! I approve (soft approve).

hairyhenderson · 2023-03-14T20:47:30Z

@chri2547 can you un-request changes? this is still blocked by #61199 (review)

hairyhenderson · 2023-03-14T21:10:37Z

CI is failing with:

[warn] Code style issues found in the above file. Forgot to run Prettier?

(I guess this is from 3d448b6) I'll take a look tomorrow

bboreham · 2023-03-15T10:30:56Z

Today I realised there is an existing function TraceIDFromContext() which might be used to do the same thing I did with TradeIDString(). This probably needs someone with context on the tracing package to weigh in.

marefr · 2023-03-21T12:14:08Z

@hairyhenderson sync with main should do the trick I believe.

hairyhenderson · 2023-03-21T12:15:50Z

@marefr yup - was trying to commit, but the precommit hook was broken:

file:///Users/hairyhenderson/go/src/github.com/grafana/grafana/.yarn/cache/lint-staged-npm-13.1.2-6f136d35c9-f854ad5c88.zip/node_modules/lint-staged/lib/index.js:113
    if (runAllError?.ctx?.errors) {
                    ^

SyntaxError: Unexpected token '.'
    at Loader.moduleStrategy (internal/modules/esm/translators.js:140:18)
    at processTicksAndRejections (internal/process/task_queues.js:97:5)

I think I've got it now.

hairyhenderson · 2023-03-21T12:18:27Z

Today I realised there is an existing function TraceIDFromContext() which might be used to do the same thing I did with TradeIDString(). This probably needs someone with context on the tracing package to weigh in.

Given that TraceIDFromContext requires a context, and TraceIDString is only used in tests, IMO it's fine as-is.

hairyhenderson · 2023-03-21T13:02:49Z

Given that TraceIDFromContext requires a context, and TraceIDString is only used in tests, IMO it's fine as-is.

I spoke too soon - we have a context indeed, so using tracing.TraceIDFromContext is simpler - I've made that change!

Signed-off-by: Dave Henderson <[email protected]>

This method will be useful elsewhere if we want to log the trace ID.

Co-authored-by: Christopher Moyer <[email protected]>

Signed-off-by: Dave Henderson <[email protected]>

hairyhenderson · 2023-03-23T12:40:09Z

@marefr @bboreham PTAL 🙏

marefr

LGTM

hairyhenderson added area/backend add to changelog labels Jan 9, 2023

hairyhenderson added this to the 9.4.0 milestone Jan 9, 2023

hairyhenderson self-assigned this Jan 9, 2023

grafanabot added type/docs Flags the technical writing team for documentation support; auto adds to org-wide docs project pr/external This PR is from external contributor labels Jan 9, 2023

hairyhenderson force-pushed the hairyhenderson/otel-tracing-support-multi-propagators branch from 8e84b2a to a7af9be Compare January 12, 2023 14:18

grafanabot added the enterprise-failed label Jan 12, 2023

grafanabot removed this from the 9.4.0 milestone Feb 3, 2023

grafanabot added the stale Issue with no recent activity label Mar 6, 2023

hairyhenderson force-pushed the hairyhenderson/otel-tracing-support-multi-propagators branch from 32e9bdf to fe73882 Compare March 14, 2023 18:58

hairyhenderson marked this pull request as ready for review March 14, 2023 19:52

hairyhenderson requested review from a team and chri2547 as code owners March 14, 2023 19:52

hairyhenderson requested review from andresmgot, marefr, mildwonkey, suntala and yangkb09 and removed request for a team March 14, 2023 19:52

chri2547 reviewed Mar 14, 2023

View reviewed changes

docs/sources/setup-grafana/configure-grafana/_index.md Outdated Show resolved Hide resolved

chri2547 requested changes Mar 14, 2023

View reviewed changes

hairyhenderson requested a review from chri2547 March 14, 2023 20:45

hairyhenderson added the no-backport Skip backport of PR label Mar 14, 2023

chri2547 reviewed Mar 14, 2023

View reviewed changes

hairyhenderson changed the title ~~tracing: Support multiple OTel propagators~~ Tracing: Support multiple OTel propagators Mar 14, 2023

hairyhenderson added this to the 9.5.0 milestone Mar 14, 2023

chri2547 approved these changes Mar 14, 2023

View reviewed changes

grafanabot removed the stale Issue with no recent activity label Mar 15, 2023

marefr requested a review from sakjur March 21, 2023 12:13

hairyhenderson force-pushed the hairyhenderson/otel-tracing-support-multi-propagators branch from 3d448b6 to c7462f5 Compare March 21, 2023 12:16

hairyhenderson and others added 5 commits March 23, 2023 08:36

tracing: Support multiple OTel propagators

6f6eef8

Signed-off-by: Dave Henderson <[email protected]>

tracing: add TraceIDString method to fix up tests

e20e5e3

This method will be useful elsewhere if we want to log the trace ID.

improve propagation docs

fd4ce67

Co-authored-by: Christopher Moyer <[email protected]>

doc style fix

6b64947

Signed-off-by: Dave Henderson <[email protected]>

Use tracing.TraceIDFromContext instead of adding TraceIDString method

1fd7807

Signed-off-by: Dave Henderson <[email protected]>

hairyhenderson force-pushed the hairyhenderson/otel-tracing-support-multi-propagators branch from f3137a1 to 1fd7807 Compare March 23, 2023 12:37

marefr mentioned this pull request Mar 27, 2023

Plugins: Improve instrumentation by adding metrics and tracing #61035

Merged

9 tasks

marefr approved these changes Mar 27, 2023

View reviewed changes

hairyhenderson merged commit c0b5d2d into main Mar 27, 2023

hairyhenderson deleted the hairyhenderson/otel-tracing-support-multi-propagators branch March 27, 2023 18:56

This was referenced Mar 28, 2023

Tracing: Support multiple OTEL propagators grafana/grafana-plugin-sdk-go#657

Closed

Tracing: Support multiple OTel propagators grafana/grafana-plugin-sdk-go#663

Merged

Tracing: Support multiple OTel propagators #61199

Tracing: Support multiple OTel propagators #61199

Uh oh!

Conversation

hairyhenderson commented Jan 9, 2023

Uh oh!

grafanabot commented Feb 3, 2023

Uh oh!

grafanabot commented Mar 6, 2023

Uh oh!

bboreham commented Mar 14, 2023

Uh oh!

hairyhenderson commented Mar 14, 2023

Uh oh!

bboreham commented Mar 14, 2023

Uh oh!

CLAassistant commented Mar 14, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

hairyhenderson commented Mar 14, 2023

Uh oh!

Uh oh!

chri2547 left a comment

Choose a reason for hiding this comment

Uh oh!

chri2547 left a comment

Choose a reason for hiding this comment

Uh oh!

hairyhenderson commented Mar 14, 2023

Uh oh!

hairyhenderson commented Mar 14, 2023

Uh oh!

bboreham commented Mar 15, 2023

Uh oh!

marefr commented Mar 21, 2023

Uh oh!

hairyhenderson commented Mar 21, 2023

Uh oh!

hairyhenderson commented Mar 21, 2023

Uh oh!

hairyhenderson commented Mar 21, 2023

Uh oh!

hairyhenderson commented Mar 23, 2023

Uh oh!

marefr left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

CLAassistant commented Mar 14, 2023 •

edited

Loading