Implement attempt to fix v3 and v4#8823

daniel-mohedano wants to merge 13 commits intomasterDataDog/dd-trace-java:masterfrom

daniel.mohedano/attempt-to-fix-v4DataDog/dd-trace-java:daniel.mohedano/attempt-to-fix-v4Copy head branch name to clipboard