Skip to content

Commit

Permalink
Request tracing target fix (#1020)
Browse files Browse the repository at this point in the history
* Fixed "requesttracing-configure" command

* Fixed "requesttracing-configure" command
  • Loading branch information
MeroRai authored and smillidge committed Aug 12, 2016
1 parent 8d8992a commit 2040234
Show file tree
Hide file tree
Showing 8 changed files with 441 additions and 281 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,99 @@
/*
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
Copyright (c) 2016 C2B2 Consulting Limited. All rights reserved.
The contents of this file are subject to the terms of the Common Development
and Distribution License("CDDL") (collectively, the "License"). You
may not use this file except in compliance with the License. You can
obtain a copy of the License at
https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
or packager/legal/LICENSE.txt. See the License for the specific
language governing permissions and limitations under the License.
When distributing the software, include this License Header Notice in each
file and include the License file at packager/legal/LICENSE.txt.
*/
package fish.payara.nucleus.requesttracing.admin;

import com.sun.enterprise.config.serverbeans.Domain;
import com.sun.enterprise.util.LocalStringManagerImpl;
import com.sun.enterprise.util.SystemPropertyConstants;
import fish.payara.nucleus.requesttracing.RequestTracingService;
import org.glassfish.api.ActionReport;
import org.glassfish.api.I18n;
import org.glassfish.api.Param;
import org.glassfish.api.admin.*;
import org.glassfish.config.support.CommandTarget;
import org.glassfish.config.support.TargetType;
import org.glassfish.hk2.api.PerLookup;
import org.jvnet.hk2.annotations.Service;

import javax.inject.Inject;
import java.util.Properties;
import java.util.concurrent.TimeUnit;

/**
*
* @author Susan Rai
*/
@ExecuteOn({RuntimeType.DAS})
@TargetType(value = {CommandTarget.DAS, CommandTarget.STANDALONE_INSTANCE, CommandTarget.CLUSTER, CommandTarget.CLUSTERED_INSTANCE, CommandTarget.CONFIG})
@Service(name = "__enable-requesttracing-configure-das")
@CommandLock(CommandLock.LockType.NONE)
@PerLookup
@I18n("__enable-requesttracing-configure-das")
@RestEndpoints({
@RestEndpoint(configBean = Domain.class,
opType = RestEndpoint.OpType.POST,
path = "__enable-requesttracing-configure-das",
description = "Enables/Disables Request Tracing Service")
})
public class EnableRequestTracingConfigurerOnDas implements AdminCommand {

final private static LocalStringManagerImpl strings = new LocalStringManagerImpl(EnableRequestTracingConfigurerOnDas.class);

@Inject
RequestTracingService service;

@Param(name = "target", optional = true, defaultValue = SystemPropertyConstants.DAS_SERVER_NAME)
String target;

@Param(name = "enabled", optional = false)
private Boolean enabled;

@Param(name = "thresholdUnit", optional = true, defaultValue = "SECONDS")
private String unit;

@Param(name = "thresholdValue", optional = true, defaultValue = "30")
private String value;

@Override
public void execute(AdminCommandContext context) {
final AdminCommandContext theContext = context;
final ActionReport actionReport = context.getActionReport();
Properties extraProperties = actionReport.getExtraProperties();
if (extraProperties == null) {
extraProperties = new Properties();
actionReport.setExtraProperties(extraProperties);
}

if (enabled != null) {
service.getExecutionOptions().setEnabled(enabled);
actionReport.appendMessage(strings.getLocalString("requesttracing.configure.status.success",
"request tracing service status is set to {0}.", enabled) + "\n");
}
if (value != null) {
service.getExecutionOptions().setThresholdValue(Long.valueOf(value));
actionReport.appendMessage(strings.getLocalString("requesttracing.configure.thresholdvalue.success",
"Request Tracing Service Threshold Value is set to {0}.", value) + "\n");
}
if (unit != null) {
service.getExecutionOptions().setThresholdUnit(TimeUnit.valueOf(unit));
actionReport.appendMessage(strings.getLocalString("requesttracing.configure.thresholdunit.success",
"Request Tracing Service Threshold Unit is set to {0}.", unit) + "\n");
}
}
}

Original file line number Diff line number Diff line change
@@ -0,0 +1,100 @@
/*
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
Copyright (c) 2016 C2B2 Consulting Limited. All rights reserved.
The contents of this file are subject to the terms of the Common Development
and Distribution License("CDDL") (collectively, the "License"). You
may not use this file except in compliance with the License. You can
obtain a copy of the License at
https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
or packager/legal/LICENSE.txt. See the License for the specific
language governing permissions and limitations under the License.
When distributing the software, include this License Header Notice in each
file and include the License file at packager/legal/LICENSE.txt.
*/
package fish.payara.nucleus.requesttracing.admin;

import com.sun.enterprise.config.serverbeans.Domain;
import com.sun.enterprise.util.LocalStringManagerImpl;
import com.sun.enterprise.util.SystemPropertyConstants;
import fish.payara.nucleus.requesttracing.RequestTracingService;
import org.glassfish.api.ActionReport;
import org.glassfish.api.I18n;
import org.glassfish.api.Param;
import org.glassfish.api.admin.*;
import org.glassfish.config.support.CommandTarget;
import org.glassfish.config.support.TargetType;
import org.glassfish.hk2.api.PerLookup;
import org.jvnet.hk2.annotations.Service;

import javax.inject.Inject;
import java.util.Properties;
import java.util.concurrent.TimeUnit;

/**
*
*
* @author Susan Rai
*/
@ExecuteOn({RuntimeType.INSTANCE})
@TargetType(value = {CommandTarget.DAS, CommandTarget.STANDALONE_INSTANCE, CommandTarget.CLUSTER, CommandTarget.CLUSTERED_INSTANCE, CommandTarget.CONFIG})
@Service(name = "__enable-requesttracing-configure-instance")
@CommandLock(CommandLock.LockType.NONE)
@PerLookup
@I18n("__enable-requesttracing-configure-instance")
@RestEndpoints({
@RestEndpoint(configBean = Domain.class,
opType = RestEndpoint.OpType.POST,
path = "__enable-requesttracing-configure-instance",
description = "Enables/Disables Request Tracing Service")
})
public class EnableRequestTracingConfigurerOnInstance implements AdminCommand {

final private static LocalStringManagerImpl strings = new LocalStringManagerImpl(EnableRequestTracingConfigurerOnInstance.class);

@Inject
RequestTracingService service;

@Param(name = "target", optional = true, defaultValue = SystemPropertyConstants.DAS_SERVER_NAME)
String target;

@Param(name = "enabled", optional = false)
private Boolean enabled;

@Param(name = "thresholdUnit", optional = true, defaultValue = "SECONDS")
private String unit;

@Param(name = "thresholdValue", optional = true, defaultValue = "30")
private String value;

@Override
public void execute(AdminCommandContext context) {
final AdminCommandContext theContext = context;
final ActionReport actionReport = context.getActionReport();
Properties extraProperties = actionReport.getExtraProperties();
if (extraProperties == null) {
extraProperties = new Properties();
actionReport.setExtraProperties(extraProperties);
}

if (enabled != null) {
service.getExecutionOptions().setEnabled(enabled);
actionReport.appendMessage(strings.getLocalString("requesttracing.configure.status.success",
"request tracing service status is set to {0}.", enabled) + "\n");
}
if (value != null) {
service.getExecutionOptions().setThresholdValue(Long.valueOf(value));
actionReport.appendMessage(strings.getLocalString("requesttracing.configure.thresholdvalue.success",
"Request Tracing Service Threshold Value is set to {0}.", value) + "\n");
}
if (unit != null) {
service.getExecutionOptions().setThresholdUnit(TimeUnit.valueOf(unit));
actionReport.appendMessage(strings.getLocalString("requesttracing.configure.thresholdunit.success",
"Request Tracing Service Threshold Unit is set to {0}.", unit) + "\n");
}
}
}

Original file line number Diff line number Diff line change
Expand Up @@ -50,25 +50,24 @@ and Distribution License("CDDL") (collectively, the "License"). You


/**
* Admin command to enable/disable specific notifier given with its name
*
* @author mertcaliskan
*
* @author Susan Rai
*/
@ExecuteOn({RuntimeType.DAS})
@TargetType(value = {CommandTarget.DAS, CommandTarget.STANDALONE_INSTANCE, CommandTarget.CLUSTER, CommandTarget.CLUSTERED_INSTANCE, CommandTarget.CONFIG})
@Service(name = "requesttracing-configure-notifier-das")
@Service(name = "__enable-requesttracing-configure-notifier-das")
@CommandLock(CommandLock.LockType.NONE)
@PerLookup
@I18n("requesttracing.configure.notifier.das")
@I18n("__enable-requesttracing-configure-notifier-das")
@RestEndpoints({
@RestEndpoint(configBean = Domain.class,
opType = RestEndpoint.OpType.POST,
path = "requesttracing-configure-notifier-das",
path = "__enable-requesttracing-configure-notifier-das",
description = "Enables/Disables Notifier Specified With Name")
})
public class RequestTracingNotifierConfigurerDas implements AdminCommand {
public class EnableRequestTracingNotifierConfigurerOnDas implements AdminCommand {

final private static LocalStringManagerImpl strings = new LocalStringManagerImpl(RequestTracingNotifierConfigurerDas.class);
final private static LocalStringManagerImpl strings = new LocalStringManagerImpl(RequestTracingNotifierConfigurer.class);

@Inject
RequestTracingService service;
Expand All @@ -85,9 +84,6 @@ public class RequestTracingNotifierConfigurerDas implements AdminCommand {
@Inject
protected Target targetUtil;

@Param(name = "dynamic", optional = true, defaultValue = "false")
private Boolean dynamic;

@Param(name = "target", optional = true, defaultValue = SystemPropertyConstants.DAS_SERVER_NAME)
String target;

Expand Down Expand Up @@ -127,23 +123,16 @@ public void execute(AdminCommandContext context) {
public Object run(final RequestTracingServiceConfiguration requestTracingServiceConfigurationProxy) throws
PropertyVetoException, TransactionFailure {
Notifier notifierProxy = (Notifier) requestTracingServiceConfigurationProxy.createChild(notifierService.getNotifierType());
if (notifierEnabled != null) {
notifierProxy.enabled(notifierEnabled);
}
createdNotifier[0] = notifierProxy;

List<Notifier> notifierList = requestTracingServiceConfigurationProxy.getNotifierList();
NotifierExecutionOptions executionOptions = factory.build(createdNotifier[0]);
if (notifierEnabled) {
notifierList.add(createdNotifier[0]);
if (dynamic) {
service.getExecutionOptions().addNotifierExecutionOption(executionOptions);
}
service.getExecutionOptions().addNotifierExecutionOption(executionOptions);
} else {
notifierList.remove(createdNotifier[0]);
if (dynamic) {
service.getExecutionOptions().removeNotifierExecutionOption(executionOptions);
}
service.getExecutionOptions().removeNotifierExecutionOption(executionOptions);
}

actionReport.setActionExitCode(ActionReport.ExitCode.SUCCESS);
Expand All @@ -155,17 +144,11 @@ public Object run(final RequestTracingServiceConfiguration requestTracingService
@Override
public Object run(final Notifier notifierProxy) throws
PropertyVetoException, TransactionFailure {
if (notifierEnabled != null) {
notifierProxy.enabled(notifierEnabled);
}

if (dynamic) {
NotifierExecutionOptions executionOptions = factory.build(notifierProxy);
if (notifierEnabled) {
service.getExecutionOptions().addNotifierExecutionOption(executionOptions);
} else {
service.getExecutionOptions().removeNotifierExecutionOption(executionOptions);
}
NotifierExecutionOptions executionOptions = factory.build(notifierProxy);
if (notifierEnabled) {
service.getExecutionOptions().addNotifierExecutionOption(executionOptions);
} else {
service.getExecutionOptions().removeNotifierExecutionOption(executionOptions);
}

actionReport.setActionExitCode(ActionReport.ExitCode.SUCCESS);
Expand Down
Loading

0 comments on commit 2040234

Please sign in to comment.