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

PR 6524 with amendments #6569

Merged
merged 15 commits into from
Jul 13, 2024
Merged

PR 6524 with amendments #6569

merged 15 commits into from
Jul 13, 2024

Conversation

jkwatson
Copy link
Contributor

Replacement for #6524 with amendments to the test and the implementation. @junwense I accidentally pushed unverified commits to your main branch. Please feel free to reset your main branch to remove them.

junwense and others added 14 commits June 14, 2024 18:28
@junwense
20240614
011c576 
fix map Constructor bug
@junwense
20240617
ca2b44c 
fix map Constructor bug with tests
@junwense
20240617
8691c57 
fix map Constructor bug with tests
@junwense
20240617
2fb0561 
modify tests method name
@junwense
20240624
9e498ea 
modify tests method name
@junwense
Merge branch 'open-telemetry:main' into main
1887e3f
@jkwatson
Update api/incubator/src/test/java/io/opentelemetry/api/incubator/pro…
b5f8d7d 
…pagation/CaseInsensitiveMapTest.java
@junwense
Merge branch 'open-telemetry:main' into main
52263dd
@junwense
20240627
4aaafae 
Modify CaseInsensitiveMap.getKeyLowerCase method modifiers
Modify CaseInsensitiveMap.TestCases
Add dependency guava-annotations
@junwense
20240701
1ebbc04 
Modify CaseInsensitiveMap TestCase
@junwense
20240701
756a88d 
Modify CaseInsensitiveMap TestCase
@junwense
20240703
fc8f54d 
Modify CaseInsensitiveMap TestCase
@junwense
20240703
78c6a5d 
Modify CaseInsensitiveMap TestCase
@jkwatson
clean up tests, fix a couple of bugs
7f968c0
@jkwatson jkwatson requested a review from a team July 11, 2024 04:28
@jkwatson jkwatson mentioned this pull request Jul 11, 2024
Closed
@codecov Codecov
Copy link

codecov bot commented Jul 11, 2024 •
edited
Loading

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 90.61%. Comparing base (fe8a7f4) to head (c555f14).
Report is 23 commits behind head on main.

Additional details and impacted files 
@@             Coverage Diff              @@
##               main    #6569      +/-   ##
============================================
- Coverage     90.63%   90.61%   -0.03%     
- Complexity     6228     6260      +32     
============================================
  Files           679      689      +10     
  Lines         18661    18704      +43     
  Branches       1842     1844       +2     
============================================
+ Hits          16914    16948      +34     
- Misses         1189     1200      +11     
+ Partials        558      556       -2

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

jack-berg
jack-berg approved these changes Jul 11, 2024
View reviewed changes
Copy link
Member

@jack-berg jack-berg left a comment

Choose a reason for hiding this comment

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

Thanks @jkwatson and @junwense

trask
trask approved these changes Jul 11, 2024
View reviewed changes
api/incubator/src/main/java/io/opentelemetry/api/incubator/propagation/CaseInsensitiveMap.java Outdated
m.forEach(this::put);
}

private static String getKeyLowerCase(@Nonnull String key) {
Copy link
Member

Choose a reason for hiding this comment

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

I think we normally don't include NonNull annotations?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

hmm. I don't remember either way. Happy to remove if you think we should skip it.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

done

@jkwatson jkwatson merged commit fbb5ebb into open-telemetry:main Jul 13, 2024
18 checks passed
@jkwatson jkwatson deleted the pr_6524 branch July 13, 2024 03:09
@junwense
Copy link
Contributor

Replacement for #6524 with amendments to the test and the implementation. @junwense I accidentally pushed unverified commits to your main branch. Please feel free to reset your main branch to remove them.

It's been a while since I last read it, thank you for editing my test case. It's also my first time contributing code

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

@trask trask trask approved these changes

@jack-berg jack-berg jack-berg 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.
4 participants
@jkwatson @junwense @trask @jack-berg