-
Notifications
You must be signed in to change notification settings - Fork 148
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into release/csec/v1.5.0
- Loading branch information
Showing
125 changed files
with
6,076 additions
and
229 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,117 @@ | ||
| <template name="nrAtTrace" value="@com.newrelic.api.agent.Trace" description="@Trace" toReformat="true" toShortenFQNames="true"> | ||
| <context> | ||
| <option name="JAVA_DECLARATION" value="true" /> | ||
| </context> | ||
| </template> | ||
| <template name="nrAtTraceAsync" value="@com.newrelic.api.agent.Trace(async = true)" description="@Trace(async = true)" toReformat="true" toShortenFQNames="true"> | ||
| <context> | ||
| <option name="JAVA_DECLARATION" value="true" /> | ||
| </context> | ||
| </template> | ||
| <template name="nrAtTraceDispatcher" value="@com.newrelic.api.agent.Trace(dispatcher = true)" description="@Trace(dispatcher = true)" toReformat="true" toShortenFQNames="true"> | ||
| <context> | ||
| <option name="JAVA_DECLARATION" value="true" /> | ||
| </context> | ||
| </template> | ||
| <template name="nrAtWeave" value="@com.newrelic.api.agent.weaver.Weave(type = com.newrelic.api.agent.weaver.MatchType.$MATCH_TYPE$, originalName = "$CLASS_NAME$")" description="@Weave(originalName = "java.my.Class", type = Match..." toReformat="true" toShortenFQNames="true"> | ||
| <variable name="MATCH_TYPE" expression="enum("ExactClass", "BaseClass", "Interface")" defaultValue="" alwaysStopAt="true" /> | ||
| <variable name="CLASS_NAME" expression="regularExpression(concat(currentPackage(), ".", fileNameWithoutExtension()), "_.*", "")"" defaultValue="" alwaysStopAt="true" /> | ||
| <context> | ||
| <option name="JAVA_DECLARATION" value="true" /> | ||
| </context> | ||
| </template> | ||
| <template name="nrCallOriginal" value="com.newrelic.api.agent.weaver.Weaver.callOriginal();" description="Weaver.callOriginal();" toReformat="true" toShortenFQNames="true"> | ||
| <context> | ||
| <option name="JAVA_EXPRESSION" value="true" /> | ||
| <option name="JAVA_STATEMENT" value="true" /> | ||
| </context> | ||
| </template> | ||
| <template name="nrCallOriginalReturn" value="return com.newrelic.api.agent.weaver.Weaver.callOriginal();" description="return Weaver.callOriginal();" toReformat="true" toShortenFQNames="true"> | ||
| <context> | ||
| <option name="JAVA_STATEMENT" value="true" /> | ||
| </context> | ||
| </template> | ||
| <template name="nrConfig" value="com.newrelic.api.agent.NewRelic.getAgent().getConfig().getValue("$NAME$", $VALUE$);" description="NewRelic.getAgent().getConfig().getValue(...)" toReformat="true" toShortenFQNames="true"> | ||
| <variable name="NAME" expression="" defaultValue="" alwaysStopAt="true" /> | ||
| <variable name="VALUE" expression="" defaultValue="" alwaysStopAt="true" /> | ||
| <context> | ||
| <option name="JAVA_EXPRESSION" value="true" /> | ||
| </context> | ||
| </template> | ||
| <template name="nrHttpParams" value="com.newrelic.api.agent.HttpParameters $PARAMS$ = com.newrelic.api.agent.HttpParameters .library($LIBRARY$) .uri($URI$) .procedure($PROC$) .inboundHeaders($INBOUND_HEADERS$) .status($STATUS_CODE$, $STATUS_TEXT$) .build();" description="HttpParams params = HttpParams.library()...build();" toReformat="true" toShortenFQNames="true"> | ||
| <variable name="PARAMS" expression="suggestVariableName()" defaultValue="" alwaysStopAt="true" /> | ||
| <variable name="LIBRARY" expression="variableOfType("java.lang.String")" defaultValue="" alwaysStopAt="true" /> | ||
| <variable name="URI" expression="variableOfType("java/net/URI.java")" defaultValue="" alwaysStopAt="true" /> | ||
| <variable name="PROC" expression="variableOfType("java.lang.String")" defaultValue="" alwaysStopAt="true" /> | ||
| <variable name="INBOUND_HEADERS" expression="" defaultValue="" alwaysStopAt="true" /> | ||
| <variable name="STATUS_CODE" expression="variableOfType("int")" defaultValue="" alwaysStopAt="true" /> | ||
| <variable name="STATUS_TEXT" expression="variableOfType("java.lang.String")" defaultValue="" alwaysStopAt="true" /> | ||
| <context> | ||
| <option name="JAVA_STATEMENT" value="true" /> | ||
| </context> | ||
| </template> | ||
| <template name="nrLog" value="com.newrelic.api.agent.NewRelic.getAgent().getLogger().log(java.util.logging.Level.$LEVEL$, "$MSG$");" description="NewRelic.getAgent().getLogger().log(Level..." toReformat="true" toShortenFQNames="true"> | ||
| <variable name="LEVEL" expression="enum("SEVERE", "WARNING", "INFO", "FINE", "FINER", "FINEST")" defaultValue="" alwaysStopAt="true" /> | ||
| <variable name="MSG" expression="" defaultValue="" alwaysStopAt="true" /> | ||
| <context> | ||
| <option name="JAVA_STATEMENT" value="true" /> | ||
| </context> | ||
| </template> | ||
| <template name="nrMessageConsumeParams" value="com.newrelic.api.agent.MessageConsumeParameters $PARAMS$ = com.newrelic.api.agent.MessageConsumeParameters .library($LIBRARY$, $OTEL_LIBRARY$) .destinationType($DEST_TYPE$) .destinationName($DEST_NAME$) .inboundHeaders($OUTBOUND_HEADERS$) .cloudRegion($REGION$) .cloudAccountId($ACCOUNT_ID$) .build();" description="MessageProducerParams params = MessageProducerParams.builder()..." toReformat="true" toShortenFQNames="true"> | ||
| <variable name="PARAMS" expression="suggestVariableName()" defaultValue="" alwaysStopAt="true" /> | ||
| <variable name="LIBRARY" expression="variableOfType("java.lang.String")" defaultValue="" alwaysStopAt="true" /> | ||
| <variable name="OTEL_LIBRARY" expression="variableOfType("java.lang.String")" defaultValue="" alwaysStopAt="true" /> | ||
| <variable name="DEST_TYPE" expression="enum("com.newrelic.api.agent.DestinationType.NAMED_QUEUE","com.newrelic.api.agent.DestinationType.TEMP_QUEUE","com.newrelic.api.agent.DestinationType.NAMED_TOPIC","com.newrelic.api.agent.DestinationType.TEMP_TOPIC","com.newrelic.api.agent.DestinationType.EXCHANGE")" defaultValue="" alwaysStopAt="true" /> | ||
| <variable name="DEST_NAME" expression="variableOfType("java.lang.String")" defaultValue="" alwaysStopAt="true" /> | ||
| <variable name="OUTBOUND_HEADERS" expression="variableOfType("com.newrelic.api.agent.OutboundHeaders")" defaultValue="" alwaysStopAt="true" /> | ||
| <variable name="REGION" expression="variableOfType("java.lang.String")" defaultValue="" alwaysStopAt="true" /> | ||
| <variable name="ACCOUNT_ID" expression="variableOfType("java.lang.String")" defaultValue="" alwaysStopAt="true" /> | ||
| <context> | ||
| <option name="JAVA_STATEMENT" value="true" /> | ||
| </context> | ||
| </template> | ||
| <template name="nrMessageProduceParams" value="com.newrelic.api.agent.MessageProduceParameters $PARAMS$ = com.newrelic.api.agent.MessageProduceParameters .library($LIBRARY$, $OTEL_LIBRARY$) .destinationType($DEST_TYPE$) .destinationName($DEST_NAME$) .outboundHeaders($OUTBOUND_HEADERS$) .cloudRegion($REGION$) .cloudAccountId($ACCOUNT_ID$) .build();" description="MessageProducerParams params = MessageProducerParams.builder()..." toReformat="true" toShortenFQNames="true"> | ||
| <variable name="PARAMS" expression="suggestVariableName()" defaultValue="" alwaysStopAt="true" /> | ||
| <variable name="LIBRARY" expression="variableOfType("java.lang.String")" defaultValue="" alwaysStopAt="true" /> | ||
| <variable name="OTEL_LIBRARY" expression="variableOfType("java.lang.String")" defaultValue="" alwaysStopAt="true" /> | ||
| <variable name="DEST_TYPE" expression="enum("com.newrelic.api.agent.DestinationType.NAMED_QUEUE","com.newrelic.api.agent.DestinationType.TEMP_QUEUE","com.newrelic.api.agent.DestinationType.NAMED_TOPIC","com.newrelic.api.agent.DestinationType.TEMP_TOPIC","com.newrelic.api.agent.DestinationType.EXCHANGE")" defaultValue="" alwaysStopAt="true" /> | ||
| <variable name="DEST_NAME" expression="variableOfType("java.lang.String")" defaultValue="" alwaysStopAt="true" /> | ||
| <variable name="OUTBOUND_HEADERS" expression="variableOfType("com.newrelic.api.agent.OutboundHeaders")" defaultValue="" alwaysStopAt="true" /> | ||
| <variable name="REGION" expression="variableOfType("java.lang.String")" defaultValue="" alwaysStopAt="true" /> | ||
| <variable name="ACCOUNT_ID" expression="variableOfType("java.lang.String")" defaultValue="" alwaysStopAt="true" /> | ||
| <context> | ||
| <option name="JAVA_STATEMENT" value="true" /> | ||
| </context> | ||
| </template> | ||
| <template name="nrReportAsExternal" value="com.newrelic.api.agent.NewRelic.getAgent().getTracedMethod().reportAsExternal($PARAMS$);" description="NewRelic.getAgent().getTracedMethod().reportAsExternal(params);" toReformat="true" toShortenFQNames="true"> | ||
| <variable name="PARAMS" expression="variableOfType("com.newrelic.api.agent.ExternalParameters")" defaultValue="" alwaysStopAt="true" /> | ||
| <context> | ||
| <option name="JAVA_STATEMENT" value="true" /> | ||
| </context> | ||
| </template> | ||
| <template name="nrSegment" value="com.newrelic.api.agent.Segment $SEGMENT$ = com.newrelic.api.agent.NewRelic.getAgent().getTransaction().startSegment("$CATEGORY$", "$NAME$");" description="Segment segment = NewRelic.getAgent().getTransaction().startSegment();" toReformat="true" toShortenFQNames="true"> | ||
| <variable name="SEGMENT" expression="suggestVariableName()" defaultValue="" alwaysStopAt="true" /> | ||
| <variable name="CATEGORY" expression="enum("category")" defaultValue="" alwaysStopAt="true" /> | ||
| <variable name="NAME" expression="enum("optional name")" defaultValue="" alwaysStopAt="true" /> | ||
| <context> | ||
| <option name="JAVA_STATEMENT" value="true" /> | ||
| </context> | ||
| </template> | ||
| <template name="nrToken" value="com.newrelic.api.agent.Token $TOKEN$ = com.newrelic.api.agent.NewRelic.getAgent().getTransaction().getToken();" description="Token token = NewRelic.getAgent().getTransaction().getToken();" toReformat="true" toShortenFQNames="true"> | ||
| <variable name="TOKEN" expression="suggestVariableName()" defaultValue="" alwaysStopAt="true" /> | ||
| <context> | ||
| <option name="JAVA_STATEMENT" value="true" /> | ||
| </context> | ||
| </template> | ||
| <template name="nrTracedMethod" value="com.newrelic.api.agent.TracedMethod $TRACER$ = com.newrelic.api.agent.NewRelic.getAgent().getTracedMethod();" description="TracedMethod tracedMethod = NewRelic.getAgent().getTracedMethod();" toReformat="true" toShortenFQNames="true"> | ||
| <variable name="TRACER" expression="suggestVariableName()" defaultValue="tracer" alwaysStopAt="true" /> | ||
| <context> | ||
| <option name="JAVA_STATEMENT" value="true" /> | ||
| </context> | ||
| </template> | ||
| <template name="nrTx" value="com.newrelic.api.agent.Transaction $TRANSACTION$ = com.newrelic.api.agent.NewRelic.getAgent().getTransaction();" description="Transaction transaction = NewRelic.getAgent().getTransaction();" toReformat="true" toShortenFQNames="true"> | ||
| <variable name="TRANSACTION" expression="enum("transaction", "tx")" defaultValue="" alwaysStopAt="true" /> | ||
| <context> | ||
| <option name="JAVA_STATEMENT" value="true" /> | ||
| </context> | ||
| </template> |
Oops, something went wrong.