Skip to content

Commit 50cd5c7

Browse files
author
alrex
authored
Merge branch 'master' into issue_1104
2 parents f17dc6d + 8cc9260 commit 50cd5c7

File tree

38 files changed

+417
-135
lines changed

38 files changed

+417
-135
lines changed

Diff for: ‎.github/workflows/test.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ env:
1010
# Otherwise, set variable to the commit of your branch on
1111
# opentelemetry-python-contrib which is compatible with these Core repo
1212
# changes.
13-
CONTRIB_REPO_SHA: master
13+
CONTRIB_REPO_SHA: bcec49cf2eccf8da66c9e63b9836ea8a20516efc
1414

1515
jobs:
1616
build:

Diff for: ‎docs/examples/error_hander/error_handler_0/setup.cfg

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ package_dir=
3636
=src
3737
packages=find_namespace:
3838
install_requires =
39-
opentelemetry-sdk == 0.16.dev0
39+
opentelemetry-sdk == 0.17.dev0
4040

4141
[options.packages.find]
4242
where = src

Diff for: ‎docs/examples/error_hander/error_handler_0/src/error_handler_0/version.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
__version__ = "0.16.dev0"
15+
__version__ = "0.17.dev0"

Diff for: ‎docs/examples/error_hander/error_handler_1/setup.cfg

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ package_dir=
3636
=src
3737
packages=find_namespace:
3838
install_requires =
39-
opentelemetry-sdk == 0.16.dev0
39+
opentelemetry-sdk == 0.17.dev0
4040

4141
[options.packages.find]
4242
where = src

Diff for: ‎docs/examples/error_hander/error_handler_1/src/error_handler_1/version.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
__version__ = "0.16.dev0"
15+
__version__ = "0.17.dev0"

Diff for: ‎exporter/opentelemetry-exporter-jaeger/setup.cfg

+2-2
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ package_dir=
4040
packages=find_namespace:
4141
install_requires =
4242
thrift >= 0.10.0
43-
opentelemetry-api == 0.16.dev0
44-
opentelemetry-sdk == 0.16.dev0
43+
opentelemetry-api == 0.17.dev0
44+
opentelemetry-sdk == 0.17.dev0
4545

4646
[options.packages.find]
4747
where = src

Diff for: ‎exporter/opentelemetry-exporter-jaeger/src/opentelemetry/exporter/jaeger/version.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@
1313
# See the License for the specific language governing permissions and
1414
# limitations under the License.
1515

16-
__version__ = "0.16.dev0"
16+
__version__ = "0.17.dev0"

Diff for: ‎exporter/opentelemetry-exporter-opencensus/CHANGELOG.md

+4
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22

33
## Unreleased
44

5+
## Version 0.16b0
6+
7+
Released 2020-11-25
8+
59
- Update protobuf versions
610
([#1356](https://github.com/open-telemetry/opentelemetry-python/pull/1356))
711

Diff for: ‎exporter/opentelemetry-exporter-opencensus/setup.cfg

+2-2
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ packages=find_namespace:
4141
install_requires =
4242
grpcio >= 1.0.0, < 2.0.0
4343
opencensus-proto >= 0.1.0, < 1.0.0
44-
opentelemetry-api == 0.16.dev0
45-
opentelemetry-sdk == 0.16.dev0
44+
opentelemetry-api == 0.17.dev0
45+
opentelemetry-sdk == 0.17.dev0
4646
protobuf >= 3.13.0
4747

4848
[options.packages.find]

Diff for: ‎exporter/opentelemetry-exporter-opencensus/src/opentelemetry/exporter/opencensus/version.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
__version__ = "0.16.dev0"
15+
__version__ = "0.17.dev0"

Diff for: ‎exporter/opentelemetry-exporter-otlp/CHANGELOG.md

+9
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,15 @@
22

33
## Unreleased
44

5+
- Add meter reference to observers
6+
([#1425](https://github.com/open-telemetry/opentelemetry-python/pull/1425))
7+
8+
## Version 0.16b0
9+
10+
Released 2020-11-25
11+
12+
- Add instrumentation library name and version to OTLP exported metrics
13+
([#1418](https://github.com/open-telemetry/opentelemetry-python/pull/1418))
514
- Change temporality for Counter and UpDownCounter
615
([#1384](https://github.com/open-telemetry/opentelemetry-python/pull/1384))
716
- Add Gzip compression for exporter

Diff for: ‎exporter/opentelemetry-exporter-otlp/setup.cfg

+3-3
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@ packages=find_namespace:
4141
install_requires =
4242
grpcio >= 1.0.0, < 2.0.0
4343
googleapis-common-protos ~= 1.52.0
44-
opentelemetry-api == 0.16.dev0
45-
opentelemetry-sdk == 0.16.dev0
46-
opentelemetry-proto == 0.16.dev0
44+
opentelemetry-api == 0.17.dev0
45+
opentelemetry-sdk == 0.17.dev0
46+
opentelemetry-proto == 0.17.dev0
4747
backoff ~= 1.10.0
4848

4949
[options.extras_require]

Diff for: ‎exporter/opentelemetry-exporter-otlp/src/opentelemetry/exporter/otlp/metrics_exporter/__init__.py

+17-2
Original file line numberDiff line numberDiff line change
@@ -304,9 +304,11 @@ def _translate_data(
304304
)
305305
argument = type_class[value_type]["gauge"]["argument"]
306306

307-
sdk_resource_instrumentation_library_metrics[
307+
instrumentation_library_metrics = sdk_resource_instrumentation_library_metrics[
308308
export_record.resource
309-
].metrics.append(
309+
]
310+
311+
instrumentation_library_metrics.metrics.append(
310312
OTLPMetric(
311313
**{
312314
"name": export_record.instrument.name,
@@ -317,6 +319,19 @@ def _translate_data(
317319
)
318320
)
319321

322+
instrumentation_library_metrics.instrumentation_library.name = (
323+
export_record.instrument.meter.instrumentation_info.name
324+
)
325+
326+
version = (
327+
export_record.instrument.meter.instrumentation_info.version
328+
)
329+
330+
if version:
331+
(
332+
instrumentation_library_metrics.instrumentation_library.version
333+
) = version
334+
320335
return ExportMetricsServiceRequest(
321336
resource_metrics=_get_resource_data(
322337
sdk_resource_instrumentation_library_metrics,

Diff for: ‎exporter/opentelemetry-exporter-otlp/src/opentelemetry/exporter/otlp/trace_exporter/__init__.py

-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
"""OTLP Span Exporter"""
1515

1616
import logging
17-
import os
1817
from typing import Optional, Sequence
1918

2019
from grpc import ChannelCredentials

Diff for: ‎exporter/opentelemetry-exporter-otlp/src/opentelemetry/exporter/otlp/version.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
__version__ = "0.16.dev0"
15+
__version__ = "0.17.dev0"

0 commit comments

Comments
 (0)