-
Notifications
You must be signed in to change notification settings - Fork 192
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
2.x prep #1463
base: 2.x
Are you sure you want to change the base?
2.x prep #1463
Conversation
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## 2.x #1463 +/- ##
============================================
- Coverage 73.27% 73.23% -0.04%
+ Complexity 2683 2682 -1
============================================
Files 387 387
Lines 8014 8014
============================================
- Hits 5872 5869 -3
- Misses 2142 2145 +3
Flags with carried forward coverage won't be shown. Click here to find out more.
... and 3 files with indirect coverage changes Continue to review full report in Codecov by Sentry.
|
@@ -35,7 +34,8 @@ | |||
}, | |||
"extra": { | |||
"branch-alias": { | |||
"dev-main": "1.1.x-dev" | |||
"dev-main": "1.1.x-dev", | |||
"dev-2.x": "2.x-dev" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We should consider keeping the API and Context packages on 1.x
; bumping these packages to a new major version requires updating every instrumentation package which might slow down adoption of an SDK 2.x
release.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
That's reasonable. They will still exist in the 2.x branch (as will proto, semconv), but we can avoid releasing a new version until we do make a breaking change. I think the most likely trigger for this would be removing the registry in favour of SPI (and possibly removing globals initializers at the same time).
src/SDK/Metrics/Data/Histogram.php
Outdated
@@ -4,14 +4,14 @@ | |||
|
|||
namespace OpenTelemetry\SDK\Metrics\Data; | |||
|
|||
final class Histogram implements DataInterface | |||
final readonly class Histogram implements DataInterface |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
FWIW I don't like changing readonly
properties to readonly
classes automatically as this might result in unnecessary diffs if we decide to change a property back to non-readonly
/ decide to add a non-readonly
property in the future1. I would prefer if we apply this change only to classes that should truly be readonly.
Footnotes
-
e.g. the
DataInterface
implementations have mutable$dataPoints
in the upstream version of the metrics SDK to supportMetricFilter
. ↩
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
reverted the rector changes and disabled this rule
src/SemConv/composer.json
Outdated
@@ -26,7 +26,8 @@ | |||
}, | |||
"extra": { | |||
"branch-alias": { | |||
"dev-main": "1.x-dev" | |||
"dev-main": "1.x-dev", | |||
"dev-2.x": "2.x-dev" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The version of this package is based on the https://github.com/open-telemetry/semantic-conventions version? -> should stay on 1.x
.
proto/otel/composer.json
Outdated
@@ -31,7 +31,8 @@ | |||
}, | |||
"extra": { | |||
"branch-alias": { | |||
"dev-main": "1.x-dev" | |||
"dev-main": "1.x-dev", | |||
"dev-2.x": "2.x-dev" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Same as above; based on https://github.com/open-telemetry/opentelemetry-proto version?
I've pared this PR back:
|
Initial work for a 2.x branch: