Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit ea1c4c0

Browse filesBrowse files
ymotongpooymotongpoo
authored
trace: Update OpenTelemetry dependency (GoogleCloudPlatform#5696)
* Update OpenTelemetry package versions close to the latest * Remove unused packages from requirements.txt * Add some lines to follow the updated library interfaces ## Description Fixes GoogleCloudPlatform#5695 and replace GoogleCloudPlatform#5662. Note: It's a good idea to open an issue first for discussion. ## Checklist - [X] I have followed [Sample Guidelines from AUTHORING_GUIDE.MD](https://github.com/GoogleCloudPlatform/python-docs-samples/blob/master/AUTHORING_GUIDE.md) - [X] README is updated to include [all relevant information](https://github.com/GoogleCloudPlatform/python-docs-samples/blob/master/AUTHORING_GUIDE.md#readme-file) - [X] **Tests** pass: `nox -s py-3.6` (see [Test Environment Setup](https://github.com/GoogleCloudPlatform/python-docs-samples/blob/master/AUTHORING_GUIDE.md#test-environment-setup)) - [X] **Lint** pass: `nox -s lint` (see [Test Environment Setup](https://github.com/GoogleCloudPlatform/python-docs-samples/blob/master/AUTHORING_GUIDE.md#test-environment-setup)) - [ ] These samples need a new **API enabled** in testing projects to pass (let us know which ones) - [ ] These samples need a new/updated **env vars** in testing projects set to pass (let us know which ones) - [X] Please **merge** this PR for me once it is approved. - [ ] This sample adds a new sample directory, and I updated the [CODEOWNERS file](https://github.com/GoogleCloudPlatform/python-docs-samples/blob/master/.github/CODEOWNERS) with the codeowners for this sample
1 parent 6845e88 commit ea1c4c0
Copy full SHA for ea1c4c0

File tree

Expand file treeCollapse file tree

3 files changed

+11
-15
lines changed
Filter options
Expand file treeCollapse file tree

3 files changed

+11
-15
lines changed

‎trace/cloud-trace-demo-app-opentelemetry/app/app.py

Copy file name to clipboardExpand all lines: trace/cloud-trace-demo-app-opentelemetry/app/app.py
+6-4Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,23 +19,26 @@
1919

2020
# [START trace_demo_imports]
2121
import flask
22-
23-
from opentelemetry import trace
22+
from opentelemetry import propagators, trace
2423
from opentelemetry.exporter.cloud_trace import CloudTraceSpanExporter
24+
from opentelemetry.instrumentation.flask import FlaskInstrumentor
2525
from opentelemetry.sdk.trace import TracerProvider
2626
from opentelemetry.sdk.trace.export import SimpleExportSpanProcessor
27+
from opentelemetry.tools.cloud_trace_propagator import CloudTraceFormatPropagator
2728

2829
# [END trace_demo_imports]
2930

3031
app = flask.Flask(__name__)
32+
FlaskInstrumentor().instrument_app(app)
3133

3234

3335
def configure_exporter(exporter):
3436
trace.set_tracer_provider(TracerProvider())
35-
3637
trace.get_tracer_provider().add_span_processor(SimpleExportSpanProcessor(exporter))
38+
propagators.set_global_textmap(CloudTraceFormatPropagator())
3739

3840

41+
configure_exporter(CloudTraceSpanExporter())
3942
tracer = trace.get_tracer(__name__)
4043

4144

@@ -54,4 +57,3 @@ def template_test():
5457

5558
if __name__ == "__main__":
5659
app.run(debug=True, host="0.0.0.0", port=8080)
57-
configure_exporter(CloudTraceSpanExporter())

‎trace/cloud-trace-demo-app-opentelemetry/app/app_test.py

Copy file name to clipboardExpand all lines: trace/cloud-trace-demo-app-opentelemetry/app/app_test.py
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414
"""
15-
A sample app demonstrating Stackdriver Trace
15+
A sample app demonstrating Google Cloud Trace
1616
"""
1717
import mock
1818

‎trace/cloud-trace-demo-app-opentelemetry/app/requirements.txt

Copy file name to clipboard
+4-10Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,8 @@
11
Flask==1.1.2
2-
opentelemetry-api==0.8b0
3-
opentelemetry-auto-instrumentation==0.8b0
4-
opentelemetry-exporter-cloud-trace==0.9b0
5-
opentelemetry-ext-flask==0.8b0
6-
opentelemetry-ext-grpc==0.8b0
7-
opentelemetry-ext-jaeger==0.8b0
8-
opentelemetry-ext-requests==0.8b0
9-
opentelemetry-ext-wsgi==0.8b0
10-
opentelemetry-sdk==0.8b0
11-
grpcio==1.36.1
2+
opentelemetry-exporter-google-cloud==0.18b0
3+
opentelemetry-tools-google-cloud==0.18b0
4+
opentelemetry-instrumentation-flask==0.17b0
5+
grpcio==1.37.0
126
httpretty==1.0.5
137
google-cloud-monitoring==1.1.0
148
google-cloud-trace==0.24.0

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.