Merge branch 'master' into drodriguezhdez/ciapp_feature_tracking

DataDog · Mar 8, 2021 · caf8299 · caf8299
2 parents 4bb1411 + f11d1e3
commit caf8299
Show file tree

Hide file tree

Showing 137 changed files with 2,029 additions and 468 deletions.
diff --git a/.github/workflows/draft-release-notes-on-tag.yaml b/.github/workflows/draft-release-notes-on-tag.yaml
@@ -21,16 +21,14 @@ jobs:
         with:
           github-token: ${{secrets.GITHUB_TOKEN}}
           script: |
-            const options = github.issues.listMilestonesForRepo.endpoint.merge({
+            const milestone = await github.paginate(github.issues.listMilestones, {
               owner: context.repo.owner,
               repo: context.repo.repo,
               state: 'all'
+            }).then((milestones) => {
+              milestones.find(milestone => milestone.title == '${{steps.milestoneTitle.outputs.result}}')
             })
 
-            const milestones = await github.paginate(options)
-
-            const milestone = milestones.find( milestone => milestone.title == '${{steps.milestoneTitle.outputs.result}}' )
-
             if (milestone) {
               return milestone.number
             } else {
@@ -44,15 +42,13 @@ jobs:
           github-token: ${{secrets.GITHUB_TOKEN}}
           result-encoding: string
           script: |
-            const options = github.pulls.list.endpoint.merge({
+            const pullRequests = await github.paginate(github.pulls.list, {
               owner: context.repo.owner,
               repo: context.repo.repo,
               state: 'closed',
               base: 'master'
             })
 
-            const pullRequests = await github.paginate(options)
-
             var draftText = "# Improvements \n\n# Changes \n\n"
             for (let pull of pullRequests) {
               if (pull.merged_at && pull.milestone && pull.milestone.number == ${{steps.milestone.outputs.result}}) {

diff --git a/.github/workflows/increment-milestones-on-tag.yaml b/.github/workflows/increment-milestones-on-tag.yaml
@@ -21,16 +21,14 @@ jobs:
         with:
           github-token: ${{secrets.GITHUB_TOKEN}}
           script: |
-            const options = github.issues.listMilestonesForRepo.endpoint.merge({
+            const milestone = await github.paginate(github.issues.listMilestones, {
               owner: context.repo.owner,
               repo: context.repo.repo,
               state: 'all'
+            }).then((milestones) => {
+              milestones.find(milestone => milestone.title == '${{steps.milestoneTitle.outputs.result}}')
             })
 
-            const milestones = await github.paginate(options)
-
-            const milestone = milestones.find( milestone => milestone.title == '${{steps.milestoneTitle.outputs.result}}' )
-
             if (milestone) {
               return milestone.number
             } else {

diff --git a/.github/workflows/update-issues-on-release.yaml b/.github/workflows/update-issues-on-release.yaml
@@ -2,6 +2,11 @@ name: Update issues on release
 on:
   release:
     types: [published]
+  workflow_dispatch:
+    inputs:
+      milestone:
+        required: true
+        default: "0.0.0"
 
 jobs:
   update_issues:
@@ -13,30 +18,29 @@ jobs:
         with:
           github-token: ${{secrets.GITHUB_TOKEN}}
           script: |
-            const options = github.issues.listMilestonesForRepo.endpoint.merge({
+            const milestone_name = ("${{github.event_name}}" == "workflow_dispatch") ?
+              "${{github.event.inputs.milestone}}" : "${{github.event.release.name}}"
+
+            const milestones = await github.paginate(github.issues.listMilestones, {
               owner: context.repo.owner,
               repo: context.repo.repo,
               state: 'all'
             })
 
-            const milestones = await github.paginate(options)
-
-            return milestones.find( milestone => milestone.title == "${{github.event.release.name}}" ).number
+            return milestones.find( milestone => milestone.title == milestone_name ).number
       - name: Get issues for milestone
         id: issues
         uses: actions/github-script@47f7cf65b5ced0830a325f705cad64f2f58dddf7 # 3.1.0
         with:
           github-token: ${{secrets.GITHUB_TOKEN}}
           script: |
-            const options = github.issues.listForRepo.endpoint.merge({
+            const issues = await github.paginate(github.issues.listForRepo, {
               owner: context.repo.owner,
               repo: context.repo.repo,
               state: 'all',
               milestone: ${{steps.milestone.outputs.result}}
             })
 
-            const issues = await github.paginate(options)
-
             // Pull requests are issues so filter them out
             return issues.filter( issue => !issue["pull_request"] ).map( issue => issue.number )
       - name: Comment and close issues

diff --git a/LICENSE-3rdparty.csv b/LICENSE-3rdparty.csv
@@ -1,12 +1,23 @@
 Component,Origin,License,Copyright
-https://github.com/DataDog/dd-trace-java/blob/dev/dd-trace/src/main/java/com/datadoghq/trace/propagation/Codec.java,Uber,MIT,
-import,io.opentracing,Apache-2.0,Copyright 2016-2017 The OpenTracing Authors
+various,io.opentelemetry,Apache-2.0,Copyright The OpenTracing Authors
+various,io.opentracing,Apache-2.0,Copyright The OpenTracing Authors
+import,org.objectweb.asm,BSD 3-Clause,"Copyright (c) 2000-2011 INRIA, France Telecom"
+import,com.googlecode.concurrentlinkedhashmap,Apache-2.0,Copyright 2010 Google Inc.
+import,com.github.benmanes,Apache-2.0,Copyright 2014 Ben Manes
+import,net.bytebuddy,Apache-2.0,Copyright 2014 - Present Rafael Winterhalter
+import,com.blogspot.mydailyjava.weaklockfree,Apache-2.0,
+import,org.jctools,Apache-2.0,
+import,jnr,Apache-2.0,
+import,com.kenai.constantine,Apache-2.0,
+import,com.google.auto.service,Apache-2.0,Copyright 2013 Google Inc.
+import,okhttp3,Apache-2.0,"Copyright (C) 2014 Square, Inc."
+import,okio,Apache-2.0,"Copyright (C) 2014 Square, Inc."
+import,com.timgroup.statsd,Apache-2.0,"Copyright (C) 2014 youDevise, Ltd."
+import,com.squareup,Apache-2.0,"Copyright (C) 2014 Square, Inc."
 import,org.slf4j,MIT,Copyright (c) 2004-2017 QOS.ch
+import,org.openjdk.jmc,UPL-1.0,"Copyright (c) 2018 Oracle America, Inc"
+import,net.jpountz,Apache-2.0,
 import,com.fasterxml.jackson,Apache-2.0,
-import,com.google.auto.service.AutoService,Apache-2.0,"Copyright 2013 Google, Inc."
-logback.xml,ch.qos.logback,EPL-1.0 OR LGPL-2.1,"Copyright (C) 1999-2015, QOS.ch. All rights reserved."
-logback.xml,net.logstash.logback,Apache-2.0,
-import (test),org.junit,EPL-1.0,Copyright © 2002-2017 JUnit. All Rights Reserved.
-import (test),org.assertj,Apache-2.0,Copyright 2012-2017 the original author or authors.
-import (test),org.mockito,MIT,Copyright (c) 2007 Mockito contributors
-import (test),info.picocli,Apache-2.0,
+import,org.yaml.snakeyaml,Apache-2.0,
+import,com.beust.jcommander,Apache-2.0,
+import,org.owasp.encoder,BSD 3-Clause,Copyright (c) 2012 Jeff Ichnowski
diff --git a/dd-java-agent/agent-bootstrap/agent-bootstrap.gradle b/dd-java-agent/agent-bootstrap/agent-bootstrap.gradle
@@ -3,6 +3,11 @@ plugins {
   id "com.github.johnrengelman.shadow"
 }
 
+ext {
+  // need access to sun.* packages
+  skipSettingCompilerRelease = true
+}
+
 apply from: "$rootDir/gradle/java.gradle"
 apply plugin: "idea"
 
@@ -14,6 +19,7 @@ dependencies {
   compile project(':dd-java-agent:agent-logging')
   compile project(':dd-trace-api')
   compile project(':internal-api')
+  implementation project(':internal-api:internal-api-8')
   compile deps.slf4j
   // ^ Generally a bad idea for libraries, but we're shadowing.
 
@@ -26,12 +32,17 @@ sourceSets {
     java.srcDirs "${project.projectDir}/src/main/java11"
   }
 }
-compileMain_java11Java.options.fork = true
-compileMain_java11Java.options.forkOptions.javaHome = file(System.env.JAVA_11_HOME)
-compileMain_java11Java.sourceCompatibility = JavaVersion.VERSION_1_8
-compileMain_java11Java.targetCompatibility = JavaVersion.VERSION_1_8
+compileMain_java11Java.doFirst {
+  if (!System.env.JAVA_11_HOME) {
+    throw new GradleException('JAVA_11_HOME must be set to build profiling helpers')
+  }
+  options.fork = true
+  options.forkOptions.javaHome = file(System.env.JAVA_11_HOME)
+  sourceCompatibility = JavaVersion.VERSION_1_8
+  targetCompatibility = JavaVersion.VERSION_1_8
+}
 dependencies {
-  main_java11CompileOnly project(':internal-api')
+  main_java11CompileOnly project(':internal-api:internal-api-8')
   main_java11CompileOnly "org.projectlombok:lombok:${project.lombok.version}" transitive false
   main_java11AnnotationProcessor "org.projectlombok:lombok:${project.lombok.version}" transitive false
 }

diff --git a/...tstrap/src/main/java/datadog/trace/bootstrap/instrumentation/decorator/TestDecorator.java b/...tstrap/src/main/java/datadog/trace/bootstrap/instrumentation/decorator/TestDecorator.java
@@ -74,4 +74,13 @@ public List<String> testNames(
     }
     return testNames;
   }
+
+  public boolean isTestSpan(final AgentSpan activeSpan) {
+    if (activeSpan == null) {
+      return false;
+    }
+
+    return spanKind().equals(activeSpan.getSpanType())
+        && testType().equals(activeSpan.getTag(Tags.TEST_TYPE));
+  }
 }