Skip to content

Commit 0a4cc59

Browse files
daniel-mohedanodaniel-mohedano
authored
Merge branch 'master' into daniel.mohedano/sha-discrepancies-telemetry
2 parents 967decc + 746a7fd commit 0a4cc59

82 files changed

Lines changed: 721 additions & 107 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.circleci/config.continue.yml.j2‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ instrumentation_modules: &instrumentation_modules "dd-java-agent/instrumentation
3636
debugger_modules: &debugger_modules "dd-java-agent/agent-debugger|dd-java-agent/agent-bootstrap|dd-java-agent/agent-builder|internal-api|communication|dd-trace-core"
3737
profiling_modules: &profiling_modules "dd-java-agent/agent-profiling"
3838

39-
default_system_tests_commit: &default_system_tests_commit 380d8deb4dd86369e30827ae3d908400c91d2d3e
39+
default_system_tests_commit: &default_system_tests_commit 121787cbd6b3e5bc2840a0d5df17ecfb45566837
4040

4141
parameters:
4242
nightly:

‎.github/workflows/README.md‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,13 @@ _Action:_ Build the Java Client Library and runs [the system tests](https://gith
137137

138138
_Recovery:_ Manually trigger the action on the desired branch.
139139

140+
### all-green [🔗](all-green.yaml)
141+
142+
_Trigger:_ Any pull request.
143+
144+
_Action:_ This action will check all other jobs (Github action, Gitlab, CircleCi), and will fail if any of them fails. This action got an `ignored` paraemters to exclude some jobs if they are temprorary failing. The purpose of this job is to be required for merges, achieving Green CI Policy.
145+
146+
_Recovery:_ Manually trigger the action on the desired branch.
140147

141148
## Maintenance
142149

‎.github/workflows/all-green.yml‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
name: Check Pull Request CI Status
2+
3+
on:
4+
pull_request:
5+
types:
6+
- opened
7+
- synchronize
8+
- reopened
9+
10+
concurrency:
11+
group: ${{ github.workflow }}-${{ github.ref }}
12+
cancel-in-progress: true
13+
14+
permissions:
15+
checks: read
16+
statuses: read
17+
18+
jobs:
19+
all-jobs-are-green:
20+
runs-on: ubuntu-latest
21+
steps:
22+
- name: Run Ensure CI Success
23+
uses: DataDog/ensure-ci-success@f40e6ffd8e60280d478b9b92209aaa30d3d56895
24+
with:
25+
initial-delay-seconds: "1000"
26+
max-retries: "60"
27+
ignored-name-patterns: |
28+
dd-gitlab/default-pipeline
29+
dd-gitlab/check_inst 4/4
30+
dd-gitlab/muzzle .*
31+
32+
# ignored jobs :
33+
#
34+
# * dd-gitlab/default-pipeline => success rate of 70% (needs an owner)
35+
# * dd-gitlab/check_inst 4/4 => success rate of 78% (needs an owner)
36+
# * dd-gitlab/muzzle .* => success rate of ~85% (needs an owner)

‎build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ plugins {
2222
id 'pl.allegro.tech.build.axion-release' version '1.14.4'
2323
id 'io.github.gradle-nexus.publish-plugin' version '1.3.0'
2424

25-
id "com.github.johnrengelman.shadow" version "7.1.2" apply false
25+
id "com.github.johnrengelman.shadow" version "8.1.1" apply false
2626
id "me.champeau.jmh" version "0.7.0" apply false
2727
id 'org.gradle.playframework' version '0.13' apply false
2828
id 'info.solidsoft.pitest' version '1.9.11' apply false

‎buildSrc/build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ dependencies {
3030
implementation(gradleApi())
3131
implementation(localGroovy())
3232

33-
implementation("net.bytebuddy", "byte-buddy-gradle-plugin", "1.15.11")
33+
implementation("net.bytebuddy", "byte-buddy-gradle-plugin", "1.17.5")
3434

3535
implementation("org.eclipse.aether", "aether-connector-basic", "1.1.0")
3636
implementation("org.eclipse.aether", "aether-transport-http", "1.1.0")

‎buildSrc/call-site-instrumentation-plugin/build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ dependencies {
3636
implementation("org.ow2.asm", "asm-tree", "9.8")
3737
implementation("com.github.javaparser", "javaparser-symbol-solver-core", "3.24.4")
3838

39-
testImplementation("net.bytebuddy", "byte-buddy", "1.15.11")
39+
testImplementation("net.bytebuddy", "byte-buddy", "1.17.5")
4040
testImplementation("org.spockframework", "spock-core", "2.0-groovy-3.0")
4141
testImplementation("org.objenesis", "objenesis", "3.0.1")
4242
testImplementation("org.codehaus.groovy", "groovy-all", "3.0.17")

‎buildSrc/src/main/groovy/MuzzlePlugin.groovy‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,11 +55,15 @@ class MuzzlePlugin implements Plugin<Project> {
5555

5656
static {
5757
RemoteRepository central = new RemoteRepository.Builder("central", "default", "https://repo1.maven.org/maven2/").build()
58-
// Only needed for restlet
59-
RemoteRepository restlet = new RemoteRepository.Builder("restlet", "default", "https://maven.restlet.talend.com/").build()
60-
// Only needed for play-2.3
61-
RemoteRepository typesafe = new RemoteRepository.Builder("typesafe", "default", "https://repo.typesafe.com/typesafe/maven-releases/").build()
62-
MUZZLE_REPOS = Collections.unmodifiableList(Arrays.asList(central, restlet, typesafe))
58+
59+
String mavenProxyUrl = System.getenv("MAVEN_REPOSITORY_PROXY")
60+
61+
if (mavenProxyUrl == null) {
62+
MUZZLE_REPOS = Collections.singletonList(central)
63+
} else {
64+
RemoteRepository proxy = new RemoteRepository.Builder("central-proxy", "default", mavenProxyUrl).build()
65+
MUZZLE_REPOS = Collections.unmodifiableList(Arrays.asList(proxy, central))
66+
}
6367
}
6468

6569
static class TestedArtifact {

‎buildSrc/src/test/groovy/CallSiteInstrumentationPluginTest.groovy‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class CallSiteInstrumentationPluginTest extends Specification {
2727
}
2828
2929
dependencies {
30-
implementation group: 'net.bytebuddy', name: 'byte-buddy', version: '1.15.11'
30+
implementation group: 'net.bytebuddy', name: 'byte-buddy', version: '1.17.5'
3131
implementation group: 'com.google.auto.service', name: 'auto-service-annotations', version: '1.0-rc7'
3232
}
3333
'''

‎buildSrc/src/test/groovy/InstrumentPluginTest.groovy‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ class InstrumentPluginTest extends Specification {
2323
}
2424
2525
dependencies {
26-
compileOnly group: 'net.bytebuddy', name: 'byte-buddy', version: '1.15.11' // just to build TestPlugin
26+
compileOnly group: 'net.bytebuddy', name: 'byte-buddy', version: '1.17.5' // just to build TestPlugin
2727
}
2828
2929
apply plugin: 'instrument'

‎dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/decorator/BaseDecorator.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,9 @@ public AgentSpan afterStart(final AgentSpan span) {
6969
if (spanType() != null) {
7070
span.setSpanType(spanType());
7171
}
72-
span.setTag(Tags.COMPONENT, component());
72+
final CharSequence component = component();
73+
span.setTag(Tags.COMPONENT, component);
74+
span.context().setIntegrationName(component);
7375
if (traceAnalyticsEnabled) {
7476
span.setMetric(DDTags.ANALYTICS_SAMPLE_RATE, traceAnalyticsSampleRate);
7577
}

0 commit comments

Comments
 (0)