Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 3 additions & 1 deletion src/integration/frameworks_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -275,6 +275,7 @@ func testFrameworks(platform switchblade.Platform, fixtures string) func(*testin
Expect(err).NotTo(HaveOccurred(), logs.String)

Expect(logs.String()).To(ContainSubstring("Splunk OTEL"))
Expect(logs.String()).NotTo(ContainSubstring("OpenTelemetry Javaagent"))
Eventually(deployment).Should(matchers.Serve(ContainSubstring("")))
})

Expand All @@ -294,6 +295,7 @@ func testFrameworks(platform switchblade.Platform, fixtures string) func(*testin
Expect(err).NotTo(HaveOccurred(), logs.String)

Expect(logs.String()).To(ContainSubstring("Splunk OTEL"))
Expect(logs.String()).NotTo(ContainSubstring("OpenTelemetry Javaagent"))
Eventually(deployment).Should(matchers.Serve(ContainSubstring("")))
})
})
Expand Down Expand Up @@ -415,7 +417,7 @@ func testFrameworks(platform switchblade.Platform, fixtures string) func(*testin
it("configures OpenTelemetry with OTLP endpoint from service binding", func() {
deployment, logs, err := platform.Deploy.
WithServices(map[string]switchblade.Service{
"my-otel-service": {
"my-otel-collector": {
"otel.exporter.otlp.endpoint": "https://otel.example.com:4318",
"otel.traces.exporter": "otlp",
"otel.metrics.exporter": "otlp",
Expand Down
3 changes: 1 addition & 2 deletions src/java/frameworks/open_telemetry_javaagent.go
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,7 @@ func (o *OpenTelemetryJavaagentFramework) Detect() (string, error) {
vcapServices.HasTag("otel") ||
vcapServices.HasTag("otel-collector") ||
vcapServices.HasTag("opentelemetry") ||
vcapServices.HasServiceByNamePattern("otel-collector") ||
vcapServices.HasServiceByNamePattern("otel") {
vcapServices.HasServiceByNamePattern("otel-collector") {
o.context.Log.Info("OpenTelemetry service detected!")
return "OpenTelemetry Javaagent", nil
}
Expand Down
24 changes: 19 additions & 5 deletions src/java/frameworks/open_telemetry_javaagent_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -158,19 +158,33 @@ var _ = Describe("OpenTelemetryJavaagentFramework", func() {
})
})

Context("with user-provided service matching otel name pattern", func() {
It("detects via name pattern", func() {
Context("with service name containing otel but not otel-collector", func() {
It("does not detect a Splunk OTel service", func() {
os.Setenv("VCAP_SERVICES", `{
"user-provided": [{
"name": "my-otel-sidecar",
"name": "splunk-otel",
"label": "user-provided",
"tags": [],
"credentials": {}
"credentials": {"access_token": "token"}
}]
}`)
name, err := framework.Detect()
Expect(err).NotTo(HaveOccurred())
Expect(name).To(Equal("OpenTelemetry Javaagent"))
Expect(name).To(BeEmpty())
})

It("does not detect an unrelated service", func() {
os.Setenv("VCAP_SERVICES", `{
"postgres": [{
"name": "hotel-db",
"label": "postgres",
"tags": ["postgres"],
"credentials": {"uri": "postgres://host/db"}
}]
}`)
name, err := framework.Detect()
Expect(err).NotTo(HaveOccurred())
Expect(name).To(BeEmpty())
})
})

Expand Down