Skip to content

Avoid leaking continuations on google pubsub instrumentation #11605

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

Closed
amarziali wants to merge 1 commit into from
+12 −8
Closed

Avoid leaking continuations on google pubsub instrumentation #11605

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
15 changes: 12 additions & 3 deletions ...ub-1.116/src/main/java/datadog/trace/instrumentation/googlepubsub/GooglePubSubModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
package datadog.trace.instrumentation.googlepubsub;

import static datadog.trace.bootstrap.instrumentation.java.concurrent.ExcludeFilter.ExcludeType.EXECUTOR;
import static datadog.trace.bootstrap.instrumentation.java.concurrent.ExcludeFilter.ExcludeType.RUNNABLE;
import static java.util.Arrays.asList;
import static java.util.Collections.singletonList;
import static java.util.Collections.singletonMap;

import com.google.auto.service.AutoService;
import datadog.trace.agent.tooling.ExcludeFilterProvider;
import datadog.trace.agent.tooling.Instrumenter;
import datadog.trace.agent.tooling.InstrumenterModule;
import datadog.trace.bootstrap.instrumentation.java.concurrent.ExcludeFilter;
import java.util.Collection;
import java.util.EnumMap;
import java.util.List;
import java.util.Map;

Expand All @@ -35,7 +35,16 @@ public String[] helperClassNames() {

@Override
public Map<ExcludeFilter.ExcludeType, ? extends Collection<String>> excludedClasses() {
return singletonMap(RUNNABLE, singletonList("com.google.api.gax.rpc.Watchdog"));
final List<String> gaxInternalRunnables =
asList(
"com.google.api.gax.rpc.Watchdog",
"com.google.api.gax.retrying.BasicRetryingFuture$CompletionListener",
"com.google.api.gax.retrying.CallbackChainRetryingFuture$AttemptCompletionListener");
final Map<ExcludeFilter.ExcludeType, Collection<String>> excluded =
new EnumMap<>(ExcludeFilter.ExcludeType.class);
excluded.put(RUNNABLE, gaxInternalRunnables);
excluded.put(EXECUTOR, gaxInternalRunnables);
return excluded;
}

@Override
Expand Down
5 changes: 0 additions & 5 deletions dd-java-agent/instrumentation/google-pubsub-1.116/src/test/groovy/PubSubTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,11 +69,6 @@ abstract class PubSubTest extends VersionedNamingTestBase {
null
}

@Override
boolean useStrictTraceWrites() {
false
}

boolean shadowGrpcSpans() {
true
}
Expand Down