make pr.number string

Author: daniel-mohedano

dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/ci/CISpecExtractor.groovy

@@ -10,7 +10,7 @@ class CISpecExtractor {
 
   private static final JsonSlurper JSON_SLURPER = new JsonSlurper()
 
-  private static final Map<String, BiPredicate<Object, Object>> CUSTOM_COMPARATORS = new HashMap<>()
+  private static final Map<String, BiPredicate<String, String>> CUSTOM_COMPARATORS = new HashMap<>()
 
   static {
     CUSTOM_COMPARATORS.put(DDTags.CI_ENV_VARS, new BiPredicate<String, String>() {
@@ -25,12 +25,6 @@ class CISpecExtractor {
           return JSON_SLURPER.parseText(e).sort() == JSON_SLURPER.parseText(a).sort()
         }
       })
-    CUSTOM_COMPARATORS.put(Tags.PULL_REQUEST_NUMBER, new BiPredicate<Integer, String>() {
-        @Override
-        boolean test(Integer e, String a) {
-          return e != null && a != null && e.toString() == a
-        }
-      })
   }
 
   static extract(String ciProviderName) {

dd-java-agent/agent-ci-visibility/src/test/resources/ci/appveyor.json

@@ -374,7 +374,7 @@
       "git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
       "git.pull_request.base_branch": "master",
       "git.repository_url": "https://github.com/appveyor-repo-name.git",
-      "pr.number": 42
+      "pr.number": "42"
     }
   ],
   [

dd-java-agent/agent-ci-visibility/src/test/resources/ci/azurepipelines.json

@@ -959,7 +959,7 @@
       "git.commit.author.name": "azure-pipelines-commit-author",
       "git.commit.message": "azure-pipelines-commit-message",
       "git.pull_request.base_branch": "target-branch",
-      "pr.number": 42
+      "pr.number": "42"
     }
   ]
 ]

dd-java-agent/agent-ci-visibility/src/test/resources/ci/bitbucket.json

@@ -612,7 +612,7 @@
       "git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
       "git.pull_request.base_branch": "target-branch",
       "git.repository_url": "https://bitbucket-repo-url.com/repo.git",
-      "pr.number": 42
+      "pr.number": "42"
     }
   ]
 ]

dd-java-agent/agent-ci-visibility/src/test/resources/ci/bitrise.json

@@ -711,7 +711,7 @@
       "git.commit.message": "bitrise-git-commit-message",
       "git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
       "git.pull_request.base_branch": "target-branch",
-      "pr.number": 42
+      "pr.number": "42"
     }
   ]
 ]

dd-java-agent/agent-ci-visibility/src/test/resources/ci/buddy.json

@@ -511,7 +511,7 @@
       "git.pull_request.base_branch": "target-branch",
       "git.repository_url": "https://github.com/buddyworks/my-project.git",
       "git.tag": "v1.0",
-      "pr.number": 42
+      "pr.number": "42"
     }
   ]
 ]

dd-java-agent/agent-ci-visibility/src/test/resources/ci/buildkite.json

@@ -1109,7 +1109,7 @@
       "git.commit.message": "buildkite-git-commit-message",
       "git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
       "git.pull_request.base_branch": "master",
-      "pr.number": 42
+      "pr.number": "42"
     }
   ]
 ]

dd-java-agent/agent-ci-visibility/src/test/resources/ci/circleci.json

@@ -771,7 +771,7 @@
       "ci.pipeline.url": "https://app.circleci.com/pipelines/workflows/circleci-pipeline-id",
       "ci.provider.name": "circleci",
       "git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
-      "pr.number": 42
+      "pr.number": "42"
     }
   ]
 ]

dd-java-agent/agent-ci-visibility/src/test/resources/ci/codefresh.json

@@ -176,7 +176,7 @@
       "ci.pipeline.url": "https://g.codefresh.io/build/6410367cee516146a4c4c66e",
       "ci.provider.name": "codefresh",
       "git.pull_request.base_branch": "target-branch",
-      "pr.number": 42
+      "pr.number": "42"
     }
   ]
 ]

dd-java-agent/agent-ci-visibility/src/test/resources/ci/drone.json

@@ -66,7 +66,7 @@
       "git.pull_request.base_branch": "target-branch",
       "git.repository_url": "https://github.com/octocat/hello-world.git",
       "git.tag": "v1.0.0",
-      "pr.number": 42
+      "pr.number": "42"
     }
   ]
 ]