kazusa
/
skywalking-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix NoSuchMethodError in mvc-annotation-commons&change deprecated method (#658)

This commit is contained in:
Chen Ziyan 2023-12-15 14:45:18 +08:00 committed by GitHub
parent 045c1e753f
commit fdc1e97c48
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES.md
View File

@ -5,6 +5,8 @@ Release Notes.
9.2.0
------------------
* Fix NoSuchMethodError in mvc-annotation-commons and change deprecated method
#### Documentation

4
apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-commons/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/commons/interceptor/AbstractMethodInterceptor.java
View File

@ -168,11 +168,11 @@ public abstract class AbstractMethodInterceptor implements InstanceMethodsAround
next.setHeadValue(serverHttpRequest.getHeaders().getFirst(next.getHeadKey()));
}
String operationName = this.buildOperationName(method, serverHttpRequest.getMethodValue(),
String operationName = this.buildOperationName(method, serverHttpRequest.getMethod().name(),
(EnhanceRequireObjectCache) objInst.getSkyWalkingDynamicField());
AbstractSpan span = ContextManager.createEntrySpan(operationName, contextCarrier);
Tags.URL.set(span, serverHttpRequest.getURI().toString());
Tags.HTTP.METHOD.set(span, serverHttpRequest.getMethodValue());
Tags.HTTP.METHOD.set(span, serverHttpRequest.getMethod().name());
span.setComponent(ComponentsDefine.SPRING_MVC_ANNOTATION);
SpanLayer.asHttp(span);

23
test/plugin/scenarios/spring-6.x-scenario/pom.xml
View File

@ -29,8 +29,8 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<compiler.version>1.8</compiler.version>
<maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
<compiler.version>17</compiler.version>
<maven-compiler-plugin.version>3.11.0</maven-compiler-plugin.version>
<test.framework.version>6.0.0</test.framework.version>
<test.framework>spring</test.framework>
</properties>
@ -62,30 +62,36 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.9.3</version>
<version>2.14.3</version>
</dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>2.8.2</version>
<version>2.9.1</version>
</dependency>
<dependency>
<groupId>com.squareup.okhttp3</groupId>
<artifactId>okhttp</artifactId>
<version>3.0.0</version>
<version>4.10.0</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
<version>2.8.1</version>
<version>2.19.0</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.8.1</version>
<version>2.19.0</version>
</dependency>
<dependency>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<version>6.0.0</version>
</dependency>
</dependencies>
@ -101,6 +107,7 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>${maven-compiler-plugin.version}</version>
<configuration>
<parameters>true</parameters>
<source>${compiler.version}</source>
<target>${compiler.version}</target>
<encoding>${project.build.sourceEncoding}</encoding>
@ -119,4 +126,4 @@
<url>https://repo.spring.io/milestone</url>
</pluginRepository>
</pluginRepositories>
</project>
</project>

2
test/plugin/scenarios/spring-6.x-scenario/support-version.list
View File

@ -15,3 +15,5 @@
# limitations under the License.
6.0.4
6.1.0
6.1.1