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

HPCC4J-647 FileUtility only use otel autosdk without javaagent #758

Merged
merged 1 commit into from
Sep 18, 2024

Conversation

jpmcmu
Copy link
Contributor

@jpmcmu jpmcmu commented Sep 17, 2024

  • Added a check to only initialize the OTel autosdk if an OTel javaagent hasn't been set

Signed-off-by: James McMullan [email protected]

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 is a breaking change (fix or feature that will cause existing behavior to change).

Checklist:

  • I have created a corresponding JIRA ticket for this submission
  • My code follows the code style of this project.
    • I have applied the Eclipse code-format template provided.
  • 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 HPCC Systems CONTRIBUTORS document (https://github.com/hpcc-systems/HPCC-Platform/wiki/Guide-for-contributors).
  • The change has been fully tested:
    • This change does not cause any existing JUnits to fail.
    • I have include JUnit coverage to test this change
    • I have performed system test and covered possible regressions and side effects.
  • I have given due consideration to all of the following potential concerns:
    • Scalability
    • Performance
    • Security
    • Thread-safety
    • Premature optimization
    • This change fixes the problem, not just the symptom

Testing:

Copy link

Jira Issue: https://hpccsystems.atlassian.net/browse/HPCC4J-647

Jirabot Action Result:
Workflow Transition To: Merge Pending
Updated PR

Copy link
Member

@rpastrana rpastrana left a comment

Choose a reason for hiding this comment

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

@jpmcmu approved, but I did post a concern

- Added a check to only initialize the OTel autosdk if an OTel javaagent hasn't been set

Signed-off-by: James McMullan [email protected]
@jpmcmu jpmcmu changed the base branch from candidate-9.8.x to candidate-9.6.x September 18, 2024 15:19
@jpmcmu
Copy link
Contributor Author

jpmcmu commented Sep 18, 2024

@rpastrana updated var name and retargeted to 9.6.x

@rpastrana rpastrana merged commit 8ff2c62 into hpcc-systems:candidate-9.6.x Sep 18, 2024
Copy link

Jirabot Action Result:
Added fix version: 9.6.48
Added fix version: 9.8.22
Workflow Transition: 'Resolve issue'

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants