Skip to content

Commit

Permalink
Exclude resource/sdk.md changes from this PR. It will be in a separat…
Browse files Browse the repository at this point in the history
…e PR.
  • Loading branch information
tigrannajaryan committed May 14, 2021
1 parent 66ba2d9 commit 1600ba0
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 10 deletions.
4 changes: 0 additions & 4 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,6 @@ release.

- Clarify "key/value pair list" vs "map" in Log Data Model. ([#1604](https://github.com/open-telemetry/opentelemetry-specification/pull/1604))

### Resource

- Add schema_url support to `Resource`. ([#1666](https://github.com/open-telemetry/opentelemetry-specification/pull/1666))

### Semantic Conventions

- Fix the inconsistent formatting of semantic convention enums. ([#1598](https://github.com/open-telemetry/opentelemetry-specification/pull/1598/))
Expand Down
6 changes: 0 additions & 6 deletions specification/resource/sdk.md
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,6 @@ object. A factory method is recommended to enable support for cached objects.
Required parameters:

- [`Attributes`](../common/common.md#attributes)
- [since 1.4.0] `schema_url` (optional): Specifies the Schema URL that should be
recorded in the emitted resource. If the `schema_url` parameter is unspecified
then the emitted resource will have the Schema URL that matches the
specification version that the SDK implements.

### Merge

Expand All @@ -74,8 +70,6 @@ The resulting resource MUST have all attributes that are on any of the two input
If a key exists on both the old and updating resource, the value of the updating
resource MUST be picked (even if the updated value is empty).

The resulting resource will have the `schema_url` of the updating resource.

Required parameters:

- the old resource
Expand Down

0 comments on commit 1600ba0

Please sign in to comment.