Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,11 @@
_QUICKPULSE_ETAG_HEADER_NAME,
_QUICKPULSE_SUBSCRIBED_HEADER_NAME,
)
from azure.monitor.opentelemetry.exporter._quickpulse._generated._configuration import QuickpulseClientConfiguration
from azure.monitor.opentelemetry.exporter._quickpulse._generated._client import QuickpulseClient
from azure.monitor.opentelemetry.exporter._quickpulse._generated.models import MonitoringDataPoint
from azure.monitor.opentelemetry.exporter._quickpulse._generated.livemetrics._configuration import (
LiveMetricsClientConfiguration,
)
from azure.monitor.opentelemetry.exporter._quickpulse._generated.livemetrics._client import LiveMetricsClient
from azure.monitor.opentelemetry.exporter._quickpulse._generated.livemetrics.models import MonitoringDataPoint
from azure.monitor.opentelemetry.exporter._quickpulse._filter import _update_filter_configuration
from azure.monitor.opentelemetry.exporter._quickpulse._policy import _QuickpulseRedirectPolicy
from azure.monitor.opentelemetry.exporter._quickpulse._state import (
Expand Down Expand Up @@ -96,7 +98,7 @@ def __init__(self, **kwargs: Any) -> None:
self._instrumentation_key = parsed_connection_string.instrumentation_key
self._credential = kwargs.get("credential")
self.aad_audience = parsed_connection_string.aad_audience
config = QuickpulseClientConfiguration(credential=self._credential) # type: ignore
config = LiveMetricsClientConfiguration(credential=self._credential) # type: ignore
qp_redirect_policy = _QuickpulseRedirectPolicy(permit_redirects=False)
policies = [
# Custom redirect policy for QP
Expand All @@ -110,7 +112,7 @@ def __init__(self, **kwargs: Any) -> None:
# Explicitly disabling to avoid tracing live metrics calls
# DistributedTracingPolicy(),
]
self._client = QuickpulseClient(
self._client = LiveMetricsClient(
credential=self._credential, endpoint=self._live_endpoint, policies=policies # type: ignore
)
# Create a weakref of the client to the redirect policy so the endpoint can be
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
from dataclasses import fields
from typing import Any, Dict, List

from azure.monitor.opentelemetry.exporter._quickpulse._generated.models import (
from azure.monitor.opentelemetry.exporter._quickpulse._generated.livemetrics.models import (
DerivedMetricInfo,
DocumentStreamInfo,
FilterConjunctionGroupInfo,
Expand Down Expand Up @@ -53,7 +53,7 @@ def _parse_metric_filter_configuration(config: Dict[str, Any]) -> None:
# Process metric filter configuration
metric_infos: Dict[TelemetryType, List[DerivedMetricInfo]] = {}
for metric_info_dict in config.get("Metrics", []):
metric_info = DerivedMetricInfo.from_dict(metric_info_dict)
metric_info = DerivedMetricInfo(metric_info_dict)
# Skip duplicate ids
if metric_info.id in seen_ids:
continue
Expand All @@ -76,7 +76,7 @@ def _parse_document_filter_configuration(config: Dict[str, Any]) -> None:
# Process document filter configuration
doc_infos: Dict[TelemetryType, Dict[str, List[FilterConjunctionGroupInfo]]] = {}
for doc_stream_dict in config.get("DocumentStreams", []):
doc_stream = DocumentStreamInfo.from_dict(doc_stream_dict)
doc_stream = DocumentStreamInfo(doc_stream_dict)
for doc_filter_group in doc_stream.document_filter_groups:
if not _validate_document_filter_group_info(doc_filter_group):
continue
Expand Down
Original file line number Diff line number Diff line change
@@ -1,23 +1,6 @@
# coding=utf-8
# --------------------------------------------------------------------------
# Copyright (c) Microsoft Corporation. All rights reserved.
# Licensed under the MIT License. See License.txt in the project root for license information.
# Code generated by Microsoft (R) AutoRest Code Generator.
# Code generated by Microsoft (R) Python Code Generator.
# Changes may cause incorrect behavior and will be lost if the code is regenerated.
# --------------------------------------------------------------------------

from ._client import QuickpulseClient

try:
from ._patch import __all__ as _patch_all
from ._patch import * # pylint: disable=unused-wildcard-import
except ImportError:
_patch_all = []
from ._patch import patch_sdk as _patch_sdk

__all__ = [
"QuickpulseClient",
]
__all__.extend([p for p in _patch_all if p not in __all__])

_patch_sdk()
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"apiVersion": "2024-04-01-preview"
}

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
{
"CrossLanguagePackageId": "Azure.Monitor.LiveMetrics",
"CrossLanguageDefinitionId": {
"livemetrics.models.CollectionConfigurationError": "Azure.Monitor.LiveMetrics.CollectionConfigurationError",
"livemetrics.models.CollectionConfigurationInfo": "Azure.Monitor.LiveMetrics.CollectionConfigurationInfo",
"livemetrics.models.DerivedMetricInfo": "Azure.Monitor.LiveMetrics.DerivedMetricInfo",
"livemetrics.models.DocumentFilterConjunctionGroupInfo": "Azure.Monitor.LiveMetrics.DocumentFilterConjunctionGroupInfo",
"livemetrics.models.DocumentIngress": "Azure.Monitor.LiveMetrics.DocumentIngress",
"livemetrics.models.DocumentStreamInfo": "Azure.Monitor.LiveMetrics.DocumentStreamInfo",
"livemetrics.models.Event": "Azure.Monitor.LiveMetrics.Event",
"livemetrics.models.Exception": "Azure.Monitor.LiveMetrics.Exception",
"livemetrics.models.FilterConjunctionGroupInfo": "Azure.Monitor.LiveMetrics.FilterConjunctionGroupInfo",
"livemetrics.models.FilterInfo": "Azure.Monitor.LiveMetrics.FilterInfo",
"livemetrics.models.KeyValuePairStringString": "Azure.Monitor.LiveMetrics.KeyValuePairStringString",
"livemetrics.models.MetricPoint": "Azure.Monitor.LiveMetrics.MetricPoint",
"livemetrics.models.MonitoringDataPoint": "Azure.Monitor.LiveMetrics.MonitoringDataPoint",
"livemetrics.models.ProcessCpuData": "Azure.Monitor.LiveMetrics.ProcessCpuData",
"livemetrics.models.QuotaConfigurationInfo": "Azure.Monitor.LiveMetrics.QuotaConfigurationInfo",
"livemetrics.models.RemoteDependency": "Azure.Monitor.LiveMetrics.RemoteDependency",
"livemetrics.models.Request": "Azure.Monitor.LiveMetrics.Request",
"livemetrics.models.ServiceError": "Azure.Monitor.LiveMetrics.ServiceError",
"livemetrics.models.Trace": "Azure.Monitor.LiveMetrics.Trace",
"livemetrics.models.PredicateType": "Azure.Monitor.LiveMetrics.PredicateType",
"livemetrics.models.AggregationType": "Azure.Monitor.LiveMetrics.AggregationType",
"livemetrics.models.TelemetryType": "Azure.Monitor.LiveMetrics.TelemetryType",
"livemetrics.models.DocumentType": "Azure.Monitor.LiveMetrics.DocumentType",
"livemetrics.models.CollectionConfigurationErrorType": "Azure.Monitor.LiveMetrics.CollectionConfigurationErrorType",
"livemetrics.LiveMetricsClient.is_subscribed": "Azure.Monitor.LiveMetrics.isSubscribed",
"livemetrics.aio.LiveMetricsClient.is_subscribed": "Azure.Monitor.LiveMetrics.isSubscribed",
"livemetrics.LiveMetricsClient.publish": "Azure.Monitor.LiveMetrics.publish",
"livemetrics.aio.LiveMetricsClient.publish": "Azure.Monitor.LiveMetrics.publish"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
# coding=utf-8
# --------------------------------------------------------------------------
# Copyright (c) Microsoft Corporation. All rights reserved.
# Licensed under the MIT License. See License.txt in the project root for license information.
# Code generated by Microsoft (R) Python Code Generator.
# Changes may cause incorrect behavior and will be lost if the code is regenerated.
# --------------------------------------------------------------------------
# pylint: disable=wrong-import-position

from typing import TYPE_CHECKING

if TYPE_CHECKING:
from ._patch import * # pylint: disable=unused-wildcard-import

from ._client import LiveMetricsClient # type: ignore
from ._version import VERSION

__version__ = VERSION

try:
from ._patch import __all__ as _patch_all
from ._patch import *
except ImportError:
_patch_all = []
from ._patch import patch_sdk as _patch_sdk

__all__ = [
"LiveMetricsClient",
]
__all__.extend([p for p in _patch_all if p not in __all__]) # pyright: ignore

_patch_sdk()
Original file line number Diff line number Diff line change
Expand Up @@ -2,40 +2,51 @@
# --------------------------------------------------------------------------
# Copyright (c) Microsoft Corporation. All rights reserved.
# Licensed under the MIT License. See License.txt in the project root for license information.
# Code generated by Microsoft (R) AutoRest Code Generator.
# Code generated by Microsoft (R) Python Code Generator.
# Changes may cause incorrect behavior and will be lost if the code is regenerated.
# --------------------------------------------------------------------------

from copy import deepcopy
from typing import Any, TYPE_CHECKING
from typing import Any, Optional, TYPE_CHECKING
from typing_extensions import Self

from azure.core import PipelineClient
from azure.core.pipeline import policies
from azure.core.rest import HttpRequest, HttpResponse

from . import models as _models
from ._configuration import QuickpulseClientConfiguration
from ._operations import QuickpulseClientOperationsMixin
from ._serialization import Deserializer, Serializer
from ._configuration import LiveMetricsClientConfiguration
from ._operations import _LiveMetricsClientOperationsMixin
from ._utils.serialization import Deserializer, Serializer

if TYPE_CHECKING:
# pylint: disable=unused-import,ungrouped-imports
from azure.core.credentials import TokenCredential


class QuickpulseClient(QuickpulseClientOperationsMixin): # pylint: disable=client-accepts-api-version-keyword
"""Quickpulse Client.
class LiveMetricsClient(_LiveMetricsClientOperationsMixin):
"""Live Metrics REST APIs.

:param credential: Credential needed for the client to connect to Azure. Required.
:param credential: Credential used to authenticate requests to the service. Default value is
None.
:type credential: ~azure.core.credentials.TokenCredential
:keyword api_version: Api Version. Default value is "2024-04-01-preview". Note that overriding
this default value may result in unsupported behavior.
:keyword endpoint: The endpoint of the Live Metrics service. Default value is
"https://global.livediagnostics.monitor.azure.com".
:paramtype endpoint: str
:keyword api_version: The API version to use for this operation. Default value is
"2024-04-01-preview". Note that overriding this default value may result in unsupported
behavior.
:paramtype api_version: str
"""

def __init__(self, credential: "TokenCredential", **kwargs: Any) -> None:
def __init__(
self,
credential: Optional["TokenCredential"] = None,
*,
endpoint: str = "https://global.livediagnostics.monitor.azure.com",
**kwargs: Any
) -> None:
_endpoint = "{endpoint}"
self._config = QuickpulseClientConfiguration(credential=credential, **kwargs)
self._config = LiveMetricsClientConfiguration(endpoint=endpoint, credential=credential, **kwargs)

_policies = kwargs.pop("policies", None)
if _policies is None:
_policies = [
Expand All @@ -55,9 +66,8 @@ def __init__(self, credential: "TokenCredential", **kwargs: Any) -> None:
]
self._client: PipelineClient = PipelineClient(base_url=_endpoint, policies=_policies, **kwargs)

client_models = {k: v for k, v in _models.__dict__.items() if isinstance(v, type)}
self._serialize = Serializer(client_models)
self._deserialize = Deserializer(client_models)
self._serialize = Serializer()
self._deserialize = Deserializer()
self._serialize.client_side_validation = False

def send_request(self, request: HttpRequest, *, stream: bool = False, **kwargs: Any) -> HttpResponse:
Expand All @@ -79,13 +89,17 @@ def send_request(self, request: HttpRequest, *, stream: bool = False, **kwargs:
"""

request_copy = deepcopy(request)
request_copy.url = self._client.format_url(request_copy.url)
path_format_arguments = {
"endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, "str"),
}

request_copy.url = self._client.format_url(request_copy.url, **path_format_arguments)
return self._client.send_request(request_copy, stream=stream, **kwargs) # type: ignore

def close(self) -> None:
self._client.close()

def __enter__(self) -> "QuickpulseClient":
def __enter__(self) -> Self:
self._client.__enter__()
return self

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,44 +2,51 @@
# --------------------------------------------------------------------------
# Copyright (c) Microsoft Corporation. All rights reserved.
# Licensed under the MIT License. See License.txt in the project root for license information.
# Code generated by Microsoft (R) AutoRest Code Generator.
# Code generated by Microsoft (R) Python Code Generator.
# Changes may cause incorrect behavior and will be lost if the code is regenerated.
# --------------------------------------------------------------------------

from typing import Any, TYPE_CHECKING
from typing import Any, Optional, TYPE_CHECKING

from azure.core.pipeline import policies

from ._version import VERSION

if TYPE_CHECKING:
# pylint: disable=unused-import,ungrouped-imports
from azure.core.credentials import TokenCredential

VERSION = "unknown"


class QuickpulseClientConfiguration: # pylint: disable=too-many-instance-attributes,name-too-long
"""Configuration for QuickpulseClient.
class LiveMetricsClientConfiguration: # pylint: disable=too-many-instance-attributes
"""Configuration for LiveMetricsClient.

Note that all parameters used to create this instance are saved as instance
attributes.

:param credential: Credential needed for the client to connect to Azure. Required.
:param endpoint: The endpoint of the Live Metrics service. Default value is
"https://global.livediagnostics.monitor.azure.com".
:type endpoint: str
:param credential: Credential used to authenticate requests to the service. Default value is
None.
:type credential: ~azure.core.credentials.TokenCredential
:keyword api_version: Api Version. Default value is "2024-04-01-preview". Note that overriding
this default value may result in unsupported behavior.
:keyword api_version: The API version to use for this operation. Default value is
"2024-04-01-preview". Note that overriding this default value may result in unsupported
behavior.
:paramtype api_version: str
"""

def __init__(self, credential: "TokenCredential", **kwargs: Any) -> None:
def __init__(
self,
endpoint: str = "https://global.livediagnostics.monitor.azure.com",
credential: Optional["TokenCredential"] = None,
**kwargs: Any
) -> None:
api_version: str = kwargs.pop("api_version", "2024-04-01-preview")

# if credential is None:
# raise ValueError("Parameter 'credential' must not be None.")

self.endpoint = endpoint
self.credential = credential
self.api_version = api_version
self.credential_scopes = kwargs.pop("credential_scopes", ["https://monitor.azure.com/.default"])
kwargs.setdefault("sdk_moniker", "quickpulseclient/{}".format(VERSION))
kwargs.setdefault("sdk_moniker", "monitor-opentelemetry-exporter/{}".format(VERSION))
self.polling_interval = kwargs.get("polling_interval", 30)
self._configure(**kwargs)

Expand All @@ -53,7 +60,7 @@ def _configure(self, **kwargs: Any) -> None:
self.redirect_policy = kwargs.get("redirect_policy") or policies.RedirectPolicy(**kwargs)
self.retry_policy = kwargs.get("retry_policy") or policies.RetryPolicy(**kwargs)
self.authentication_policy = kwargs.get("authentication_policy")
# if self.credential and not self.authentication_policy:
# self.authentication_policy = policies.BearerTokenCredentialPolicy(
# self.credential, *self.credential_scopes, **kwargs
# )
if self.credential and not self.authentication_policy:
self.authentication_policy = policies.BearerTokenCredentialPolicy(
self.credential, *self.credential_scopes, **kwargs
)
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,22 @@
# --------------------------------------------------------------------------
# Copyright (c) Microsoft Corporation. All rights reserved.
# Licensed under the MIT License. See License.txt in the project root for license information.
# Code generated by Microsoft (R) AutoRest Code Generator.
# Code generated by Microsoft (R) Python Code Generator.
# Changes may cause incorrect behavior and will be lost if the code is regenerated.
# --------------------------------------------------------------------------
# pylint: disable=wrong-import-position

from ._operations import QuickpulseClientOperationsMixin
from typing import TYPE_CHECKING

if TYPE_CHECKING:
from ._patch import * # pylint: disable=unused-wildcard-import

from ._operations import _LiveMetricsClientOperationsMixin # type: ignore # pylint: disable=unused-import

from ._patch import __all__ as _patch_all
from ._patch import * # pylint: disable=unused-wildcard-import
from ._patch import *
from ._patch import patch_sdk as _patch_sdk

__all__ = [
"QuickpulseClientOperationsMixin",
]
__all__.extend([p for p in _patch_all if p not in __all__])
__all__ = []
__all__.extend([p for p in _patch_all if p not in __all__]) # pyright: ignore
_patch_sdk()
Loading
Loading