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

[BUILD] enum CanonicalCode names too generic... conflict with old C defines #2385

Merged
merged 3 commits into from
Oct 24, 2023

Conversation

marcalff
Copy link
Member

@marcalff marcalff commented Oct 23, 2023

Fixes #2384

Changes

Please provide a brief description of the changes here.

  • Removed unused header file api/include/opentelemetry/trace/canonical_code.h

This header file is no longer used, and causes collisions in user space with ASN1, on C defines.

For significant contributions please make sure you have completed the following items:

  • CHANGELOG.md updated for non-trivial changes
  • Unit tests have been added
  • Changes in public API reviewed

@marcalff marcalff requested a review from a team October 23, 2023 18:18
@codecov
Copy link

codecov bot commented Oct 23, 2023

Codecov Report

Merging #2385 (b760678) into main (f16deb0) will not change coverage.
Report is 1 commits behind head on main.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff           @@
##             main    #2385   +/-   ##
=======================================
  Coverage   87.43%   87.43%           
=======================================
  Files         199      199           
  Lines        6030     6030           
=======================================
  Hits         5272     5272           
  Misses        758      758           
Files Coverage Δ
api/include/opentelemetry/trace/span.h 84.22% <ø> (ø)
...de/opentelemetry/exporters/ostream/span_exporter.h 100.00% <ø> (ø)

Copy link
Member

@lalitb lalitb left a comment

Choose a reason for hiding this comment

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

LGTM. Hopefully, no one was taking dependency on this header file for their own purpose. Good to mention that as breaking change just to be safe :)

@marcalff
Copy link
Member Author

LGTM. Hopefully, no one was taking dependency on this header file for their own purpose. Good to mention that as breaking change just to be safe :)

Good point, thanks.

Fixed in CHANGELOG.

@marcalff marcalff merged commit 0baf501 into open-telemetry:main Oct 24, 2023
45 checks passed
@marcalff marcalff deleted the fix_canonical_code_2384 branch October 27, 2023 10:15
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.

[BUILD] enum CanonicalCode names too generic... conflict with old C defines
2 participants