Skip to content

Commit b72500e

Browse files
committed
moved to ads logging API for creating log
1 parent 2f97cd7 commit b72500e

File tree

2 files changed

+11
-35
lines changed

2 files changed

+11
-35
lines changed

ads/opctl/operator/common/utils.py

Lines changed: 8 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
from cerberus import Validator
1919

2020
from ads.opctl import logger, utils
21-
import oci
21+
from ads.common.oci_logging import OCILog
2222

2323
CONTAINER_NETWORK = "CONTAINER_NETWORK"
2424

@@ -194,40 +194,15 @@ def print_traceback():
194194
traceback.print_tb(tb)
195195

196196

197-
def create_log_in_log_group(signer, log_group_id, log_name=None):
197+
def create_log_in_log_group(compartment_id, log_group_id, auth, log_name=None):
198198
"""
199199
Creates a log within a given log group
200-
:param signer: The signer
201-
:param log_group_id: The OCID of the log group.
202-
:param log_name: Name of the log to be created.
203-
:return: Created log id.
204200
"""
205-
206201
if not log_name:
207202
log_name = f"log-{int(time.time())}-{uuid.uuid4()}"
208-
logging_client = oci.logging.LoggingManagementClient(config={}, signer=signer)
209-
210-
log_details = oci.logging.models.CreateLogDetails(
211-
display_name=log_name,
212-
log_type="CUSTOM",
213-
is_enabled=True
214-
)
215-
216-
response = logging_client.create_log(
217-
log_group_id=log_group_id,
218-
create_log_details=log_details
219-
)
220-
221-
wait_for_resource_id = response.headers['opc-work-request-id']
222-
lowered_wait_for_states = ["succeeded", "failed"]
223-
try:
224-
waiter_result = oci.wait_until(
225-
logging_client,
226-
logging_client.get_work_request(wait_for_resource_id),
227-
evaluate_response=lambda r: getattr(r.data, 'status')
228-
and getattr(r.data, 'status').lower() in lowered_wait_for_states,
229-
)
230-
log_id = waiter_result.data.resources[0].identifier
231-
return log_id
232-
except Exception as e:
233-
raise oci.exceptions.CompositeOperationError(partial_results=[response], cause=e)
203+
log = OCILog(display_name=log_name,
204+
log_group_id=log_group_id,
205+
compartment_id=compartment_id,
206+
**auth).create()
207+
logger.info(f"Created log with log OCID {log.id}")
208+
return log.id

ads/opctl/operator/lowcode/forecast/whatifserve/deployment_manager.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -186,8 +186,9 @@ def create_deployment(self):
186186
log_group = self.spec.what_if_analysis.model_deployment.log_group
187187
log_id = self.spec.what_if_analysis.model_deployment.log_id
188188
if not log_id and not self.test_mode:
189-
auth = oci.auth.signers.get_resource_principals_signer()
190-
log_id = create_log_in_log_group(auth, log_group)
189+
signer = oci.auth.signers.get_resource_principals_signer()
190+
auth = {"signer": signer, "config": {}}
191+
log_id = create_log_in_log_group(self.compartment_id, log_group, auth)
191192

192193
logs_configuration_details_object = CategoryLogDetails(
193194
access=LogDetails(log_group_id=log_group,

0 commit comments

Comments
 (0)