Skip to content

Commit 8808e79

Browse files
authored
Merge pull request #1169 from kiril-keranov/patch-16
[go-migration] Remove takipi agent framework
2 parents 5dfe707 + 1fbb4f0 commit 8808e79

7 files changed

Lines changed: 3 additions & 287 deletions

File tree

README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,6 @@ For historical analysis documents from development sessions, see [`docs/archive/
185185
* [Spring Auto Reconfiguration](docs/framework-spring_auto_reconfiguration.md) ([Configuration](docs/framework-spring_auto_reconfiguration.md#configuration))
186186
* [Spring Insight](docs/framework-spring_insight.md)
187187
* [SkyWalking Agent](docs/framework-sky_walking_agent.md) ([Configuration](docs/framework-sky_walking_agent.md#configuration))
188-
* [Takipi Agent](docs/framework-takipi_agent.md) ([Configuration](docs/framework-takipi_agent.md#configuration))
189188
* [YourKit Profiler](docs/framework-your_kit_profiler.md) ([Configuration](docs/framework-your_kit_profiler.md#configuration))
190189
* Standard JREs (Included in Manifest)
191190
* [OpenJDK](docs/jre-open_jdk_jre.md) ([Configuration](docs/jre-open_jdk_jre.md#configuration)) - Default

docs/framework-ordering.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,8 @@ Line | Framework Name | Priority | Notes
5252
77 | SpringInsight | 43 | Spring monitoring
5353
78 | SkyWalkingAgent | 44 | APM agent
5454
79 | YourKitProfiler | 45 | Profiler
55-
80 | TakipiAgent | 46 | APM agent
56-
81 | JavaSecurity | 47 | Security configuration
57-
82 | JavaOpts | 99 | ⚠️ USER-DEFINED OPTS (ALWAYS LAST)
55+
80 | JavaSecurity | 47 | Security configuration
56+
81 | JavaOpts | 99 | ⚠️ USER-DEFINED OPTS (ALWAYS LAST)
5857
```
5958

6059
## Go Buildpack Implementation

docs/framework-takipi_agent.md

Lines changed: 0 additions & 65 deletions
This file was deleted.

src/integration/frameworks_test.go

Lines changed: 1 addition & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -908,27 +908,6 @@ func testFrameworks(platform switchblade.Platform, fixtures string) func(*testin
908908
})
909909
})
910910

911-
context("with Takipi service binding", func() {
912-
it("detects and installs Takipi agent", func() {
913-
t.Skip("SKIPPED: Takipi agent requires valid download URL and SHA256 in manifest.yml")
914-
deployment, logs, err := platform.Deploy.
915-
WithServices(map[string]switchblade.Service{
916-
"takipi": {
917-
"secret_key": "test-secret-key",
918-
"server": "https://takipi.example.com",
919-
},
920-
}).
921-
WithEnv(map[string]string{
922-
"BP_JAVA_VERSION": "11",
923-
}).
924-
Execute(name, filepath.Join(fixtures, "containers", "spring_boot_staged"))
925-
Expect(err).NotTo(HaveOccurred(), logs.String)
926-
927-
Expect(logs.String()).To(ContainSubstring("Takipi"))
928-
Eventually(deployment).Should(matchers.Serve(ContainSubstring("")))
929-
})
930-
})
931-
932911
context("with Introscope service binding", func() {
933912
it("detects and installs Introscope agent", func() {
934913
t.Skip("SKIPPED: Introscope agent requires authentication and is not in manifest.yml")
@@ -978,7 +957,7 @@ func testFrameworks(platform switchblade.Platform, fixtures string) func(*testin
978957
deployment, logs, err := platform.Deploy.
979958
WithEnv(map[string]string{
980959
"BP_JAVA_VERSION": "11",
981-
"JBP_CONFIG_ASPECTJ_WEAVER_AGENT": "'{enabled: true}'",
960+
"JBP_CONFIG_ASPECTJ_WEAVER_AGENT": "{ enabled: true }",
982961
}).
983962
Execute(name, filepath.Join(fixtures, "frameworks", "aspectj_weaver_meta_inf"))
984963
Expect(err).NotTo(HaveOccurred(), logs.String)

src/java/frameworks/framework.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,6 @@ func (r *Registry) RegisterStandardFrameworks() {
101101
r.Register(NewJRebelAgentFramework(r.context))
102102
r.Register(NewContrastSecurityAgentFramework(r.context))
103103
r.Register(NewAspectJWeaverAgentFramework(r.context))
104-
r.Register(NewTakipiAgentFramework(r.context))
105104
r.Register(NewYourKitProfilerFramework(r.context))
106105
r.Register(NewJProfilerProfilerFramework(r.context))
107106
r.Register(NewSealightsAgentFramework(r.context))

src/java/frameworks/takipi_agent.go

Lines changed: 0 additions & 177 deletions
This file was deleted.

src/java/frameworks/takipi_agent_test.go

Lines changed: 0 additions & 18 deletions
This file was deleted.

0 commit comments

Comments
 (0)