Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
testing java traces
Browse files Browse the repository at this point in the history
rnishtala-sumo committed Jan 31, 2025

Verified

This commit was signed with the committer’s verified signature.
EasterTheBunny Awbrey Hughlett
1 parent a65d732 commit 2296cf2
Showing 2 changed files with 5 additions and 58 deletions.
55 changes: 1 addition & 54 deletions tests/integration/features.go
Original file line number Diff line number Diff line change
@@ -634,7 +634,7 @@ func GetJavaAppFeature() features.Feature {
Setup(stepfuncs.KubectlApplyFOpt(internal.InstrumentationJavaSvc, internal.InstrumentationAppsNamespace)).
Assess("java-app deployment is present", stepfuncs.WaitUntilPodsAvailableCustomNS(
v1.ListOptions{
LabelSelector: "app=dotnet-app",
LabelSelector: "app=java-app",
},
1,
waitDuration,
@@ -765,31 +765,6 @@ func GetCurlAppFeature() features.Feature {
internal.InstrumentationAppsNamespace,
internal.CurlAppImage,
)).
Assess("wait for dotnet traces", stepfuncs.WaitUntilExpectedSpansPresent(
1,
map[string]string{
"application": "test-apps",
"service.name": "dotnet-app",
"_collector": "kubernetes",
"http.method": "GET",
"http.status_code": "200",
"http.target": "/",
"http.url": "http://dotnet-app-service.test-apps:8080/",
"k8s.cluster.name": "kubernetes",
"k8s.container.name": "dotnetapp",
"k8s.deployment.name": "dotnet-app",
"k8s.namespace.name": internal.InstrumentationAppsNamespace,
"k8s.pod.pod_name": "dotnet-app",
"k8s.pod.label.app": "dotnet-app",
"_sourceCategory": "kubernetes/test/apps/dotnet/app",
"_sourceName": fmt.Sprintf("%s.dotnet-app.dotnetapp", internal.InstrumentationAppsNamespace),
"telemetry.auto.version": "0.7.0",
"telemetry.sdk.language": "dotnet",
"telemetry.sdk.version": "1.4.0.802",
},
waitDuration,
tickDuration,
)).
Assess("wait for java traces", stepfuncs.WaitUntilExpectedSpansPresent(
1,
map[string]string{
@@ -820,34 +795,6 @@ func GetCurlAppFeature() features.Feature {
waitDuration,
tickDuration,
)).
Assess("wait for nodejs traces", stepfuncs.WaitUntilExpectedSpansPresent(
1,
map[string]string{
"application": "test-apps",
"service.name": "nodejs-app",
"_collector": "kubernetes",
"http.method": "GET",
"http.route": "",
"http.status_code": "200",
"http.scheme": "http",
"http.target": "/",
"http.url": "http://nodejs-app-service.test-apps:8080/",
"k8s.cluster.name": "kubernetes",
"k8s.container.name": "nodejsapp",
"k8s.deployment.name": "nodejs-app",
"k8s.namespace.name": internal.InstrumentationAppsNamespace,
"k8s.pod.pod_name": "nodejs-app",
"k8s.pod.label.app": "nodejs-app",
"net.host.port": "3000",
"_sourceCategory": "kubernetes/test/apps/nodejs/app",
"_sourceName": fmt.Sprintf("%s.nodejs-app.nodejsapp", internal.InstrumentationAppsNamespace),
"telemetry.sdk.language": "nodejs",
"telemetry.sdk.name": "opentelemetry",
"telemetry.sdk.version": "1.14.0",
},
waitDuration,
tickDuration,
)).
Teardown(stepfuncs.KubectlDeleteNamespaceOpt(internal.InstrumentationAppsNamespace, true)).
Feature()
}
8 changes: 4 additions & 4 deletions tests/integration/helm_opentelemetry_operator_instr_test.go
Original file line number Diff line number Diff line change
@@ -113,12 +113,12 @@ func Test_OpenTelemetry_Operator_Instrumentation(t *testing.T) {
}).
Feature()

featDotnetApp := GetDotnetAppFeature()
// featDotnetApp := GetDotnetAppFeature()
featJavaApp := GetJavaAppFeature()
featNodeJSApp := GetNodeJSAppFeature()
featPythonApp := GetPythonAppFeature()
// featNodeJSApp := GetNodeJSAppFeature()
// featPythonApp := GetPythonAppFeature()

curlApp := GetCurlAppFeature()

testenv.Test(t, featInstall, featOpenTelemetryOperator, featDotnetApp, featJavaApp, featNodeJSApp, featPythonApp, curlApp)
testenv.Test(t, featInstall, featOpenTelemetryOperator, featJavaApp, curlApp)
}

0 comments on commit 2296cf2

Please sign in to comment.