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

[Profiling] Divide into more packages #107201

Merged
merged 1 commit into from
Apr 10, 2024
Merged

[Profiling] Divide into more packages #107201

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
2 changes: 1 addition & 1 deletion ...earch/xpack/profiling/CancellationIT.java → ...pack/profiling/action/CancellationIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* 2.0.
*/

package org.elasticsearch.xpack.profiling;
package org.elasticsearch.xpack.profiling.action;

import org.apache.http.entity.ContentType;
import org.apache.http.entity.StringEntity;
Expand Down
2 changes: 1 addition & 1 deletion ...pack/profiling/GetFlameGraphActionIT.java → ...ofiling/action/GetFlameGraphActionIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* 2.0.
*/

package org.elasticsearch.xpack.profiling;
package org.elasticsearch.xpack.profiling.action;

public class GetFlameGraphActionIT extends ProfilingTestCase {
public void testGetStackTracesUnfiltered() throws Exception {
Expand Down
2 changes: 1 addition & 1 deletion ...ack/profiling/GetStackTracesActionIT.java → ...filing/action/GetStackTracesActionIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* 2.0.
*/

package org.elasticsearch.xpack.profiling;
package org.elasticsearch.xpack.profiling.action;

import org.elasticsearch.index.query.BoolQueryBuilder;
import org.elasticsearch.index.query.QueryBuilders;
Expand Down
2 changes: 1 addition & 1 deletion ...ch/xpack/profiling/GetStatusActionIT.java → ...k/profiling/action/GetStatusActionIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* 2.0.
*/

package org.elasticsearch.xpack.profiling;
package org.elasticsearch.xpack.profiling.action;

import org.elasticsearch.core.TimeValue;
import org.elasticsearch.rest.RestStatus;
Expand Down
2 changes: 1 addition & 1 deletion ...k/profiling/GetTopNFunctionsActionIT.java → ...ling/action/GetTopNFunctionsActionIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* 2.0.
*/

package org.elasticsearch.xpack.profiling;
package org.elasticsearch.xpack.profiling.action;

import org.elasticsearch.index.query.BoolQueryBuilder;
import org.elasticsearch.index.query.QueryBuilders;
Expand Down
3 changes: 2 additions & 1 deletion ...iling/LocalStateProfilingXPackPlugin.java → ...ction/LocalStateProfilingXPackPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,11 @@
* 2.0.
*/

package org.elasticsearch.xpack.profiling;
package org.elasticsearch.xpack.profiling.action;

import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.xpack.core.LocalStateCompositeXPackPlugin;
import org.elasticsearch.xpack.profiling.ProfilingPlugin;

import java.nio.file.Path;

Expand Down
4 changes: 3 additions & 1 deletion ...ch/xpack/profiling/ProfilingTestCase.java → ...k/profiling/action/ProfilingTestCase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* 2.0.
*/

package org.elasticsearch.xpack.profiling;
package org.elasticsearch.xpack.profiling.action;

import org.elasticsearch.action.admin.cluster.settings.ClusterUpdateSettingsRequest;
import org.elasticsearch.action.admin.cluster.settings.ClusterUpdateSettingsResponse;
Expand All @@ -25,6 +25,8 @@
import org.elasticsearch.xpack.core.ilm.LifecycleSettings;
import org.elasticsearch.xpack.countedkeyword.CountedKeywordMapperPlugin;
import org.elasticsearch.xpack.ilm.IndexLifecycle;
import org.elasticsearch.xpack.profiling.ProfilingPlugin;
import org.elasticsearch.xpack.profiling.persistence.ProfilingIndexManager;
import org.elasticsearch.xpack.unsignedlong.UnsignedLongMapperPlugin;
import org.elasticsearch.xpack.versionfield.VersionFieldPlugin;
import org.junit.After;
Expand Down
19 changes: 19 additions & 0 deletions x-pack/plugin/profiling/src/main/java/org/elasticsearch/xpack/profiling/ProfilingPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,25 @@
import org.elasticsearch.xpack.core.XPackSettings;
import org.elasticsearch.xpack.core.action.XPackInfoFeatureAction;
import org.elasticsearch.xpack.core.action.XPackUsageFeatureAction;
import org.elasticsearch.xpack.profiling.action.GetFlamegraphAction;
import org.elasticsearch.xpack.profiling.action.GetStackTracesAction;
import org.elasticsearch.xpack.profiling.action.GetStatusAction;
import org.elasticsearch.xpack.profiling.action.GetTopNFunctionsAction;
import org.elasticsearch.xpack.profiling.action.ProfilingInfoTransportAction;
import org.elasticsearch.xpack.profiling.action.ProfilingLicenseChecker;
import org.elasticsearch.xpack.profiling.action.ProfilingUsageTransportAction;
import org.elasticsearch.xpack.profiling.action.TransportGetFlamegraphAction;
import org.elasticsearch.xpack.profiling.action.TransportGetStackTracesAction;
import org.elasticsearch.xpack.profiling.action.TransportGetStatusAction;
import org.elasticsearch.xpack.profiling.action.TransportGetTopNFunctionsAction;
import org.elasticsearch.xpack.profiling.persistence.IndexStateResolver;
import org.elasticsearch.xpack.profiling.persistence.ProfilingDataStreamManager;
import org.elasticsearch.xpack.profiling.persistence.ProfilingIndexManager;
import org.elasticsearch.xpack.profiling.persistence.ProfilingIndexTemplateRegistry;
import org.elasticsearch.xpack.profiling.rest.RestGetFlamegraphAction;
import org.elasticsearch.xpack.profiling.rest.RestGetStackTracesAction;
import org.elasticsearch.xpack.profiling.rest.RestGetStatusAction;
import org.elasticsearch.xpack.profiling.rest.RestGetTopNFunctionsAction;

import java.util.ArrayList;
import java.util.Collection;
Expand Down
2 changes: 1 addition & 1 deletion ...search/xpack/profiling/CO2Calculator.java → ...xpack/profiling/action/CO2Calculator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* 2.0.
*/

package org.elasticsearch.xpack.profiling;
package org.elasticsearch.xpack.profiling.action;

import org.elasticsearch.core.UpdateForV9;

Expand Down
2 changes: 1 addition & 1 deletion ...earch/xpack/profiling/CloudProviders.java → ...pack/profiling/action/CloudProviders.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* 2.0.
*/

package org.elasticsearch.xpack.profiling;
package org.elasticsearch.xpack.profiling.action;

import java.util.Map;

Expand Down
2 changes: 1 addition & 1 deletion ...earch/xpack/profiling/CostCalculator.java → ...pack/profiling/action/CostCalculator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* 2.0.
*/

package org.elasticsearch.xpack.profiling;
package org.elasticsearch.xpack.profiling.action;

import java.util.Map;

Expand Down
2 changes: 1 addition & 1 deletion ...sticsearch/xpack/profiling/CostEntry.java → ...rch/xpack/profiling/action/CostEntry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* 2.0.
*/

package org.elasticsearch.xpack.profiling;
package org.elasticsearch.xpack.profiling.action;

import java.util.Map;

Expand Down
2 changes: 1 addition & 1 deletion .../elasticsearch/xpack/profiling/Frame.java → ...csearch/xpack/profiling/action/Frame.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@
* 2.0.
*/

package org.elasticsearch.xpack.profiling;
package org.elasticsearch.xpack.profiling.action;

public record Frame(String fileName, String functionName, int functionOffset, int lineNumber, boolean inline, boolean last) {}
2 changes: 1 addition & 1 deletion ...csearch/xpack/profiling/FrameGroupID.java → .../xpack/profiling/action/FrameGroupID.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* 2.0.
*/

package org.elasticsearch.xpack.profiling;
package org.elasticsearch.xpack.profiling.action;

import org.elasticsearch.common.Strings;

Expand Down
2 changes: 1 addition & 1 deletion .../xpack/profiling/GetFlamegraphAction.java → ...profiling/action/GetFlamegraphAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* 2.0; you may not use this file except in compliance with the Elastic License
* 2.0.
*/
package org.elasticsearch.xpack.profiling;
package org.elasticsearch.xpack.profiling.action;

import org.elasticsearch.action.ActionType;

Expand Down
2 changes: 1 addition & 1 deletion ...pack/profiling/GetFlamegraphResponse.java → ...ofiling/action/GetFlamegraphResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* 2.0.
*/

package org.elasticsearch.xpack.profiling;
package org.elasticsearch.xpack.profiling.action;

import org.elasticsearch.action.ActionResponse;
import org.elasticsearch.action.support.TransportAction;
Expand Down
2 changes: 1 addition & 1 deletion ...xpack/profiling/GetStackTracesAction.java → ...rofiling/action/GetStackTracesAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* 2.0; you may not use this file except in compliance with the Elastic License
* 2.0.
*/
package org.elasticsearch.xpack.profiling;
package org.elasticsearch.xpack.profiling.action;

import org.elasticsearch.action.ActionType;

Expand Down
3 changes: 2 additions & 1 deletion ...pack/profiling/GetStackTracesRequest.java → ...ofiling/action/GetStackTracesRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* 2.0; you may not use this file except in compliance with the Elastic License
* 2.0.
*/
package org.elasticsearch.xpack.profiling;
package org.elasticsearch.xpack.profiling.action;

import org.elasticsearch.action.ActionRequest;
import org.elasticsearch.action.ActionRequestValidationException;
Expand All @@ -19,6 +19,7 @@
import org.elasticsearch.tasks.TaskId;
import org.elasticsearch.xcontent.ParseField;
import org.elasticsearch.xcontent.XContentParser;
import org.elasticsearch.xpack.profiling.persistence.EventsIndex;

import java.io.IOException;
import java.util.ArrayList;
Expand Down
2 changes: 1 addition & 1 deletion ...ack/profiling/GetStackTracesResponse.java → ...filing/action/GetStackTracesResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* 2.0; you may not use this file except in compliance with the Elastic License
* 2.0.
*/
package org.elasticsearch.xpack.profiling;
package org.elasticsearch.xpack.profiling.action;

import org.elasticsearch.action.ActionResponse;
import org.elasticsearch.action.support.TransportAction;
Expand Down
2 changes: 1 addition & 1 deletion ...filing/GetStackTracesResponseBuilder.java → ...action/GetStackTracesResponseBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* 2.0.
*/

package org.elasticsearch.xpack.profiling;
package org.elasticsearch.xpack.profiling.action;

import java.time.Instant;
import java.util.List;
Expand Down
2 changes: 1 addition & 1 deletion ...arch/xpack/profiling/GetStatusAction.java → ...ack/profiling/action/GetStatusAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* 2.0.
*/

package org.elasticsearch.xpack.profiling;
package org.elasticsearch.xpack.profiling.action;

import org.elasticsearch.action.ActionResponse;
import org.elasticsearch.action.ActionType;
Expand Down
2 changes: 1 addition & 1 deletion ...ack/profiling/GetTopNFunctionsAction.java → ...filing/action/GetTopNFunctionsAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* 2.0; you may not use this file except in compliance with the Elastic License
* 2.0.
*/
package org.elasticsearch.xpack.profiling;
package org.elasticsearch.xpack.profiling.action;

import org.elasticsearch.action.ActionType;

Expand Down
2 changes: 1 addition & 1 deletion ...k/profiling/GetTopNFunctionsResponse.java → ...ling/action/GetTopNFunctionsResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* 2.0.
*/

package org.elasticsearch.xpack.profiling;
package org.elasticsearch.xpack.profiling.action;

import org.elasticsearch.action.ActionResponse;
import org.elasticsearch.action.support.TransportAction;
Expand Down
2 changes: 1 addition & 1 deletion ...csearch/xpack/profiling/HostMetadata.java → .../xpack/profiling/action/HostMetadata.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* 2.0.
*/

package org.elasticsearch.xpack.profiling;
package org.elasticsearch.xpack.profiling.action;

import org.elasticsearch.core.UpdateForV9;
import org.elasticsearch.xcontent.ToXContentObject;
Expand Down
2 changes: 1 addition & 1 deletion ...arch/xpack/profiling/IndexAllocation.java → ...ack/profiling/action/IndexAllocation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* 2.0.
*/

package org.elasticsearch.xpack.profiling;
package org.elasticsearch.xpack.profiling.action;

import org.elasticsearch.cluster.ClusterState;
import org.elasticsearch.cluster.metadata.IndexMetadata;
Expand Down
2 changes: 1 addition & 1 deletion ...csearch/xpack/profiling/InstanceType.java → .../xpack/profiling/action/InstanceType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* 2.0.
*/

package org.elasticsearch.xpack.profiling;
package org.elasticsearch.xpack.profiling.action;

import org.elasticsearch.core.UpdateForV9;
import org.elasticsearch.xcontent.ToXContentObject;
Expand Down
2 changes: 1 addition & 1 deletion .../xpack/profiling/InstanceTypeService.java → ...profiling/action/InstanceTypeService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* 2.0.
*/

package org.elasticsearch.xpack.profiling;
package org.elasticsearch.xpack.profiling.action;

import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
Expand Down
2 changes: 1 addition & 1 deletion ...arch/xpack/profiling/KvIndexResolver.java → ...ack/profiling/action/KvIndexResolver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* 2.0.
*/

package org.elasticsearch.xpack.profiling;
package org.elasticsearch.xpack.profiling.action;

import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
Expand Down
2 changes: 1 addition & 1 deletion ...icsearch/xpack/profiling/NumberUtils.java → ...h/xpack/profiling/action/NumberUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* 2.0.
*/

package org.elasticsearch.xpack.profiling;
package org.elasticsearch.xpack.profiling.action;

final class NumberUtils {
private NumberUtils() {
Expand Down
2 changes: 1 addition & 1 deletion ...ofiling/ProfilingInfoTransportAction.java → .../action/ProfilingInfoTransportAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* 2.0.
*/

package org.elasticsearch.xpack.profiling;
package org.elasticsearch.xpack.profiling.action;

import org.elasticsearch.action.support.ActionFilters;
import org.elasticsearch.common.inject.Inject;
Expand Down
2 changes: 1 addition & 1 deletion ...ck/profiling/ProfilingLicenseChecker.java → ...iling/action/ProfilingLicenseChecker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* 2.0.
*/

package org.elasticsearch.xpack.profiling;
package org.elasticsearch.xpack.profiling.action;

import org.elasticsearch.license.License;
import org.elasticsearch.license.LicenseUtils;
Expand Down
2 changes: 1 addition & 1 deletion ...filing/ProfilingUsageTransportAction.java → ...action/ProfilingUsageTransportAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* 2.0.
*/

package org.elasticsearch.xpack.profiling;
package org.elasticsearch.xpack.profiling.action;

import org.elasticsearch.action.ActionListener;
import org.elasticsearch.action.support.ActionFilters;
Expand Down
2 changes: 1 addition & 1 deletion ...sticsearch/xpack/profiling/Resampler.java → ...rch/xpack/profiling/action/Resampler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* 2.0.
*/

package org.elasticsearch.xpack.profiling;
package org.elasticsearch.xpack.profiling.action;

import java.util.Random;
import java.util.random.RandomGenerator;
Expand Down
2 changes: 1 addition & 1 deletion ...ticsearch/xpack/profiling/StackFrame.java → ...ch/xpack/profiling/action/StackFrame.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* 2.0.
*/

package org.elasticsearch.xpack.profiling;
package org.elasticsearch.xpack.profiling.action;

import org.elasticsearch.xcontent.ToXContentObject;
import org.elasticsearch.xcontent.XContentBuilder;
Expand Down
2 changes: 1 addition & 1 deletion ...ticsearch/xpack/profiling/StackTrace.java → ...ch/xpack/profiling/action/StackTrace.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* 2.0.
*/

package org.elasticsearch.xpack.profiling;
package org.elasticsearch.xpack.profiling.action;

import org.elasticsearch.xcontent.ObjectPath;
import org.elasticsearch.xcontent.ToXContentObject;
Expand Down
2 changes: 1 addition & 1 deletion ...sticsearch/xpack/profiling/StopWatch.java → ...rch/xpack/profiling/action/StopWatch.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* 2.0.
*/

package org.elasticsearch.xpack.profiling;
package org.elasticsearch.xpack.profiling.action;

/**
* Measures time and logs it in milliseconds.
Expand Down
2 changes: 1 addition & 1 deletion ...csearch/xpack/profiling/TopNFunction.java → .../xpack/profiling/action/TopNFunction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* 2.0.
*/

package org.elasticsearch.xpack.profiling;
package org.elasticsearch.xpack.profiling.action;

import org.elasticsearch.xcontent.ToXContentObject;
import org.elasticsearch.xcontent.XContentBuilder;
Expand Down
2 changes: 1 addition & 1 deletion ...ticsearch/xpack/profiling/TraceEvent.java → ...ch/xpack/profiling/action/TraceEvent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* 2.0.
*/

package org.elasticsearch.xpack.profiling;
package org.elasticsearch.xpack.profiling.action;

import java.util.HashMap;
import java.util.Map;
Expand Down
2 changes: 1 addition & 1 deletion ...ofiling/TransportGetFlamegraphAction.java → .../action/TransportGetFlamegraphAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* 2.0.
*/

package org.elasticsearch.xpack.profiling;
package org.elasticsearch.xpack.profiling.action;

import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
Expand Down
Loading