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

Use the concise license header without the year #1623

Merged
merged 3 commits into from
Oct 2, 2020

Conversation

dengliming
Copy link
Member

@dengliming dengliming commented Sep 5, 2020

closes #1212

@codecov
Copy link

codecov bot commented Sep 7, 2020

Codecov Report

Merging #1623 into master will increase coverage by 0.37%.
The diff coverage is 100.00%.

Impacted file tree graph

@@             Coverage Diff              @@
##             master    #1623      +/-   ##
============================================
+ Coverage     85.17%   85.55%   +0.37%     
- Complexity     1369     1372       +3     
============================================
  Files           163      163              
  Lines          5317     5316       -1     
  Branches        554      554              
============================================
+ Hits           4529     4548      +19     
+ Misses          586      567      -19     
+ Partials        202      201       -1     
Impacted Files Coverage Δ Complexity Δ
.../src/main/java/io/opentelemetry/OpenTelemetry.java 98.14% <ø> (ø) 22.00 <0.00> (ø)
...in/java/io/opentelemetry/baggage/BaggageUtils.java 100.00% <ø> (ø) 7.00 <0.00> (ø)
...o/opentelemetry/baggage/DefaultBaggageManager.java 61.11% <ø> (ø) 6.00 <0.00> (ø)
...in/java/io/opentelemetry/baggage/EmptyBaggage.java 75.00% <ø> (ø) 3.00 <0.00> (ø)
.../src/main/java/io/opentelemetry/baggage/Entry.java 100.00% <ø> (ø) 10.00 <0.00> (ø)
...n/java/io/opentelemetry/baggage/EntryMetadata.java 88.88% <ø> (ø) 2.00 <0.00> (ø)
...java/io/opentelemetry/common/AttributeKeyImpl.java 60.00% <ø> (ø) 8.00 <0.00> (ø)
...in/java/io/opentelemetry/common/AttributeType.java 100.00% <ø> (ø) 1.00 <0.00> (ø)
.../main/java/io/opentelemetry/common/Attributes.java 92.00% <ø> (ø) 18.00 <0.00> (ø)
...n/java/io/opentelemetry/common/AttributesKeys.java 100.00% <ø> (ø) 8.00 <0.00> (ø)
... and 154 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 391043f...e8bd2ad. Read the comment docs.

@jkwatson
Copy link
Contributor

jkwatson commented Sep 7, 2020

@bogdandrutu or @carlosalberto is this an acceptable license header? I think it's great, but I don't want to have to revert this if it's not ok with the TC. :)

Copy link
Contributor

@jkwatson jkwatson left a comment

Choose a reason for hiding this comment

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

I like it, pending approval from the TC.

@bogdandrutu
Copy link
Member

@jkwatson I saw in other repos using the header without the year but the license text was still there.

See open-telemetry/community#113 (comment)

@carlosalberto
Copy link
Contributor

Although Yuri also states the two lines license as a valid option, most OTel Projects use the format @bogdandrutu mentioned.

(Maybe it's a good time to finally settle the related discussion in Community)

@jkwatson
Copy link
Contributor

If we can get sign-off on this being the preferred header, it's definitely the most concise and light-weight.

@bogdandrutu
Copy link
Member

@jkwatson pushing on that issue to be closed open-telemetry/community#113 (comment)

@anuraaga
Copy link
Contributor

anuraaga commented Oct 2, 2020

@dengliming Sorry for the delay on this! I see the community repo was updated with guidance that allows the short header. Would you be able to merge master and reapply this change? Thanks a lot for the patience.

…year

# Conflicts:
#	api/src/main/java/io/opentelemetry/common/AttributeValue.java
#	api/src/main/java/io/opentelemetry/common/ReadableKeyValuePairs.java
#	api/src/main/java/io/opentelemetry/correlationcontext/CorrelationContextManager.java
#	api/src/main/java/io/opentelemetry/correlationcontext/CorrelationsContextUtils.java
#	api/src/main/java/io/opentelemetry/correlationcontext/DefaultCorrelationContextManager.java
#	api/src/main/java/io/opentelemetry/trace/attributes/BooleanAttributeSetter.java
#	api/src/main/java/io/opentelemetry/trace/attributes/DoubleAttributeSetter.java
#	api/src/main/java/io/opentelemetry/trace/attributes/LongAttributeSetter.java
#	api/src/main/java/io/opentelemetry/trace/attributes/StringAttributeSetter.java
#	api/src/test/java/io/opentelemetry/common/AttributeValueTest.java
#	api/src/test/java/io/opentelemetry/correlationcontext/CorrelationsContextUtilsTest.java
#	api/src/test/java/io/opentelemetry/trace/attributes/BooleanAttributeSetterTest.java
#	api/src/test/java/io/opentelemetry/trace/attributes/DoubleAttributeSetterTest.java
#	api/src/test/java/io/opentelemetry/trace/attributes/LongAttributeSetterTest.java
#	api/src/test/java/io/opentelemetry/trace/attributes/SemanticAttributesTest.java
#	api/src/test/java/io/opentelemetry/trace/attributes/StringAttributeSetterTest.java
#	sdk/correlation_context/src/main/java/io/opentelemetry/sdk/correlationcontext/CorrelationContextManagerSdk.java
#	sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/data/MetricDataDescriptorTest.java
#	sdk/tracing/src/main/java/io/opentelemetry/sdk/trace/TimedEvent.java
#	sdk/tracing/src/test/java/io/opentelemetry/sdk/trace/TimedEventTest.java
#	sdk_extensions/logging/src/main/java/io/opentelemetry/sdk/logging/LogProcessor.java
@dengliming
Copy link
Member Author

@anuraaga Thanks. reapply now.

@anuraaga anuraaga merged commit 71ba8e1 into open-telemetry:master Oct 2, 2020
@anuraaga
Copy link
Contributor

anuraaga commented Oct 2, 2020

Thanks so much!

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.

License headers
5 participants