Skip to content
This repository was archived by the owner on Nov 16, 2023. It is now read-only.

Commit a66b8d9

Browse files
authored
Merge pull request #121 from lzchen/release2
2 parents 7f892e8 + 52b2eb6 commit a66b8d9

35 files changed

+350
-397
lines changed

.travis.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ dist: xenial
33
language: python
44

55
python:
6-
- '3.4'
76
- '3.5'
87
- '3.6'
98
- '3.7'

azure_monitor/CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,14 @@
22

33
## Unreleased
44

5+
## 0.5b.0
6+
Released 2020-09-24
7+
8+
- Change epoch for live metrics
9+
([#115](https://github.com/microsoft/opentelemetry-azure-monitor-python/pull/115))
10+
- Dropping support for Python 3.4
11+
([#117](https://github.com/microsoft/opentelemetry-azure-monitor-python/pull/117))
12+
513
## 0.4b.0
614
Released 2020-06-29
715

azure_monitor/README.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
1-
# OpenTelemetry Azure Monitor SDKs and Exporters
1+
# OpenTelemetry Azure Monitor SDKs and Exporters (Private preview)
22

33
[![PyPI version](https://badge.fury.io/py/opentelemetry-azure-monitor.svg)](https://badge.fury.io/py/opentelemetry-azure-monitor)
44

5+
The OpenTelemetry Azure Monitor SDK and exporter are in private preview. They are not recommended for a production environment.
6+
57
## Installation
68

79
```sh

azure_monitor/examples/metrics/auto_collector.py

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,11 @@
55
from opentelemetry.sdk.trace import TracerProvider
66

77
from azure_monitor import AzureMonitorMetricsExporter
8-
from azure_monitor.sdk.auto_collection import (
9-
AutoCollection,
10-
AzureMetricsSpanProcessor,
11-
)
8+
from azure_monitor.sdk.auto_collection import AutoCollection
129

1310
# Add Span Processor to get metrics about traces
1411
trace.set_tracer_provider(TracerProvider())
1512
tracer = trace.get_tracer_provider().get_tracer(__name__)
16-
span_processor = AzureMetricsSpanProcessor()
17-
trace.get_tracer_provider().add_span_processor(span_processor)
1813

1914
metrics.set_meter_provider(MeterProvider())
2015
meter = metrics.get_meter(__name__)
@@ -25,9 +20,7 @@
2520
testing_label_set = {"environment": "testing"}
2621

2722
# Automatically collect standard metrics
28-
auto_collection = AutoCollection(
29-
meter=meter, labels=testing_label_set, span_processor=span_processor
30-
)
23+
auto_collection = AutoCollection(meter=meter, labels=testing_label_set)
3124

3225
metrics.get_meter_provider().start_pipeline(meter, exporter, 2)
3326

azure_monitor/examples/metrics/observer.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,4 +48,4 @@ def get_ram_usage_callback(observer):
4848
label_keys=(),
4949
)
5050

51-
input("Metrics will be printed soon. Press a key to finish...\n")
51+
input("Press any key to exit...")

azure_monitor/examples/metrics/simple.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
unit="1",
1919
value_type=int,
2020
metric_type=Counter,
21-
label_keys=("environment",),
2221
)
2322

2423
testing_labels = {"environment": "testing"}

azure_monitor/examples/traces/client.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# pylint: disable=no-name-in-module
66
import requests
77
from opentelemetry import trace
8-
from opentelemetry.ext.requests import RequestsInstrumentor
8+
from opentelemetry.instrumentation.requests import RequestsInstrumentor
99
from opentelemetry.sdk.trace import TracerProvider
1010
from opentelemetry.sdk.trace.export import BatchExportSpanProcessor
1111

@@ -21,6 +21,6 @@
2121
)
2222
trace.get_tracer_provider().add_span_processor(span_processor)
2323

24-
response = requests.get(url="http://127.0.0.1:8080/")
24+
response = requests.get(url="http://example.com/")
2525

2626
input("Press any key to exit...")

azure_monitor/examples/traces/request.py

Lines changed: 0 additions & 28 deletions
This file was deleted.

azure_monitor/examples/traces/server.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
# pylint: disable=no-name-in-module
66
import requests
77
from opentelemetry import trace
8-
from opentelemetry.ext.flask import FlaskInstrumentor
9-
from opentelemetry.ext.requests import RequestsInstrumentor
8+
from opentelemetry.instrumentation.flask import FlaskInstrumentor
9+
from opentelemetry.instrumentation.requests import RequestsInstrumentor
1010
from opentelemetry.sdk.trace import TracerProvider
1111
from opentelemetry.sdk.trace.export import BatchExportSpanProcessor
1212

azure_monitor/setup.cfg

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,20 +16,19 @@ classifiers =
1616
License :: OSI Approved :: MIT License
1717
Programming Language :: Python
1818
Programming Language :: Python :: 3
19-
Programming Language :: Python :: 3.4
2019
Programming Language :: Python :: 3.5
2120
Programming Language :: Python :: 3.6
2221
Programming Language :: Python :: 3.7
2322
Programming Language :: Python :: 3.8
2423

2524
[options]
26-
python_requires = >=3.4
25+
python_requires = >=3.5
2726
package_dir=
2827
=src
2928
packages=find_namespace:
3029
install_requires =
31-
opentelemetry-api == 0.10b0
32-
opentelemetry-sdk == 0.10b0
30+
opentelemetry-api == 0.13b0
31+
opentelemetry-sdk == 0.13b0
3332
psutil >= 5.6.3
3433
requests ~= 2.0
3534

0 commit comments

Comments
 (0)