Skip to content

Commit 5583687

Browse files
committed
Fix finatra-2.9 scala test package declarations
Scala package declarations don't use a terminating semicolon, so they were missed by the previous FQN rewrite pass. The test fixture classes (FinatraController, FinatraServer, etc.) still declared 'package io.opentelemetry.javaagent.instrumentation.finatra', which caused FinatraServerTest.assertHandlerSpan to fail because code.namespace on the handler span lacked the expected '.v2_9' segment and ran past the 15-minute task timeout.
1 parent 552cb60 commit 5583687

8 files changed

Lines changed: 8 additions & 8 deletions

File tree

instrumentation/finatra-2.9/javaagent/src/latestDepTest/scala/io/opentelemetry/javaagent/instrumentation/finatra/v2_9/FinatraController.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package io.opentelemetry.javaagent.instrumentation.finatra
6+
package io.opentelemetry.javaagent.instrumentation.finatra.v2_9
77

88
import com.twitter.finagle.http.Request
99
import com.twitter.finatra.http.Controller

instrumentation/finatra-2.9/javaagent/src/latestDepTest/scala/io/opentelemetry/javaagent/instrumentation/finatra/v2_9/FinatraServer.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package io.opentelemetry.javaagent.instrumentation.finatra
6+
package io.opentelemetry.javaagent.instrumentation.finatra.v2_9
77

88
import com.twitter.finagle.http.Request
99
import com.twitter.finatra.http.HttpServer

instrumentation/finatra-2.9/javaagent/src/latestDepTest/scala/io/opentelemetry/javaagent/instrumentation/finatra/v2_9/FinatraServerLatestTest.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package io.opentelemetry.javaagent.instrumentation.finatra
6+
package io.opentelemetry.javaagent.instrumentation.finatra.v2_9
77

88
import com.twitter.finatra.http.HttpServer
99
import io.opentelemetry.api.trace.SpanKind

instrumentation/finatra-2.9/javaagent/src/latestDepTest/scala/io/opentelemetry/javaagent/instrumentation/finatra/v2_9/ResponseSettingExceptionMapper.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package io.opentelemetry.javaagent.instrumentation.finatra
6+
package io.opentelemetry.javaagent.instrumentation.finatra.v2_9
77

88
import com.twitter.finagle.http.{Request, Response}
99
import com.twitter.finatra.http.exceptions.ExceptionMapper

instrumentation/finatra-2.9/javaagent/src/test/scala/io/opentelemetry/javaagent/instrumentation/finatra/v2_9/FinatraController.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package io.opentelemetry.javaagent.instrumentation.finatra
6+
package io.opentelemetry.javaagent.instrumentation.finatra.v2_9
77

88
import com.twitter.finagle.http.Request
99
import com.twitter.finatra.http.Controller

instrumentation/finatra-2.9/javaagent/src/test/scala/io/opentelemetry/javaagent/instrumentation/finatra/v2_9/FinatraServer.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package io.opentelemetry.javaagent.instrumentation.finatra
6+
package io.opentelemetry.javaagent.instrumentation.finatra.v2_9
77

88
import com.twitter.finagle.http.Request
99
import com.twitter.finatra.http.HttpServer

instrumentation/finatra-2.9/javaagent/src/test/scala/io/opentelemetry/javaagent/instrumentation/finatra/v2_9/FinatraServerTest.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package io.opentelemetry.javaagent.instrumentation.finatra
6+
package io.opentelemetry.javaagent.instrumentation.finatra.v2_9
77

88
import com.twitter.finatra.http.HttpServer
99
import io.opentelemetry.api.trace.SpanKind

instrumentation/finatra-2.9/javaagent/src/test/scala/io/opentelemetry/javaagent/instrumentation/finatra/v2_9/ResponseSettingExceptionMapper.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package io.opentelemetry.javaagent.instrumentation.finatra
6+
package io.opentelemetry.javaagent.instrumentation.finatra.v2_9
77

88
import com.twitter.finagle.http.{Request, Response}
99
import com.twitter.finatra.http.exceptions.ExceptionMapper

0 commit comments

Comments
 (0)