Skip to content

[Log Agent] Log Improvement 07 #998

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

Open
rajithacharith wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[Log Agent] Log Improvement 07 #998

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 15 additions & 1 deletion .../main/java/org/wso2/carbon/identity/api/server/permission/management/common/Constant.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@

package org.wso2.carbon.identity.api.server.permission.management.common;

import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;

import java.util.HashMap;
import java.util.Map;
import java.util.ResourceBundle;
Expand All @@ -25,6 +28,8 @@
*/
public class Constant {

private static final Log log = LogFactory.getLog(Constant.class);

/**
* Enum for error messages.
*/
Expand Down Expand Up @@ -78,11 +83,20 @@ public String getDescription() {
*/
public static ErrorMessage getMappedErrorMessage(String serverCode) {

if (log.isDebugEnabled()) {
log.debug("Getting mapped error message for server code: " + serverCode);
}

try {
String errorCode = resourceBundle.getString(serverCode);
if (log.isDebugEnabled()) {
log.debug("Found mapped error code: " + errorCode + " for server code: " + serverCode);
}
return messageIndex.get(errorCode);
} catch (Throwable e) {
// Ignore if error mapping has invalid input.
if (log.isDebugEnabled()) {
log.debug("Error mapping not found for server code: " + serverCode + ". Using default error.");
}
}
return ErrorMessage.ERROR_CODE_INVALID_INPUT;
}
Expand Down
15 changes: 14 additions & 1 deletion ...ty/api/server/permission/management/common/RolePermissionManagementServiceDataHolder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@

package org.wso2.carbon.identity.api.server.permission.management.common;

import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.wso2.carbon.context.PrivilegedCarbonContext;
import org.wso2.carbon.user.mgt.RolePermissionManagementService;

Expand All @@ -26,6 +28,8 @@
*/
public class RolePermissionManagementServiceDataHolder {

private static final Log log = LogFactory.getLog(RolePermissionManagementServiceDataHolder.class);

private RolePermissionManagementServiceDataHolder() {}

private static class RolePermissionManagementServiceHolder {
Expand All @@ -41,6 +45,15 @@ private static class RolePermissionManagementServiceHolder {
*/
public static RolePermissionManagementService getRolePermissionManagementService() {

return RolePermissionManagementServiceHolder.SERVICE;
if (log.isDebugEnabled()) {
log.debug("Getting RolePermissionManagementService from OSGi registry.");
}

RolePermissionManagementService service = RolePermissionManagementServiceHolder.SERVICE;
if (service == null) {
log.warn("RolePermissionManagementService is not available in OSGi registry.");
}

return service;
}
}
15 changes: 13 additions & 2 deletions ...carbon/identity/api/server/permission/management/v1/core/PermissionManagementService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,15 @@ public Permission[] getAllPermissions() {

try {
String tenantDomain = PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantDomain();
return getPermissionObjects(rolePermissionManagementService.getAllPermissions(IdentityTenantUtil
.getTenantId(tenantDomain)));
if (LOG.isDebugEnabled()) {
LOG.debug("Retrieving all permissions for tenant: " + tenantDomain);
}
Permission[] permissions = getPermissionObjects(rolePermissionManagementService.getAllPermissions(
IdentityTenantUtil.getTenantId(tenantDomain)));
if (LOG.isDebugEnabled()) {
LOG.debug("Successfully retrieved " + permissions.length + " permissions for tenant: " + tenantDomain);
}
return permissions;
} catch (RolePermissionException e) {
throw handleException(e);
}
Expand All @@ -69,6 +76,10 @@ public Permission[] getAllPermissions() {
*/
private Permission[] getPermissionObjects(org.wso2.carbon.user.mgt.common.model.Permission[] permissions) {

if (permissions == null) {
LOG.warn("Permission array received is null, returning empty array");
return new Permission[0];
}
Permission[] outputPermissions = new Permission[permissions.length];
for (int i = 0; i < permissions.length; i++) {
Permission permission = new Permission();
Expand Down
5 changes: 5 additions & 0 deletions ...ity/api/server/permission/management/v1/factories/PermissionManagementServiceFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@

package org.wso2.carbon.identity.api.server.permission.management.v1.factories;

import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.wso2.carbon.identity.api.server.permission.management.common.RolePermissionManagementServiceDataHolder;
import org.wso2.carbon.identity.api.server.permission.management.v1.core.PermissionManagementService;
import org.wso2.carbon.user.mgt.RolePermissionManagementService;
Expand All @@ -27,16 +29,19 @@
*/
public class PermissionManagementServiceFactory {

private static final Log LOG = LogFactory.getLog(PermissionManagementServiceFactory.class);
private static final PermissionManagementService SERVICE;

static {
RolePermissionManagementService rolePermissionManagementService = RolePermissionManagementServiceDataHolder
.getRolePermissionManagementService();

if (rolePermissionManagementService == null) {
LOG.error("RolePermissionManagementService is not available from OSGi context");
throw new IllegalStateException("RolePermissionManagementService is not available from OSGi context.");
}

LOG.info("PermissionManagementService initialized successfully");
SERVICE = new PermissionManagementService(rolePermissionManagementService);
}

Expand Down
10 changes: 10 additions & 0 deletions ...identity/api/server/permission/management/v1/impl/PermissionManagementApiServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@

package org.wso2.carbon.identity.api.server.permission.management.v1.impl;

import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.wso2.carbon.identity.api.server.permission.management.v1.PermissionManagementApiService;
import org.wso2.carbon.identity.api.server.permission.management.v1.core.PermissionManagementService;
import org.wso2.carbon.identity.api.server.permission.management.v1.factories.PermissionManagementServiceFactory;
Expand All @@ -29,20 +31,28 @@
*/
public class PermissionManagementApiServiceImpl implements PermissionManagementApiService {

private static final Log LOG = LogFactory.getLog(PermissionManagementApiServiceImpl.class);
private final PermissionManagementService permissionManagementService;

public PermissionManagementApiServiceImpl() {

try {
this.permissionManagementService = PermissionManagementServiceFactory.getPermissionManagementService();
if (LOG.isDebugEnabled()) {
LOG.debug("PermissionManagementApiServiceImpl initialized successfully");
}
} catch (IllegalStateException e) {
LOG.error("Error occurred while initiating PermissionManagementService", e);
throw new RuntimeException("Error occurred while initiating PermissionManagementService.", e);
}
}

@Override
public Response permissionManagementPermissionsGet() {

if (LOG.isDebugEnabled()) {
LOG.debug("Received request to get all permissions");
}
return Response.ok().entity(permissionManagementService.getAllPermissions()).build();
}
}
13 changes: 12 additions & 1 deletion ...a/org/wso2/carbon/identity/api/server/rule/metadata/common/RuleMetadataServiceHolder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@

package org.wso2.carbon.identity.api.server.rule.metadata.common;

import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.wso2.carbon.context.PrivilegedCarbonContext;
import org.wso2.carbon.identity.rule.metadata.api.service.RuleMetadataService;

Expand All @@ -26,6 +28,8 @@
*/
public class RuleMetadataServiceHolder {

private static final Log log = LogFactory.getLog(RuleMetadataServiceHolder.class);

private RuleMetadataServiceHolder() {

}
Expand All @@ -43,6 +47,13 @@ private static class RuleMetadataServiceHolderInstance {
*/
public static RuleMetadataService getRuleMetadataService() {

return RuleMetadataServiceHolderInstance.SERVICE;
if (log.isDebugEnabled()) {
log.debug("Retrieving RuleMetadataService instance from OSGi service registry.");
}
RuleMetadataService service = RuleMetadataServiceHolderInstance.SERVICE;
if (service == null) {
log.warn("RuleMetadataService is not available. Service might not be registered in OSGi registry.");
}
return service;
}
}
16 changes: 14 additions & 2 deletions .../org/wso2/carbon/identity/api/server/rule/metadata/v1/core/ServerRuleMetadataService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@

package org.wso2.carbon.identity.api.server.rule.metadata.v1.core;

import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.wso2.carbon.context.CarbonContext;
import org.wso2.carbon.identity.api.server.rule.metadata.v1.model.Field;
import org.wso2.carbon.identity.api.server.rule.metadata.v1.model.Link;
Expand All @@ -41,6 +43,7 @@
*/
public class ServerRuleMetadataService {

private static final Log LOG = LogFactory.getLog(ServerRuleMetadataService.class);
private final RuleMetadataService ruleMetadataService;

public ServerRuleMetadataService(RuleMetadataService ruleMetadataService) {
Expand All @@ -56,18 +59,27 @@ public ServerRuleMetadataService(RuleMetadataService ruleMetadataService) {
public List<org.wso2.carbon.identity.api.server.rule.metadata.v1.model.FieldDefinition> getExpressionMeta(
String flow) {

String tenantDomain = CarbonContext.getThreadLocalCarbonContext().getTenantDomain();
if (LOG.isDebugEnabled()) {
LOG.debug("Retrieving expression metadata for flow: " + flow + " in tenant: " + tenantDomain);
}

try {
FlowType flowType = FlowType.valueOfFlowAlias(flow);

List<FieldDefinition> fieldDefinitions = ruleMetadataService.getExpressionMeta(flowType,
CarbonContext.getThreadLocalCarbonContext().getTenantDomain());
List<FieldDefinition> fieldDefinitions = ruleMetadataService.getExpressionMeta(flowType, tenantDomain);

List<org.wso2.carbon.identity.api.server.rule.metadata.v1.model.FieldDefinition>
fieldDefinitionResponseList = new ArrayList<>();
for (FieldDefinition fieldDefinition : fieldDefinitions) {
fieldDefinitionResponseList.add(buildFieldDefinitionResponse(fieldDefinition));
}

if (LOG.isDebugEnabled()) {
LOG.debug("Successfully retrieved " + fieldDefinitionResponseList.size() +
" field definitions for flow: " + flow);
}

return fieldDefinitionResponseList;
} catch (RuleMetadataException e) {
throw RuleMetadataAPIErrorBuilder.buildAPIError(e);
Expand Down
6 changes: 6 additions & 0 deletions ...rbon/identity/api/server/rule/metadata/v1/factories/ServerRuleMetadataServiceFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@

package org.wso2.carbon.identity.api.server.rule.metadata.v1.factories;

import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.wso2.carbon.identity.api.server.rule.metadata.common.RuleMetadataServiceHolder;
import org.wso2.carbon.identity.api.server.rule.metadata.v1.core.ServerRuleMetadataService;
import org.wso2.carbon.identity.rule.metadata.api.service.RuleMetadataService;
Expand All @@ -27,14 +29,18 @@
*/
public class ServerRuleMetadataServiceFactory {

private static final Log LOG = LogFactory.getLog(ServerRuleMetadataServiceFactory.class);
private static final ServerRuleMetadataService SERVICE;

static {
LOG.info("Initializing ServerRuleMetadataService factory.");
RuleMetadataService ruleMetadataService = RuleMetadataServiceHolder.getRuleMetadataService();
if (ruleMetadataService == null) {
LOG.error("RuleMetadataService is not available from OSGi context.");
throw new IllegalStateException("RuleMetadataService is not available from OSGi context.");
}
SERVICE = new ServerRuleMetadataService(ruleMetadataService);
LOG.info("ServerRuleMetadataService factory initialized successfully.");
}

/**
Expand Down
13 changes: 13 additions & 0 deletions ...n/java/org/wso2/carbon/identity/api/server/rule/metadata/v1/impl/RulesApiServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@

package org.wso2.carbon.identity.api.server.rule.metadata.v1.impl;

import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.wso2.carbon.identity.api.server.rule.metadata.v1.RulesApiService;
import org.wso2.carbon.identity.api.server.rule.metadata.v1.core.ServerRuleMetadataService;
import org.wso2.carbon.identity.api.server.rule.metadata.v1.factories.ServerRuleMetadataServiceFactory;
Expand All @@ -29,20 +31,31 @@
*/
public class RulesApiServiceImpl implements RulesApiService {

private static final Log LOG = LogFactory.getLog(RulesApiServiceImpl.class);
private final ServerRuleMetadataService serverRuleMetadataService;

public RulesApiServiceImpl() {

if (LOG.isDebugEnabled()) {
LOG.debug("Initializing RulesApiServiceImpl.");
}
try {
serverRuleMetadataService = ServerRuleMetadataServiceFactory.getServerRuleMetadataService();
if (LOG.isDebugEnabled()) {
LOG.debug("Successfully initialized RulesApiServiceImpl.");
}
} catch (IllegalStateException e) {
LOG.error("Error occurred while retrieving RuleMetadataService.", e);
throw new RuntimeException("Error occurred while retrieving RuleMetadataService.", e);
}
}

@Override
public Response getExpressionMeta(String flow) {

if (LOG.isDebugEnabled()) {
LOG.debug("Processing request to get expression metadata for flow: " + flow);
}
return Response.ok().entity(serverRuleMetadataService.getExpressionMeta(flow)).build();
}
}
6 changes: 4 additions & 2 deletions ...rg/wso2/carbon/identity/api/server/rule/metadata/v1/util/RuleMetadataAPIErrorBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,12 @@ public static APIError buildAPIError(RuleMetadataException exception) {

Response.Status status = Response.Status.INTERNAL_SERVER_ERROR;
if (exception instanceof RuleMetadataClientException) {
LOG.debug(exception.getMessage(), exception);
if (LOG.isDebugEnabled()) {
LOG.debug("Client error in rule metadata operation: " + exception.getMessage(), exception);
}
status = Response.Status.BAD_REQUEST;
} else {
LOG.error(exception.getMessage(), exception);
LOG.error("Server error in rule metadata operation: " + exception.getMessage(), exception);
}

String errorCode = exception.getErrorCode();
Expand Down
15 changes: 14 additions & 1 deletion ...org/wso2/carbon/identity/api/server/script/library/common/ScriptLibraryServiceHolder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@

package org.wso2.carbon.identity.api.server.script.library.common;

import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.wso2.carbon.context.PrivilegedCarbonContext;
import org.wso2.carbon.identity.functions.library.mgt.FunctionLibraryManagementService;

Expand All @@ -26,6 +28,8 @@
*/
public class ScriptLibraryServiceHolder {

private static final Log log = LogFactory.getLog(ScriptLibraryServiceHolder.class);

private ScriptLibraryServiceHolder() {

}
Expand All @@ -44,6 +48,15 @@ private static class FunctionLibraryManagementServiceHolder {
*/
public static FunctionLibraryManagementService getScriptLibraryManagementService() {

return FunctionLibraryManagementServiceHolder.SERVICE;
if (log.isDebugEnabled()) {
log.debug("Getting FunctionLibraryManagementService from OSGi registry.");
}

FunctionLibraryManagementService service = FunctionLibraryManagementServiceHolder.SERVICE;
if (service == null) {
log.warn("FunctionLibraryManagementService is not available in OSGi registry.");
}

return service;
}
}
Loading