Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Metrics export pipeline + metrics stdout exporter #341

Merged
merged 48 commits into from
Feb 11, 2020
Merged
Show file tree
Hide file tree
Changes from 41 commits
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
bbfb6f6
metrics
lzchen Dec 13, 2019
da5a9f4
implementation
lzchen Dec 17, 2019
c783e48
comments
lzchen Dec 17, 2019
88bdc57
fix tests
lzchen Dec 18, 2019
ea77627
tests
lzchen Dec 18, 2019
07e5bb5
Merge branch 'master' of https://github.com/open-telemetry/openteleme…
lzchen Dec 19, 2019
b8e4aed
fix stateful logic
lzchen Dec 19, 2019
bb814ec
batcher tests
lzchen Dec 19, 2019
2f44e84
test aggregate
lzchen Dec 19, 2019
e7c8eaa
fix lint
lzchen Dec 26, 2019
248a793
fix lint
lzchen Dec 31, 2019
4ce4ae1
fix lint
lzchen Dec 31, 2019
9be693c
fix lint
lzchen Dec 31, 2019
f0f302e
fix lint
lzchen Dec 31, 2019
8351ef9
address comments
lzchen Jan 7, 2020
4408d94
fix tests
lzchen Jan 7, 2020
9db1540
fix lint
lzchen Jan 7, 2020
cc862b9
Add setters
lzchen Jan 7, 2020
7a5a14d
add examples
lzchen Jan 7, 2020
f9fbd6d
fix lint
lzchen Jan 8, 2020
ba41d38
fix lint
lzchen Jan 8, 2020
5c2b86e
fix lint
lzchen Jan 8, 2020
4e771d6
Address comments
lzchen Jan 15, 2020
3af96b7
Merge branch 'master' of https://github.com/open-telemetry/openteleme…
lzchen Jan 27, 2020
303fefe
LabelSet change
lzchen Jan 28, 2020
fcb46aa
Remove lock implementation from aggregate abc, fix comments, rename c…
lzchen Jan 28, 2020
0ba6611
fix lint
lzchen Jan 28, 2020
35697d4
Fix lint
lzchen Jan 28, 2020
6dfa2b2
Merge branch 'master' of https://github.com/open-telemetry/openteleme…
lzchen Feb 4, 2020
9578dba
Add no-op implementations
lzchen Feb 4, 2020
f4d82e7
Fix examples
lzchen Feb 4, 2020
a7a9c54
re-add default
lzchen Feb 5, 2020
fe44402
Build
lzchen Feb 5, 2020
d011b8e
Merge branch 'master' of https://github.com/open-telemetry/openteleme…
lzchen Feb 5, 2020
6588aee
address comments
lzchen Feb 7, 2020
d99a2a3
Shutdown exporter on exit
lzchen Feb 7, 2020
1c9d44d
fix tests
lzchen Feb 7, 2020
56f68e8
fix test
lzchen Feb 7, 2020
cb51341
black
lzchen Feb 7, 2020
b1bfa38
Address comments
lzchen Feb 8, 2020
ac1aff9
Merge branch 'master' of https://github.com/open-telemetry/openteleme…
lzchen Feb 8, 2020
f135cc8
Make default meter a DefaultMeter
c24t Feb 10, 2020
897a8ba
Merge pull request #7 from c24t/fix-meter-loader-types
lzchen Feb 10, 2020
f73da8d
Fix typing
lzchen Feb 10, 2020
1619575
add sleep
lzchen Feb 10, 2020
6136987
fix units
lzchen Feb 10, 2020
08a5357
Merge branch 'master' of https://github.com/open-telemetry/openteleme…
lzchen Feb 11, 2020
5f68832
Fix lint
lzchen Feb 11, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions docs/opentelemetry.sdk.metrics.export.aggregate.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
opentelemetry.sdk.metrics.export.aggregate
==========================================

.. automodule:: opentelemetry.sdk.metrics.export.aggregate
:members:
:undoc-members:
:show-inheritance:
11 changes: 11 additions & 0 deletions docs/opentelemetry.sdk.metrics.export.batcher.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
opentelemetry.sdk.metrics.export.batcher
==========================================

.. toctree::

opentelemetry.sdk.metrics.export

.. automodule:: opentelemetry.sdk.metrics.export.batcher
:members:
:undoc-members:
:show-inheritance:
7 changes: 7 additions & 0 deletions docs/opentelemetry.sdk.metrics.export.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
opentelemetry.sdk.metrics.export
==========================================

.. automodule:: opentelemetry.sdk.metrics.export
:members:
:undoc-members:
:show-inheritance:
8 changes: 8 additions & 0 deletions docs/opentelemetry.sdk.metrics.rst
Original file line number Diff line number Diff line change
@@ -1,6 +1,14 @@
opentelemetry.sdk.metrics package
==========================================

Submodules
----------

.. toctree::

opentelemetry.sdk.metrics.export.aggregate
opentelemetry.sdk.metrics.export.batcher

.. automodule:: opentelemetry.sdk.metrics
:members:
:undoc-members:
Expand Down
72 changes: 72 additions & 0 deletions examples/metrics/record.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
# Copyright 2019, OpenTelemetry Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
"""
This module serves as an example for a simple application using metrics.
It demonstrates the different ways you can record metrics via the meter.
"""

from opentelemetry import metrics
from opentelemetry.sdk.metrics import Counter, Meter
from opentelemetry.sdk.metrics.export import ConsoleMetricsExporter
from opentelemetry.sdk.metrics.export.controller import PushController

# Meter is responsible for creating and recording metrics
metrics.set_preferred_meter_implementation(lambda _: Meter())
meter = metrics.meter()
# exporter to export metrics to the console
exporter = ConsoleMetricsExporter()
# controller collects metrics created from meter and exports it via the
# exporter every interval
controller = PushController(meter, exporter, 5)

# Example to show how to record using the meter
counter = meter.create_metric(
"requests",
"number of requests",
"requests",
lzchen marked this conversation as resolved.
Show resolved Hide resolved
int,
Counter,
("environment",),
)

counter2 = meter.create_metric(
"clicks", "number of clicks", "clicks", int, Counter, ("environment",)
lzchen marked this conversation as resolved.
Show resolved Hide resolved
)

# Labelsets are used to identify key-values that are associated with a specific
lzchen marked this conversation as resolved.
Show resolved Hide resolved
# metric that you want to record. These are useful for pre-aggregation and can
# be used to store custom dimensions pertaining to a metric

# The meter takes a dictionary of key value pairs
label_set = meter.get_label_set({"environment": "staging"})

# Handle usage
# You can record metrics with metric handles. Handles are created by passing in
# a labelset. A handle is essentially metric data that corresponds to a specific
# set of labels. Therefore, getting a handle using the same set of labels will
# yield the same metric handle.
counter_handle = counter.get_handle(label_set)
counter_handle.add(100)

# Direct metric usage
# You can record metrics directly using the metric instrument. You pass in a
# labelset that you would like to record for.
counter.add(25, label_set)

# Record batch usage
# You can record metrics in a batch by passing in a labelset and a sequence of
# (metric, value) pairs. The value would be recorded for each metric using the
# specified labelset for each.
meter.record_batch(label_set, [(counter, 50), (counter2, 70)])
77 changes: 77 additions & 0 deletions examples/metrics/stateful.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
# Copyright 2019, OpenTelemetry Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
"""
This module serves as an example for a simple application using metrics
Examples show how to recording affects the collection of metrics to be exported
"""
import time

from opentelemetry import metrics
from opentelemetry.sdk.metrics import Counter, Meter
from opentelemetry.sdk.metrics.export import ConsoleMetricsExporter
from opentelemetry.sdk.metrics.export.batcher import UngroupedBatcher
from opentelemetry.sdk.metrics.export.controller import PushController

# Batcher used to collect all created metrics from meter ready for exporting
# Pass in true/false to indicate whether the batcher is stateful. True
# indicates the batcher computes checkpoints from over the process lifetime.
# False indicates the batcher computes checkpoints which describe the updates
# of a single collection period (deltas)
batcher = UngroupedBatcher(True)
# If a batcher is not provded, a default batcher is used
# Meter is responsible for creating and recording metrics
metrics.set_preferred_meter_implementation(lambda _: Meter(batcher))
meter = metrics.meter()
# exporter to export metrics to the console
exporter = ConsoleMetricsExporter()
# controller collects metrics created from meter and exports it via the
# exporter every interval
controller = PushController(meter, exporter, 5)

counter = meter.create_metric(
"requests",
"number of requests",
"requests",
lzchen marked this conversation as resolved.
Show resolved Hide resolved
int,
Counter,
("environment",),
)

counter2 = meter.create_metric(
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why is the "stateful" example different from the "non-stateful" one in ways other than batcher state?

If the goal is to compare stateful and non-stateful batchers, what do you think about combining these examples to show only that?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Combining the two examples will require metrics to load a different implementation of Meter since a Meter instance is initialized with a certain Batcher. The second example can be run after the first sequentially but the example file would get huge and quite confusing to read. I'd prefer to separate the two examples.

"clicks", "number of clicks", "clicks", int, Counter, ("environment",)
lzchen marked this conversation as resolved.
Show resolved Hide resolved
)

# Labelsets are used to identify key-values that are associated with a specific
# metric that you want to record. These are useful for pre-aggregation and can
# be used to store custom dimensions pertaining to a metric
label_set = meter.get_label_set({"environment": "staging"})
label_set2 = meter.get_label_set({"environment": "testing"})

counter.add(25, label_set)
# We sleep for 5 seconds, exported value should be 25
time.sleep(5)

counter.add(50, label_set)
# exported value should be 75
time.sleep(5)

counter.add(35, label_set2)
# should be two exported values 75 and 35, one for each labelset
time.sleep(5)

counter2.add(5, label_set)
# should be three exported values, labelsets can be reused for different
# metrics but will be recorded seperately, 75, 35 and 5
time.sleep(5)
62 changes: 62 additions & 0 deletions examples/metrics/stateless.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
# Copyright 2019, OpenTelemetry Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
"""
This module serves as an example for a simple application using metrics
Examples show how to recording affects the collection of metrics to be exported
"""
import time

from opentelemetry import metrics
from opentelemetry.sdk.metrics import Counter, Meter
from opentelemetry.sdk.metrics.export import ConsoleMetricsExporter
from opentelemetry.sdk.metrics.export.batcher import UngroupedBatcher
from opentelemetry.sdk.metrics.export.controller import PushController

# Batcher used to collect all created metrics from meter ready for exporting
# Pass in false for non-stateful batcher. Indicates the batcher computes
# checkpoints which describe the updates of a single collection period (deltas)
batcher = UngroupedBatcher(False)
# Meter is responsible for creating and recording metrics
metrics.set_preferred_meter_implementation(lambda _: Meter(batcher))
meter = metrics.meter()
# exporter to export metrics to the console
exporter = ConsoleMetricsExporter()
# controller collects metrics created from meter and exports it via the
# exporter every interval
controller = PushController(meter, exporter, 5)

counter = meter.create_metric(
"requests",
"number of requests",
"requests",
lzchen marked this conversation as resolved.
Show resolved Hide resolved
int,
Counter,
("environment",),
)

# Labelsets are used to identify key-values that are associated with a specific
# metric that you want to record. These are useful for pre-aggregation and can
# be used to store custom dimensions pertaining to a metric
label_set = meter.get_label_set({"environment": "staging"})

counter.add(25, label_set)
# We sleep for 5 seconds, exported value should be 25
time.sleep(5)

counter.add(50, label_set)
# exported value should be 50 due to non-stateful batcher
time.sleep(20)

# Following exported values would be 0
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,12 @@

from opentelemetry import metrics
from opentelemetry.sdk.metrics import Counter, Meter
from opentelemetry.sdk.metrics.export import ConsoleMetricsExporter
from opentelemetry.sdk.metrics.export.batcher import UngroupedBatcher
from opentelemetry.sdk.metrics.export.controller import PushController

metrics.set_preferred_meter_implementation(lambda _: Meter())
batcher = UngroupedBatcher(True)
metrics.set_preferred_meter_implementation(lambda _: Meter(batcher))
meter = metrics.meter()
counter = meter.create_metric(
"available memory",
Expand All @@ -33,14 +37,14 @@
label_set = meter.get_label_set({"environment": "staging"})

# Direct metric usage
counter.add(label_set, 25)
counter.add(25, label_set)

# Handle usage
counter_handle = counter.get_handle(label_set)
counter_handle.add(100)

# Record batch usage
meter.record_batch(label_set, [(counter, 50)])
print(counter_handle.data)

# TODO: exporters
exporter = ConsoleMetricsExporter()
lzchen marked this conversation as resolved.
Show resolved Hide resolved
controller = PushController(meter, exporter, 5)
4 changes: 2 additions & 2 deletions ext/opentelemetry-ext-jaeger/tests/test_jaeger_exporter.py
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ def test_translate_to_jaeger(self):
vLong=StatusCanonicalCode.OK.value,
),
jaeger.Tag(
key="status.message", vType=jaeger.TagType.STRING, vStr=None,
key="status.message", vType=jaeger.TagType.STRING, vStr=None
),
jaeger.Tag(
key="span.kind",
Expand Down Expand Up @@ -246,7 +246,7 @@ def test_translate_to_jaeger(self):
vStr=trace_api.SpanKind.CLIENT.name,
),
jaeger.Tag(
key="error", vType=jaeger.TagType.BOOL, vBool=True,
key="error", vType=jaeger.TagType.BOOL, vBool=True
),
],
references=[
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -101,10 +101,7 @@ def export(self, spans: Sequence[Span]) -> SpanExportResult:

def _translate_to_zipkin(self, spans: Sequence[Span]):

local_endpoint = {
"serviceName": self.service_name,
"port": self.port,
}
local_endpoint = {"serviceName": self.service_name, "port": self.port}

if self.ipv4 is not None:
local_endpoint["ipv4"] = self.ipv4
Expand Down
9 changes: 2 additions & 7 deletions ext/opentelemetry-ext-zipkin/tests/test_zipkin_exporter.py
Original file line number Diff line number Diff line change
Expand Up @@ -114,9 +114,7 @@ def test_export(self):
)

span_context = trace_api.SpanContext(
trace_id,
span_id,
trace_options=TraceOptions(TraceOptions.SAMPLED),
trace_id, span_id, trace_options=TraceOptions(TraceOptions.SAMPLED)
)
parent_context = trace_api.SpanContext(trace_id, parent_id)
other_context = trace_api.SpanContext(trace_id, other_id)
Expand Down Expand Up @@ -168,10 +166,7 @@ def test_export(self):
otel_spans[2].end(end_time=end_times[2])

service_name = "test-service"
local_endpoint = {
"serviceName": service_name,
"port": 9411,
}
local_endpoint = {"serviceName": service_name, "port": 9411}

exporter = ZipkinSpanExporter(service_name)
expected = [
Expand Down
Loading