Skip to content

Add servlet 2.2 instrumentation #376

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kaushal02 wants to merge 7 commits into
base: main
Choose a base branch
from
Open

Add servlet 2.2 instrumentation #376

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
554d90f
Add servlet 2.2 instrumentation
kaushal02 Feb 1, 2023
4a71a2d
remove old warnings and add httpServletResponseInstrumentation
kaushal02 Feb 3, 2023
d7eecf6
merge instrumentation files
kaushal02 Mar 15, 2023
20edca1
remove comments and move from draft to ready
kaushal02 Mar 20, 2023
d0bd73e
PR comments
kaushal02 Mar 23, 2023
16a5ca3
fixed muzzle error, added tests WIP
kaushal02 Mar 23, 2023
4aaada5
fix jetty version
kaushal02 Mar 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fixed muzzle error, added tests WIP
  • Loading branch information
@kaushal02
kaushal02 committed Mar 23, 2023
commit 16a5ca36922ce52887ac473cb7aa7e27e879818e
19 changes: 14 additions & 5 deletions instrumentation/servlet/servlet-2.2/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,12 @@ muzzle {
pass {
group = "javax.servlet"
module = "servlet-api"
versions = "[2.2, 3.0)"
assertInverse = true
versions = "[2.2,3.0)"
}

fail {
group = "javax.servlet"
module = "javax.servlet-api"
versions = "[3.0,)"
versions = "(,)"
}
}

Expand All @@ -33,8 +31,19 @@ val versions: Map<String, String> by extra

dependencies {
implementation("io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-servlet-common:${versions["opentelemetry_java_agent"]}")
implementation("io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-servlet-2.2:${versions["opentelemetry_java_agent"]}") // Servlet2Accessor
testImplementation("io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-servlet-2.2:${versions["opentelemetry_java_agent"]}")
testImplementation("io.opentelemetry.javaagent:opentelemetry-muzzle:${versions["opentelemetry_java_agent"]}")
compileOnly("io.opentelemetry.javaagent:opentelemetry-javaagent-bootstrap:${versions["opentelemetry_java_agent"]}")
compileOnly("javax.servlet:servlet-api:2.2")
testRuntimeOnly("io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-servlet-common-bootstrap:${versions["opentelemetry_java_agent"]}")
muzzleBootstrap("io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-servlet-common-bootstrap:${versions["opentelemetry_java_agent"]}")
compileOnly("javax.servlet:servlet-api:2.2")

testImplementation(project(":instrumentation:servlet:servlet-rw"))
testImplementation(testFixtures(project(":testing-common")) as ProjectDependency) {
exclude(group = "org.eclipse.jetty", module = "jetty-server")
}
testImplementation("org.eclipse.jetty:jetty-server:8.1.22.v20160922")
testImplementation("org.eclipse.jetty:jetty-servlet:8.1.22.v20160922")
testImplementation("io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-semconv:${versions["opentelemetry_semconv"]}")
}
9 changes: 9 additions & 0 deletions ...ent/instrumentation/hypertrace/servlet/v2_2/nowrapping/Servlet2InstrumentationModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@

package io.opentelemetry.javaagent.instrumentation.hypertrace.servlet.v2_2.nowrapping;

import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasClassesNamed;
import static net.bytebuddy.matcher.ElementMatchers.not;

import com.google.auto.service.AutoService;
import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule;
import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
Expand All @@ -25,6 +28,7 @@
import io.opentelemetry.javaagent.instrumentation.hypertrace.servlet.v2_2.nowrapping.response.ServletResponseInstrumentation;
import java.util.Arrays;
import java.util.List;
import net.bytebuddy.matcher.ElementMatcher;

@SuppressWarnings("unused")
@AutoService(InstrumentationModule.class)
Expand All @@ -39,6 +43,11 @@ public int order() {
return 1;
}

@Override
public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
return not(hasClassesNamed("javax.servlet.HttpConstraintElement"));
}

@Override
public List<TypeInstrumentation> typeInstrumentations() {
return Arrays.asList(
Expand Down
Loading