File tree 2 files changed +14
-2
lines changed
packages/kbn-elastic-agent-utils/src
2 files changed +14
-2
lines changed Original file line number Diff line number Diff line change @@ -23,11 +23,17 @@ import {
23
23
describe ( 'Agents guards' , ( ) => {
24
24
it ( 'isOpenTelemetryAgentName should guard if the passed agent is an OpenTelemetry one.' , ( ) => {
25
25
expect ( isOpenTelemetryAgentName ( 'otlp' ) ) . toBe ( true ) ;
26
+ expect ( isOpenTelemetryAgentName ( 'opentelemetry/java' ) ) . toBe ( true ) ;
27
+ expect ( isOpenTelemetryAgentName ( 'opentelemetry/java/opentelemetry-java-instrumentation' ) ) . toBe (
28
+ true
29
+ ) ;
26
30
expect ( isOpenTelemetryAgentName ( 'not-an-agent' ) ) . toBe ( false ) ;
27
31
} ) ;
28
32
29
33
it ( 'isJavaAgentName should guard if the passed agent is an Java one.' , ( ) => {
30
34
expect ( isJavaAgentName ( 'java' ) ) . toBe ( true ) ;
35
+ expect ( isJavaAgentName ( 'opentelemetry/java' ) ) . toBe ( true ) ;
36
+ expect ( isJavaAgentName ( 'opentelemetry/java/opentelemetry-java-instrumentation' ) ) . toBe ( true ) ;
31
37
expect ( isJavaAgentName ( 'not-an-agent' ) ) . toBe ( false ) ;
32
38
} ) ;
33
39
Original file line number Diff line number Diff line change @@ -16,11 +16,17 @@ import type {
16
16
} from './agent_names' ;
17
17
18
18
export function isOpenTelemetryAgentName ( agentName : string ) : agentName is OpenTelemetryAgentName {
19
- return OPEN_TELEMETRY_AGENT_NAMES . includes ( agentName as OpenTelemetryAgentName ) ;
19
+ return (
20
+ agentName ?. startsWith ( 'opentelemetry/' ) ||
21
+ OPEN_TELEMETRY_AGENT_NAMES . includes ( agentName as OpenTelemetryAgentName )
22
+ ) ;
20
23
}
21
24
22
25
export function isJavaAgentName ( agentName ?: string ) : agentName is JavaAgentName {
23
- return JAVA_AGENT_NAMES . includes ( agentName ! as JavaAgentName ) ;
26
+ return (
27
+ agentName ?. startsWith ( 'opentelemetry/java' ) ||
28
+ JAVA_AGENT_NAMES . includes ( agentName ! as JavaAgentName )
29
+ ) ;
24
30
}
25
31
26
32
export function isRumAgentName ( agentName ?: string ) : agentName is RumAgentName {
You can’t perform that action at this time.
0 commit comments