8000 Add jms as an extra integration name where there is JMS involved by vandonr · Pull Request #8933 · DataDog/dd-trace-java · GitHub
[go: up one dir, main page]
Skip to content

8000 Add jms as an extra integration name where there is JMS involved #8933

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

Merged
merged 3 commits into from
Jun 6, 2025
Merged

Add jms as an extra integration name where there is JMS involved #8933

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a82b2c7
add jms as an extra integration name where there is JMS involved
vandonr Jun 5, 2025
fac125e
address comments
vandonr Jun 5, 2025
4b56007
keep parameters to super exlicit (at the cost of a little bit of dupl…
vandonr Jun 6, 2025
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
Prev Previous commit
Next Next commit
address comments
  • Loading branch information
@vandonr
vandonr committed Jun 5, 2025
commit fac125e107a872b282256b4b98355dc351122c9a
11 changes: 1 addition & 10 deletions ...ava-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/InstrumenterModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ public enum TargetSystem {
private static final Logger log = LoggerFactory.getLogger(InstrumenterModule.class);

protected static final String[] NO_HELPERS = {};
protected static final String[] NO_ADDITIONAL_NAMES = NO_HELPERS;
protected static final String[] NO_ADDITIONAL_NAMES = {};

private final List<String> instrumentationNames;
private final String instrumentationPrimaryName;
Expand All @@ -73,15 +73,6 @@ public InstrumenterModule(final String instrumentationName, final String... addi
enabled = InstrumenterConfig.get().isIntegrationEnabled(instrumentationNames, defaultEnabled());
}

/** Helper method for the ctor above, use to add values to an already built vararg array */
public static String[] concat(String[] arr, String... extra) {
if (arr.length == 0) return extra;
String[] result = new String[arr.length + extra.length];
System.arraycopy(arr, 0, result, 0, arr.length);
System.arraycopy(extra, 0, result, arr.length, extra.length);
return result;
}

public String name() {
return instrumentationPrimaryName;
}
Expand Down
3 changes: 2 additions & 1 deletion ....0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/AbstractSqsInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
package datadog.trace.instrumentation.aws.v1.sqs;

import datadog.trace.agent.tooling.InstrumenterModule;
import datadog.trace.util.Strings;

public abstract class AbstractSqsInstrumentation extends InstrumenterModule.Tracing {
public AbstractSqsInstrumentation() {
this(NO_ADDITIONAL_NAMES);
}

public AbstractSqsInstrumentation(String... additionalNames) {
super("sqs", concat(additionalNames, "aws-sdk"));
super("sqs", Strings.concat(additionalNames, "aws-sdk"));
}
}
3 changes: 2 additions & 1 deletion ....0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/AbstractSqsInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
package datadog.trace.instrumentation.aws.v2.sqs;

import datadog.trace.agent.tooling.InstrumenterModule;
import datadog.trace.util.Strings;

public abstract class AbstractSqsInstrumentation extends InstrumenterModule.Tracing {
public AbstractSqsInstrumentation() {
this(NO_ADDITIONAL_NAMES);
}

public AbstractSqsInstrumentation(String... additionalNames) {
super("sqs", concat(additionalNames, "aws-sdk"));
super("sqs", Strings.concat(additionalNames, "aws-sdk"));
}
}
3 changes: 2 additions & 1 deletion ...-6/src/main/java/datadog/trace/instrumentation/tibcobw6/AbstractTibcoInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import datadog.trace.agent.tooling.InstrumenterModule;
import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
import datadog.trace.util.Strings;
import java.util.HashMap;
import java.util.Map;

Expand All @@ -11,7 +12,7 @@ public AbstractTibcoInstrumentation() {
}

public AbstractTibcoInstrumentation(String... additionalNames) {
super("tibco", concat(additionalNames, "tibco_bw"));
super("tibco", Strings.concat(additionalNames, "tibco_bw"));
}

@Override
Expand Down
9 changes: 9 additions & 0 deletions internal-api/src/main/java/datadog/trace/util/Strings.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,4 +220,13 @@ public static String toHexString(byte[] value) {
}
return new String(bytes, US_ASCII);
}

public static String[] concat(String[] arr, String... extra) {
if (arr.length == 0) return extra;
if (extra.length == 0) return arr;
String[] result = new String[arr.length + extra.length];
System.arraycopy(arr, 0, result, 0, arr.length);
System.arraycopy(extra, 0, result, arr.length, extra.length);
return result;
}
}
Loading
0