Skip to content

Commit

Permalink
Merge branch 'master' into feature/tigran/resource-semantic
Browse files Browse the repository at this point in the history
  • Loading branch information
SergeyKanzhelev authored Oct 17, 2019
2 parents c41425d + a131ae1 commit 9405c94
Show file tree
Hide file tree
Showing 20 changed files with 920 additions and 247 deletions.
22 changes: 20 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,29 @@
version: 2

jobs:
build:
misspell:
docker:
- image: circleci/golang:1.12
steps:
- checkout
- run:
name: Verify
name: Misspell check
command: make precommit
markdownlint:
docker:
- image: circleci/ruby:latest
steps:
- checkout
- run:
name: Install markdownlint
command: gem install mdl
- run:
name: Check markdownlint
command: mdl -c .mdlrc .

workflows:
version: 2
build:
jobs:
- misspell
- markdownlint
1 change: 1 addition & 0 deletions .mdlrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
style ".mdlstyle.rb"
19 changes: 19 additions & 0 deletions .mdlstyle.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
all

# Multiple headings with the same content allowed for sibling headings
rule 'MD024', :allow_different_nesting => true

# Ordered lists should have increasing prefixes
rule 'MD029', :style => :ordered

# Ignore unordered list style
exclude_rule 'MD004'

# Ignore line length
exclude_rule 'MD013'

# Inline HTML
exclude_rule 'MD033'

# Fenced code blocks should have a language specified
exclude_rule 'MD040'
9 changes: 7 additions & 2 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@
"rewrap.wrappingColumn": 80,
"editor.rulers": [80],
"markdownlint.config": {
"MD013": true
"MD004": false,
"MD013": false,
"MD024": {"allow_different_nesting": true},
"MD029": {"style": "ordered"},
"MD033": false,
"MD040": false,
},
}
}
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
The OpenTelemetry specification describes the cross-language requirements and expectations for all OpenTelemetry implementations.

## Table of Contents

- [Overview](specification/overview.md)
- [Library Guidelines](specification/library-guidelines.md)
- [Package/Library Layout](specification/library-layout.md)
Expand All @@ -19,6 +20,7 @@ The OpenTelemetry specification describes the cross-language requirements and ex
- [User-Facing API](specification/api-metrics-user.md)
- [Meter API](specification/api-metrics-meter.md)
- SDK Specification
- [Tracing](specification/sdk-tracing.md)
- [Resource](specification/sdk-resource.md)
- Data Specification
- [Semantic Conventions](specification/data-semantic-conventions.md)
Expand Down
60 changes: 28 additions & 32 deletions issue-management.md
Original file line number Diff line number Diff line change
@@ -1,33 +1,31 @@
# Issue Management for OpenTelemetry

It's an important community goal for OpenTelemetry that our members find the backlogs
to be responsive, and easy to take part in. Shared practices will simplify collaboration
It's an important community goal for OpenTelemetry that our members find the backlogs
to be responsive, and easy to take part in. Shared practices will simplify collaboration
and engagement as well as help standardize on automation and overall project management.

SIGs are encouraged to experiment with labels and backlog management procedures,
including project board. This document only covers the bare bones of issue management
which should work the same across all SIGs, to help maintain a responsive backlog and
SIGs are encouraged to experiment with labels and backlog management procedures,
including project board. This document only covers the bare bones of issue management
which should work the same across all SIGs, to help maintain a responsive backlog and
allow us to track work across all projects in a similar manner.


## Roles

- OP:
- Original Poster. This is the person who has opened or posted the issue.
- Maintainer (aka Triager, or anyone performing that role):
- Person who is triaging the issue by determining its workability. This person is
responsible for getting the tickets to one of two stages - 1) `help-wanted`
2) `will-not-fix`. They are responsible for triaging by working with the OP to get
additional information as needed and analyzing the issue and adding relevant
- Person who is triaging the issue by determining its workability. This person is
responsible for getting the tickets to one of two stages - 1) `help-wanted`
2) `will-not-fix`. They are responsible for triaging by working with the OP to get
additional information as needed and analyzing the issue and adding relevant
details/information/guidance that would be helpful to the resolution of the issue.
- Collaborator:
- Person(s) that are actually doing the work related to the ticket. Once work is done,
they work with the Reviewer to get feedback implemented and complete the work. They
- Person(s) that are actually doing the work related to the ticket. Once work is done,
they work with the Reviewer to get feedback implemented and complete the work. They
are responsible for making sure issue status labels are up to date.
- Reviewer:
- Person whose Approval is needed to merge the PR.


## Opening an Issue

- An issue is filed by OP.
Expand All @@ -41,53 +39,51 @@ allow us to track work across all projects in a similar manner.
- The Maintainer can also label the issue as
- `URGENT` (for critical issues)
- `help-wanted` for issues which require work and have no one assigned
- Once a Collaborator is assigned, please remove `help-wanted` and add `wip` to
- Once a Collaborator is assigned, please remove `help-wanted` and add `wip` to
the issue.


## Closing an Issue

- Review criteria:
- For interface and design changes: 2 approvals - which must be from reviewers
- For interface and design changes: 2 approvals - which must be from reviewers
who work at different companies than the Collaborator.
- For smaller or internal changes: 1 approval from a different company.
- For `URGENT` issues:
- Collaborator: please provide an initial assessment of the issues to OP ASAP or
- Collaborator: please provide an initial assessment of the issues to OP ASAP or
within 1 business day, whichever is earlier.
- Reviewer: please review and provide feedback ASAP or within 1 business day,
- Reviewer: please review and provide feedback ASAP or within 1 business day,
whichever is earlier.
- Collaborator: please provide an update and/or response to each review comment ASAP
or within 1 business day, whichever is sooner. Merge should happen as soon as
review criteria are met.
- For non-`URGENT` issues
- Collaborator: please provide an initial response or assessment of the issue to
- Collaborator: please provide an initial response or assessment of the issue to
OP within 3 business days.
- Reviewer: please review and provide feedback within 3 business days.
- Collaborator: please provide an update and/or response to each review comment
within 3 business days. Once all review comments are resolved, please allow
within 3 business days. Once all review comments are resolved, please allow
1-2 business days for others to raise additional comments/questions, unless
the changes are fixing typos, bugs, documentation, test enhancements, or
the changes are fixing typos, bugs, documentation, test enhancements, or
implementing already discussed design.

When closing an issue that we `will-not-fix` or we believe need no further
action, please provide the rationale for closing, and indicate that OP can
re-open for discussion if there are additional info, justification and
When closing an issue that we `will-not-fix` or we believe need no further
action, please provide the rationale for closing, and indicate that OP can
re-open for discussion if there are additional info, justification and
questions.


## When Issues Get Stuck

Some issues are not directly related to a particular code change. If an
issue is worth considering in the issue backlog, but not scoped clearly
Some issues are not directly related to a particular code change. If an
issue is worth considering in the issue backlog, but not scoped clearly
enough for work to begin, then please label it `needs-discussion`.

- When possible, move the discussion forward by using tests and code examples.
- If discussion happens elsewhere, record relevant meeting notes into the
issue.
- When an agreement is made, clearly summarize the decision, and list any
- When an agreement is made, clearly summarize the decision, and list any
resulting action items which need to be addressed.
If an issue is stuck because someone is not responding, please add the `stale`
label. It is possible to automate this. E.g. https://github.com/apps/stale
The minimum time elapsed before the `stale` label is applied is proposed to be

If an issue is stuck because someone is not responding, please add the `stale`
label. It is possible to automate this. E.g. <https://github.com/apps/stale>
The minimum time elapsed before the `stale` label is applied is proposed to be
one week.
4 changes: 2 additions & 2 deletions milestones.md
Original file line number Diff line number Diff line change
Expand Up @@ -84,14 +84,14 @@ In scope of SDK Alpha release are:
- Jaeger and/or Zipkin exporter
- Context Propagation
- In-process propagation
- Inject and Extract
- Inject and Extract
- DistributedContext
- Metrics
- MetricsProcessor interface
- Aggregation MetricsProcessor
- Exporter interface
- Prometheus Exporter

Also in scope:

- Jaeger and/or Zipkin exporter
Expand Down
Loading

0 comments on commit 9405c94

Please sign in to comment.