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.

Sign up for GitHub

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

Refactor metric format #2658

Merged
merged 16 commits into from
May 12, 2022
Merged

Refactor metric format #2658

Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
e01077a
Refactor metric format
ocelotl May 9, 2022
a828fc1
Do not overwrite pb2_scope_metrics
ocelotl May 11, 2022
4b8f7f4
Refactor for loops
ocelotl May 11, 2022
951810d
Add multiple scope test case
ocelotl May 11, 2022
002c74e
Fix interfaces
ocelotl May 11, 2022
bc370f2
Fix docs
ocelotl May 11, 2022
d6d3db6
Update exporter/opentelemetry-exporter-prometheus/src/opentelemetry/e…
ocelotl May 12, 2022
a58bdad
Fix lint
ocelotl May 12, 2022
71ba28b
Remove resource check
ocelotl May 12, 2022
436dfff
Remove instrumentation_scope check
ocelotl May 12, 2022
6af9b2b
Group metrics by instrumentation scopes in the SDK
ocelotl May 12, 2022
9e13d7a
Remove label_keyss
ocelotl May 12, 2022
93f853b
Use strings instead of mocks
ocelotl May 12, 2022
5dee4fb
Return generator instead of a list
ocelotl May 12, 2022
2175593
Fix lint
ocelotl May 12, 2022
4d534a4
Rename variables
ocelotl May 12, 2022
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
Prev Previous commit
Next Next commit
Remove instrumentation_scope check
  • Loading branch information
@ocelotl
ocelotl committed May 12, 2022
commit 436dfff9cb18928f287db51dbea37ab2d4503621
22 changes: 9 additions & 13 deletions ...r-otlp-proto-grpc/src/opentelemetry/exporter/otlp/proto/grpc/_metric_exporter/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,20 +105,16 @@ def _translate_data(
instrumentation_scope_pb2_scope_metrics
):

if instrumentation_scope is None:
instrumentation_scope_pb2_scope_metrics[
None
] = pb2.ScopeMetrics()

else:
instrumentation_scope_pb2_scope_metrics[
instrumentation_scope
] = pb2.ScopeMetrics(
scope=InstrumentationScope(
name=instrumentation_scope.name,
version=instrumentation_scope.version,
)
# instrumentation_scope comes from the meter, it is never
# None.
instrumentation_scope_pb2_scope_metrics[
instrumentation_scope
] = pb2.ScopeMetrics(
scope=InstrumentationScope(
name=instrumentation_scope.name,
version=instrumentation_scope.version,
)
)

pb2_scope_metrics = instrumentation_scope_pb2_scope_metrics[
instrumentation_scope
Expand Down