Skip to content

Commit 561c682

Browse files
pavolloffaypavolloffay
authored
Bump OTEL Javaagent to 0.9.0 (#37)
Signed-off-by: Pavol Loffay <p.loffay@gmail.com>
1 parent ae80c75 commit 561c682

File tree

13 files changed

+122
-87
lines changed

13 files changed

+122
-87
lines changed

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

Lines changed: 74 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import java.lang.reflect.Method
77
import java.security.SecureClassLoader
88
import java.util.concurrent.atomic.AtomicReference
9+
import java.util.function.Predicate
910
import java.util.regex.Pattern
1011
import org.apache.maven.repository.internal.MavenRepositorySystemUtils
1112
import org.eclipse.aether.DefaultRepositorySystemSession
@@ -74,7 +75,7 @@ class MuzzlePlugin implements Plugin<Project> {
7475
project.getLogger().info('No muzzle pass directives configured. Asserting pass against instrumentation compile-time dependencies')
7576
ClassLoader userCL = createCompileDepsClassLoader(project, bootstrapProject)
7677
ClassLoader instrumentationCL = createInstrumentationClassloader(project, toolingProject)
77-
Method assertionMethod = instrumentationCL.loadClass('io.opentelemetry.javaagent.tooling.muzzle.MuzzleVersionScanPlugin')
78+
Method assertionMethod = instrumentationCL.loadClass('io.opentelemetry.javaagent.tooling.muzzle.matcher.MuzzleGradlePluginUtil')
7879
.getMethod('assertInstrumentationMuzzled', ClassLoader.class, ClassLoader.class, boolean.class)
7980
assertionMethod.invoke(null, instrumentationCL, userCL, true)
8081
}
@@ -86,7 +87,7 @@ class MuzzlePlugin implements Plugin<Project> {
8687
description = "Print references created by instrumentation muzzle"
8788
doLast {
8889
ClassLoader instrumentationCL = createInstrumentationClassloader(project, toolingProject)
89-
Method assertionMethod = instrumentationCL.loadClass('io.opentelemetry.javaagent.tooling.muzzle.MuzzleVersionScanPlugin')
90+
Method assertionMethod = instrumentationCL.loadClass('io.opentelemetry.javaagent.tooling.muzzle.matcher.MuzzleGradlePluginUtil')
9091
.getMethod('printMuzzleReferences', ClassLoader.class)
9192
assertionMethod.invoke(null, instrumentationCL)
9293
}
@@ -220,15 +221,9 @@ class MuzzlePlugin implements Plugin<Project> {
220221
rangeRequest.setRepositories(MUZZLE_REPOS)
221222
rangeRequest.setArtifact(directiveArtifact)
222223
VersionRangeResult rangeResult = system.resolveVersionRange(session, rangeRequest)
223-
Set<Version> versions = rangeResult.versions.toSet()
224224

225-
limitLargeRanges(rangeResult, versions, muzzleDirective.skipVersions)
226-
227-
// println "Range Request: " + rangeRequest
228-
// println "Range Result: " + rangeResult
229-
230-
Set<Artifact> allVersionArtifacts = filterVersion(versions, muzzleDirective.skipVersions).collect { version ->
231-
new DefaultArtifact(muzzleDirective.group, muzzleDirective.module, "jar", version.toString())
225+
Set<Artifact> allVersionArtifacts = filterVersions(rangeResult, muzzleDirective.skipVersions).collect { version ->
226+
new DefaultArtifact(muzzleDirective.group, muzzleDirective.module, "jar", version)
232227
}.toSet()
233228

234229
if (allVersionArtifacts.isEmpty()) {
@@ -244,47 +239,91 @@ class MuzzlePlugin implements Plugin<Project> {
244239
private static Set<MuzzleDirective> inverseOf(MuzzleDirective muzzleDirective, RepositorySystem system, RepositorySystemSession session) {
245240
Set<MuzzleDirective> inverseDirectives = new HashSet<>()
246241

247-
Artifact allVerisonsArtifact = new DefaultArtifact(muzzleDirective.group, muzzleDirective.module, "jar", "[,)")
242+
Artifact allVersionsArtifact = new DefaultArtifact(muzzleDirective.group, muzzleDirective.module, "jar", "[,)")
248243
Artifact directiveArtifact = new DefaultArtifact(muzzleDirective.group, muzzleDirective.module, "jar", muzzleDirective.versions)
249244

250-
251245
VersionRangeRequest allRangeRequest = new VersionRangeRequest()
252246
allRangeRequest.setRepositories(MUZZLE_REPOS)
253-
allRangeRequest.setArtifact(allVerisonsArtifact)
247+
allRangeRequest.setArtifact(allVersionsArtifact)
254248
VersionRangeResult allRangeResult = system.resolveVersionRange(session, allRangeRequest)
255249

256250
VersionRangeRequest rangeRequest = new VersionRangeRequest()
257251
rangeRequest.setRepositories(MUZZLE_REPOS)
258252
rangeRequest.setArtifact(directiveArtifact)
259253
VersionRangeResult rangeResult = system.resolveVersionRange(session, rangeRequest)
260-
Set<Version> versions = rangeResult.versions.toSet()
261-
262-
filterVersion(allRangeResult.versions.toSet(), muzzleDirective.skipVersions).collect { version ->
263-
if (!versions.contains(version)) {
264-
MuzzleDirective inverseDirective = new MuzzleDirective()
265-
inverseDirective.group = muzzleDirective.group
266-
inverseDirective.module = muzzleDirective.module
267-
inverseDirective.versions = "$version"
268-
inverseDirective.assertPass = !muzzleDirective.assertPass
269-
inverseDirectives.add(inverseDirective)
270-
}
254+
255+
allRangeResult.getVersions().removeAll(rangeResult.getVersions())
256+
257+
filterVersions(allRangeResult, muzzleDirective.skipVersions).each { version ->
258+
MuzzleDirective inverseDirective = new MuzzleDirective()
259+
inverseDirective.group = muzzleDirective.group
260+
inverseDirective.module = muzzleDirective.module
261+
inverseDirective.versions = version
262+
inverseDirective.assertPass = !muzzleDirective.assertPass
263+
inverseDirectives.add(inverseDirective)
271264
}
272265

273266
return inverseDirectives
274267
}
275268

276-
private static void limitLargeRanges(VersionRangeResult result, Set<Version> versions, Set<String> skipVersions) {
277-
List<Version> copy = new ArrayList<>(versions)
278-
copy.removeAll(skipVersions)
269+
private static Set<String> filterVersions(VersionRangeResult range, Set<String> skipVersions) {
270+
Set<String> result = new HashSet<>()
271+
272+
def predicate = new AcceptableVersions(range, skipVersions)
273+
if (predicate.test(range.lowestVersion)) {
274+
result.add(range.lowestVersion.toString())
275+
}
276+
if (predicate.test(range.highestVersion)) {
277+
result.add(range.highestVersion.toString())
278+
}
279+
280+
List<Version> copy = new ArrayList<>(range.versions)
279281
Collections.shuffle(copy)
280-
while (RANGE_COUNT_LIMIT <= copy.size()) {
282+
while (result.size() < RANGE_COUNT_LIMIT && !copy.isEmpty()) {
281283
Version version = copy.pop()
282-
if (!(version.equals(result.lowestVersion) || version.equals(result.highestVersion))) {
283-
skipVersions.add(version.toString())
284+
if (predicate.test(version)) {
285+
result.add(version.toString())
284286
}
285287
}
286-
if (skipVersions.size() > 0) {
287-
println "Muzzle skipping " + skipVersions.size() + " versions"
288+
289+
return result
290+
}
291+
292+
static class AcceptableVersions implements Predicate<Version> {
293+
private static final Pattern GIT_SHA_PATTERN = Pattern.compile('^.*-[0-9a-f]{7,}$')
294+
295+
private final VersionRangeResult range
296+
private final Collection<String> skipVersions
297+
298+
AcceptableVersions(VersionRangeResult range, Collection<String> skipVersions) {
299+
this.range = range
300+
this.skipVersions = skipVersions
301+
}
302+
303+
@Override
304+
boolean test(Version version) {
305+
if (version == null) {
306+
return false
307+
}
308+
def versionString = version.toString().toLowerCase()
309+
if (skipVersions.contains(versionString)) {
310+
return false
311+
}
312+
313+
def draftVersion = versionString.contains("rc") ||
314+
versionString.contains(".cr") ||
315+
versionString.contains("alpha") ||
316+
versionString.contains("beta") ||
317+
versionString.contains("-b") ||
318+
versionString.contains(".m") ||
319+
versionString.contains("-m") ||
320+
versionString.contains("-dev") ||
321+
versionString.contains("-ea") ||
322+
versionString.contains("-atlassian-") ||
323+
versionString.contains("public_draft") ||
324+
versionString.matches(GIT_SHA_PATTERN)
325+
326+
return !draftVersion
288327
}
289328
}
290329

@@ -336,12 +375,13 @@ class MuzzlePlugin implements Plugin<Project> {
336375
String toString() {
337376
return "bogus"
338377
}
378+
339379
}
340380
Thread.currentThread().contextClassLoader = bogusLoader
341381
ClassLoader userCL = createClassLoaderForTask(instrumentationProject, bootstrapProject, taskName)
342382
try {
343383
// find all instrumenters, get muzzle, and assert
344-
Method assertionMethod = instrumentationCL.loadClass('io.opentelemetry.javaagent.tooling.muzzle.MuzzleVersionScanPlugin')
384+
Method assertionMethod = instrumentationCL.loadClass('io.opentelemetry.javaagent.tooling.muzzle.matcher.MuzzleGradlePluginUtil')
345385
.getMethod('assertInstrumentationMuzzled', ClassLoader.class, ClassLoader.class, boolean.class)
346386
assertionMethod.invoke(null, instrumentationCL, userCL, muzzleDirective.assertPass)
347387
} finally {
@@ -370,6 +410,7 @@ class MuzzlePlugin implements Plugin<Project> {
370410
return locator.getService(RepositorySystem.class)
371411
}
372412

413+
373414
/**
374415
* Create muzzle's repository system session
375416
*/
@@ -383,31 +424,6 @@ class MuzzlePlugin implements Plugin<Project> {
383424

384425
return session
385426
}
386-
387-
private static final Pattern GIT_SHA_PATTERN = Pattern.compile('^.*-[0-9a-f]{7,}$')
388-
389-
/**
390-
* Filter out snapshot-type builds from versions list.
391-
*/
392-
private static filterVersion(Set<Version> list, Set<String> skipVersions) {
393-
list.removeIf {
394-
def version = it.toString().toLowerCase()
395-
return version.contains("rc") ||
396-
version.contains(".cr") ||
397-
version.contains("alpha") ||
398-
version.contains("beta") ||
399-
version.contains("-b") ||
400-
version.contains(".m") ||
401-
version.contains("-m") ||
402-
version.contains("-dev") ||
403-
version.contains("-ea") ||
404-
version.contains("-atlassian-") ||
405-
version.contains("public_draft") ||
406-
skipVersions.contains(version) ||
407-
version.matches(GIT_SHA_PATTERN)
408-
}
409-
return list
410-
}
411427
}
412428

413429
// plugin extension classes

‎buildSrc/src/test/groovy/VersionTest.groovy‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
/*
2+
* Copyright The OpenTelemetry Authors
3+
* SPDX-License-Identifier: Apache-2.0
4+
*/
5+
6+
import org.eclipse.aether.resolution.VersionRangeRequest
7+
import org.eclipse.aether.resolution.VersionRangeResult
8+
import org.eclipse.aether.util.version.GenericVersion
9+
import spock.lang.Specification
10+
11+
class VersionTest extends Specification {
12+
13+
def "test range request"() {
14+
setup:
15+
def predicate = new MuzzlePlugin.AcceptableVersions(new VersionRangeResult(new VersionRangeRequest()), [])
16+
expect:
17+
!predicate.test(new GenericVersion("10.1.0-rc2+19-8e20bb26"))
18+
}
19+
}

‎instrumentation/build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ subprojects {
99
implementation("com.google.auto.service:auto-service:1.0-rc7")
1010
annotationProcessor("com.google.auto.service:auto-service:1.0-rc7")
1111

12-
implementation("io.opentelemetry.instrumentation.auto:opentelemetry-javaagent-tooling:0.9.0-20201009.101126-80")
12+
implementation("io.opentelemetry.javaagent:opentelemetry-javaagent-tooling:0.9.0")
1313
implementation(project(":javaagent-core"))
1414
}
1515
}

‎instrumentation/servlet/servlet-2.3/build.gradle.kts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ afterEvaluate{
2323
byteBuddy {
2424
transformation(closureOf<net.bytebuddy.build.gradle.Transformation> {
2525
setTasks(setOf("compileJava", "compileScala", "compileKotlin"))
26-
plugin = "io.opentelemetry.javaagent.tooling.muzzle.MuzzleGradlePlugin"
26+
plugin = "io.opentelemetry.javaagent.tooling.muzzle.collector.MuzzleCodeGenerationPlugin"
2727
setClassPath(instrumentationMuzzle + configurations.runtimeClasspath + sourceSets["main"].output)
2828
})
2929
}
@@ -37,11 +37,11 @@ dependencies {
3737
compileOnly("javax.servlet:servlet-api:2.3")
3838
implementation("net.bytebuddy:byte-buddy:1.10.10")
3939

40-
implementation("io.opentelemetry.instrumentation.auto:opentelemetry-auto-servlet-2.2:0.9.0-20201009.101215-80")
40+
implementation("io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-servlet-2.2:0.9.0")
4141

42-
instrumentationMuzzle("io.opentelemetry.instrumentation.auto:opentelemetry-javaagent-tooling:0.9.0-20201009.101126-80")
43-
instrumentationMuzzle("io.opentelemetry.instrumentation.auto:opentelemetry-javaagent-bootstrap:0.9.0-20201009.192532-82")
44-
instrumentationMuzzle("io.opentelemetry.instrumentation:opentelemetry-auto-api:0.9.0-20201009.192531-82")
42+
instrumentationMuzzle("io.opentelemetry.javaagent:opentelemetry-javaagent-tooling:0.9.0")
43+
instrumentationMuzzle("io.opentelemetry.javaagent:opentelemetry-javaagent-bootstrap:0.9.0")
44+
instrumentationMuzzle("io.opentelemetry.javaagent:opentelemetry-javaagent-api:0.9.0")
4545
instrumentationMuzzle("net.bytebuddy:byte-buddy:1.10.10")
4646
instrumentationMuzzle("net.bytebuddy:byte-buddy-agent:1.10.10")
4747
instrumentationMuzzle("com.blogspot.mydailyjava:weak-lock-free:0.15")

‎instrumentation/servlet/servlet-2.3/src/main/java/io/opentelemetry/instrumentation/hypertrace/servlet/v2_3/Servlet2BodyInstrumentation.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
package io.opentelemetry.instrumentation.hypertrace.servlet.v2_3;
1818

19-
import static io.opentelemetry.instrumentation.auto.servlet.v2_2.Servlet2HttpServerTracer.TRACER;
19+
import static io.opentelemetry.javaagent.instrumentation.servlet.v2_2.Servlet2HttpServerTracer.TRACER;
2020
import static io.opentelemetry.javaagent.tooling.ClassLoaderMatcher.hasClassesNamed;
2121
import static io.opentelemetry.javaagent.tooling.bytebuddy.matcher.AgentElementMatchers.safeHasSuperType;
2222
import static io.opentelemetry.javaagent.tooling.matcher.NameMatchers.namedOneOf;
@@ -88,8 +88,8 @@ public String[] helperClassNames() {
8888
return new String[] {
8989
"io.opentelemetry.instrumentation.servlet.HttpServletRequestGetter",
9090
"io.opentelemetry.instrumentation.servlet.ServletHttpServerTracer",
91-
"io.opentelemetry.instrumentation.auto.servlet.v2_2.Servlet2HttpServerTracer",
92-
"io.opentelemetry.instrumentation.auto.servlet.v2_2.ResponseWithStatus",
91+
"io.opentelemetry.javaagent.instrumentation.servlet.v2_2.Servlet2HttpServerTracer",
92+
"io.opentelemetry.javaagent.instrumentation.servlet.v2_2.ResponseWithStatus",
9393
"org.hypertrace.agent.blocking.BlockingProvider",
9494
"org.hypertrace.agent.blocking.BlockingEvaluator",
9595
"org.hypertrace.agent.blocking.BlockingResult",

‎instrumentation/servlet/servlet-3.0/build.gradle.kts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ afterEvaluate{
2323
byteBuddy {
2424
transformation(closureOf<net.bytebuddy.build.gradle.Transformation> {
2525
setTasks(kotlin.collections.setOf("compileJava", "compileScala", "compileKotlin"))
26-
plugin = "io.opentelemetry.javaagent.tooling.muzzle.MuzzleGradlePlugin"
26+
plugin = "io.opentelemetry.javaagent.tooling.muzzle.collector.MuzzleCodeGenerationPlugin"
2727
setClassPath(instrumentationMuzzle + configurations.runtimeClasspath + sourceSets["main"].output)
2828
})
2929
}
@@ -37,11 +37,11 @@ dependencies {
3737
compileOnly("javax.servlet:javax.servlet-api:3.0.1")
3838
implementation("net.bytebuddy:byte-buddy:1.10.10")
3939

40-
implementation("io.opentelemetry.instrumentation.auto:opentelemetry-auto-servlet-3.0:0.9.0-20201009.101216-80")
40+
implementation("io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-servlet-3.0:0.9.0")
4141

42-
instrumentationMuzzle("io.opentelemetry.instrumentation.auto:opentelemetry-javaagent-tooling:0.9.0-20201009.101126-80")
43-
instrumentationMuzzle("io.opentelemetry.instrumentation.auto:opentelemetry-javaagent-bootstrap:0.9.0-20201009.192532-82")
44-
instrumentationMuzzle("io.opentelemetry.instrumentation:opentelemetry-auto-api:0.9.0-20201009.192531-82")
42+
instrumentationMuzzle("io.opentelemetry.javaagent:opentelemetry-javaagent-tooling:0.9.0")
43+
instrumentationMuzzle("io.opentelemetry.javaagent:opentelemetry-javaagent-bootstrap:0.9.0")
44+
instrumentationMuzzle("io.opentelemetry.javaagent:opentelemetry-javaagent-api:0.9.0")
4545
instrumentationMuzzle("net.bytebuddy:byte-buddy:1.10.10")
4646
instrumentationMuzzle("net.bytebuddy:byte-buddy-agent:1.10.10")
4747
instrumentationMuzzle("com.blogspot.mydailyjava:weak-lock-free:0.15")

‎instrumentation/servlet/servlet-3.0/src/main/java/io/opentelemetry/instrumentation/hypertrace/servlet/v3_0/Servlet30BodyInstrumentation.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
package io.opentelemetry.instrumentation.hypertrace.servlet.v3_0;
1818

19-
import static io.opentelemetry.instrumentation.auto.servlet.v3_0.Servlet3HttpServerTracer.TRACER;
19+
import static io.opentelemetry.javaagent.instrumentation.servlet.v3_0.Servlet3HttpServerTracer.TRACER;
2020
import static io.opentelemetry.javaagent.tooling.ClassLoaderMatcher.hasClassesNamed;
2121
import static io.opentelemetry.javaagent.tooling.bytebuddy.matcher.AgentElementMatchers.safeHasSuperType;
2222
import static io.opentelemetry.javaagent.tooling.matcher.NameMatchers.namedOneOf;
@@ -85,7 +85,7 @@ public String[] helperClassNames() {
8585
return new String[] {
8686
"io.opentelemetry.instrumentation.servlet.HttpServletRequestGetter",
8787
"io.opentelemetry.instrumentation.servlet.ServletHttpServerTracer",
88-
"io.opentelemetry.instrumentation.auto.servlet.v3_0.Servlet3HttpServerTracer",
88+
"io.opentelemetry.javaagent.instrumentation.servlet.v3_0.Servlet3HttpServerTracer",
8989
// TODO Add these to bootstrap classloader so they don't have to referenced in every
9090
// instrumentation, see https://github.com/Traceableai/opentelemetry-javaagent/issues/17
9191
"org.hypertrace.agent.blocking.BlockingProvider",

‎instrumentation/servlet/servlet-3.1/build.gradle.kts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ afterEvaluate{
2424
byteBuddy {
2525
transformation(closureOf<net.bytebuddy.build.gradle.Transformation> {
2626
setTasks(setOf("compileJava", "compileScala", "compileKotlin"))
27-
plugin = "io.opentelemetry.javaagent.tooling.muzzle.MuzzleGradlePlugin"
27+
plugin = "io.opentelemetry.javaagent.tooling.muzzle.collector.MuzzleCodeGenerationPlugin"
2828
setClassPath(instrumentationMuzzle + configurations.runtimeClasspath + sourceSets["main"].output)
2929
})
3030
}
@@ -38,11 +38,11 @@ dependencies {
3838
compileOnly("javax.servlet:javax.servlet-api:3.1.0")
3939
implementation("net.bytebuddy:byte-buddy:1.10.10")
4040

41-
implementation("io.opentelemetry.instrumentation.auto:opentelemetry-auto-servlet-3.0:0.9.0-20201009.101216-80")
41+
implementation("io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-servlet-3.0:0.9.0")
4242

43-
instrumentationMuzzle("io.opentelemetry.instrumentation.auto:opentelemetry-javaagent-tooling:0.9.0-20201009.101126-80")
44-
instrumentationMuzzle("io.opentelemetry.instrumentation.auto:opentelemetry-javaagent-bootstrap:0.9.0-20201009.192532-82")
45-
instrumentationMuzzle("io.opentelemetry.instrumentation:opentelemetry-auto-api:0.9.0-20201009.192531-82")
43+
instrumentationMuzzle("io.opentelemetry.javaagent:opentelemetry-javaagent-tooling:0.9.0")
44+
instrumentationMuzzle("io.opentelemetry.javaagent:opentelemetry-javaagent-bootstrap:0.9.0")
45+
instrumentationMuzzle("io.opentelemetry.javaagent:opentelemetry-javaagent-api:0.9.0")
4646
instrumentationMuzzle("net.bytebuddy:byte-buddy:1.10.10")
4747
instrumentationMuzzle("net.bytebuddy:byte-buddy-agent:1.10.10")
4848
instrumentationMuzzle("com.blogspot.mydailyjava:weak-lock-free:0.15")

‎instrumentation/servlet/servlet-3.1/src/main/java/io/opentelemetry/instrumentation/hypertrace/servlet/v3_1/Servlet31BodyInstrumentation.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
package io.opentelemetry.instrumentation.hypertrace.servlet.v3_1;
1818

19-
import static io.opentelemetry.instrumentation.auto.servlet.v3_0.Servlet3HttpServerTracer.TRACER;
19+
import static io.opentelemetry.javaagent.instrumentation.servlet.v3_0.Servlet3HttpServerTracer.TRACER;
2020
import static io.opentelemetry.javaagent.tooling.ClassLoaderMatcher.hasClassesNamed;
2121
import static io.opentelemetry.javaagent.tooling.bytebuddy.matcher.AgentElementMatchers.safeHasSuperType;
2222
import static io.opentelemetry.javaagent.tooling.matcher.NameMatchers.namedOneOf;
@@ -82,7 +82,7 @@ public String[] helperClassNames() {
8282
return new String[] {
8383
"io.opentelemetry.instrumentation.servlet.HttpServletRequestGetter",
8484
"io.opentelemetry.instrumentation.servlet.ServletHttpServerTracer",
85-
"io.opentelemetry.instrumentation.auto.servlet.v3_0.Servlet3HttpServerTracer",
85+
"io.opentelemetry.javaagent.instrumentation.servlet.v3_0.Servlet3HttpServerTracer",
8686
// TODO Add these to bootstrap classloader so they don't have to referenced in every
8787
// instrumentation, see https://github.com/Traceableai/opentelemetry-javaagent/issues/17
8888
"org.hypertrace.agent.blocking.BlockingProvider",

‎javaagent-bootstrap/build.gradle.kts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@ plugins {
55
}
66

77
dependencies{
8-
implementation("io.opentelemetry.instrumentation.auto:opentelemetry-javaagent-bootstrap:0.9.0-20201009.192532-82")
9-
implementation("io.opentelemetry.instrumentation:opentelemetry-auto-api:0.9.0-20201009.192531-82")
8+
implementation("io.opentelemetry.javaagent:opentelemetry-javaagent-bootstrap:0.9.0")
9+
implementation("io.opentelemetry.javaagent:opentelemetry-javaagent-api:0.9.0")
1010
}

0 commit comments

Comments
 (0)