diff --git a/src/integration/frameworks_test.go b/src/integration/frameworks_test.go index 84fedab06a..94dc0e136a 100644 --- a/src/integration/frameworks_test.go +++ b/src/integration/frameworks_test.go @@ -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(""))) }) @@ -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(""))) }) }) @@ -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", diff --git a/src/java/frameworks/open_telemetry_javaagent.go b/src/java/frameworks/open_telemetry_javaagent.go index 8afaaf487b..4a51d46b55 100644 --- a/src/java/frameworks/open_telemetry_javaagent.go +++ b/src/java/frameworks/open_telemetry_javaagent.go @@ -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 } diff --git a/src/java/frameworks/open_telemetry_javaagent_test.go b/src/java/frameworks/open_telemetry_javaagent_test.go index 5de08ae222..7b74615fad 100644 --- a/src/java/frameworks/open_telemetry_javaagent_test.go +++ b/src/java/frameworks/open_telemetry_javaagent_test.go @@ -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()) }) })