Skip to content

Commit 8a7a208

Browse files
authored
Merge branch 'master' into majorgreys/pr440
2 parents c60f32a + 9e20f74 commit 8a7a208

File tree

19 files changed

+1425
-236
lines changed

19 files changed

+1425
-236
lines changed

.flake8

+1
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,5 @@ exclude =
2020
ext/opentelemetry-ext-jaeger/build/*
2121
docs/examples/opentelemetry-example-app/src/opentelemetry_example_app/grpc/gen/
2222
docs/examples/opentelemetry-example-app/build/*
23+
opentelemetry-proto/build/*
2324
opentelemetry-proto/src/opentelemetry/proto/

.gitattributes

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# tells github that proto code is generated
2+
opentelemetry-proto/src/**/*_pb2*.py* linguist-generated=true

dev-requirements.txt

+3
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,6 @@ sphinx-autodoc-typehints~=1.10.2
99
pytest!=5.2.3
1010
pytest-cov>=2.8
1111
readme-renderer~=24.0
12+
grpcio-tools==1.29.0
13+
mypy-protobuf==1.21
14+
protobuf==3.12.2

ext/opentelemetry-ext-otlp/src/opentelemetry/ext/otlp/__init__.py

+8-1
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,17 @@
3030
3131
from opentelemetry import trace
3232
from opentelemetry.ext.otlp.trace_exporter import OTLPSpanExporter
33+
from opentelemetry.sdk.resources import Resource
3334
from opentelemetry.sdk.trace import TracerProvider
3435
from opentelemetry.sdk.trace.export import BatchExportSpanProcessor
3536
36-
trace.set_tracer_provider(TracerProvider())
37+
# Resource can be required for some backends, e.g. Jaeger
38+
# If resource wouldn't be set - traces wouldn't appears in Jaeger
39+
resource = Resource(labels=labels={
40+
"service.name": "service"
41+
})
42+
43+
trace.set_tracer_provider(TracerProvider(resource=resource)))
3744
tracer = trace.get_tracer(__name__)
3845
3946
otlp_exporter = OTLPSpanExporter(endpoint="localhost:55678")

opentelemetry-proto/CHANGELOG.md

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

33
## Unreleased
44

5+
- Regenerate proto code and add pyi stubs
6+
([#823](https://github.com/open-telemetry/opentelemetry-python/pull/823))
7+
58
## 0.9b0
69

710
Released 2020-06-10

opentelemetry-proto/MANIFEST.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
graft gen
1+
graft src
22
graft tests
33
global-exclude *.pyc
44
global-exclude *.pyo

opentelemetry-proto/src/opentelemetry/proto/collector/metrics/v1/metrics_service_pb2.pyi

+72
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

opentelemetry-proto/src/opentelemetry/proto/collector/trace/v1/trace_service_pb2.pyi

+72
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

opentelemetry-proto/src/opentelemetry/proto/common/v1/common_pb2.py

+14-23
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)