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

Jump to bottom

HPCC-30697 Track passthrough data as attributes #17980

Merged
merged 1 commit into from
Nov 15, 2023
Merged

HPCC-30697 Track passthrough data as attributes #17980

merged 1 commit into from
Nov 15, 2023

Conversation

rpastrana
Copy link
Member

@rpastrana rpastrana commented Oct 31, 2023 •
edited
Loading

  • Creates new setContextAttributes function
  • Utilizes new setContextAttributes
  • Exported data includes passthrough values as attributes

Type of change:

  • This change is a bug fix (non-breaking change which fixes an issue).
  • This change is a new feature (non-breaking change which adds functionality).
  • This change improves the code (refactor or other change that does not change the functionality)
  • This change fixes warnings (the fix does not alter the functionality or the generated code)
  • This change is a breaking change (fix or feature that will cause existing behavior to change).
  • This change alters the query API (existing queries will have to be recompiled)

Checklist:

  • My code follows the code style of this project.
    • My code does not create any new warnings from compiler, build system, or lint.
  • The commit message is properly formatted and free of typos.
    • The commit message title makes sense in a changelog, by itself.
    • The commit is signed.
  • My change requires a change to the documentation.
    • I have updated the documentation accordingly, or...
    • I have created a JIRA ticket to update the documentation.
    • Any new interfaces or exported functions are appropriately commented.
  • I have read the CONTRIBUTORS document.
  • The change has been fully tested:
    • I have added tests to cover my changes.
    • All new and existing tests passed.
    • I have checked that this change does not introduce memory leaks.
    • I have used Valgrind or similar tools to check for potential issues.
  • I have given due consideration to all of the following potential concerns:
    • Scalability
    • Performance
    • Security
    • Thread-safety
    • Cloud-compatibility
    • Premature optimization
    • Existing deployed queries will not be broken
    • This change fixes the problem, not just the symptom
    • The target branch of this pull request is appropriate for such a change.
  • There are no similar instances of the same problem that should be addressed
    • I have addressed them here
    • I have raised JIRA issues to address them separately
  • This is a user interface / front-end modification
    • I have tested my changes in multiple modern browsers
    • The component(s) render as expected

Smoketest:

  • Send notifications about my Pull Request position in Smoketest queue.
  • Test my draft Pull Request.

Testing:

@github-actions GitHub Actions
Copy link

https://track.hpccsystems.com/browse/HPCC-30697
Jira updated

@rpastrana rpastrana requested a review from ghalliday November 7, 2023 04:12
ghalliday
ghalliday reviewed Nov 9, 2023
View reviewed changes
Copy link
Member

@ghalliday ghalliday left a comment

Choose a reason for hiding this comment

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

Change looks good, but I think the attribute name need some discussion.

system/jlib/jtrace.cpp Outdated
void setContextAttributes()
{
if (!isEmptyString(hpccGlobalId))
setSpanAttribute(kGlobalIdHttpHeaderName, hpccGlobalId.get());
Copy link
Member

Choose a reason for hiding this comment

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

For discussion: Is this the correct name to use for the attribute? Would "hpcc.globalid" be more appropriate?
(See https://opentelemetry.io/docs/specs/otel/common/attribute-naming/)
Possible something to discuss more broadly before we merge.

@rpastrana rpastrana requested a review from ghalliday November 9, 2023 18:50
ghalliday
ghalliday approved these changes Nov 14, 2023
View reviewed changes
Copy link
Member

@ghalliday ghalliday left a comment

Choose a reason for hiding this comment

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

Looks good, @rpastrana please squash

@rpastrana
HPCC-30697 Track passthrough data as attributes
a031921 
- Creates new setContextAttributes function
- Utilizes new setContextAttributes
- Defines otel attribute names for globalid, and callerid
- No unittest since no exporter available to test locally

Signed-off-by: Rodrigo Pastrana <[email protected]>
@rpastrana rpastrana force-pushed the HPCC-30697-JTracePassthroughAttrs branch from 67acc6f to a031921 Compare November 14, 2023 14:03
@rpastrana
Copy link
Member Author

@ghalliday squashed

@ghalliday ghalliday merged commit 0bedb0d into hpcc-systems:candidate-9.4.x Nov 15, 2023
27 of 49 checks passed
@ghalliday
Copy link
Member

@rpastrana merged.
On reflection the commit title does not make sense on its own - so the contents of the log summary will not be very informative. In this case I decided it wasn't significant enough to matter.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ghalliday ghalliday ghalliday approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@rpastrana @ghalliday