Skip to content

Commit

Permalink
Upgrade dotnet and nodejs autoinstr versions
Browse files Browse the repository at this point in the history
  • Loading branch information
rnishtala-sumo committed Feb 3, 2025
1 parent 03477e6 commit 9902123
Show file tree
Hide file tree
Showing 4 changed files with 34 additions and 26 deletions.
4 changes: 2 additions & 2 deletions deploy/helm/sumologic/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2498,13 +2498,13 @@ opentelemetry-operator:
tag: 2.10.0
dotnet:
repository: public.ecr.aws/sumologic/autoinstrumentation-dotnet
tag: 0.7.0
tag: 1.9.0
python:
repository: public.ecr.aws/sumologic/autoinstrumentation-python
tag: 0.48b0
nodejs:
repository: public.ecr.aws/sumologic/autoinstrumentation-nodejs
tag: 0.40.0
tag: 0.54.0
env:
{}
# ENABLE_WEBHOOKS: "true"
Expand Down
27 changes: 11 additions & 16 deletions tests/integration/features.go
Original file line number Diff line number Diff line change
Expand Up @@ -765,31 +765,26 @@ func GetCurlAppFeature() features.Feature {
internal.InstrumentationAppsNamespace,
internal.CurlAppImage,
)).
Assess("wait for java traces", stepfuncs.WaitUntilExpectedSpansPresent(
Assess("wait for dotnet traces", stepfuncs.WaitUntilExpectedSpansPresent(
1,
map[string]string{
"application": "test-apps",
"service.name": "java-app",
"service.name": "dotnet-app",
"_collector": "kubernetes",
"http.request.method": "GET",
"http.route": "/",
"http.response.status_code": "200",
"url.scheme": "http",
"url.path": "/",
"k8s.cluster.name": "kubernetes",
"k8s.container.name": "javaapp",
"k8s.deployment.name": "java-app",
"k8s.container.name": "dotnetapp",
"k8s.deployment.name": "dotnet-app",
"k8s.namespace.name": internal.InstrumentationAppsNamespace,
"k8s.pod.pod_name": "java-app",
"k8s.pod.label.app": "java-app",
"server.port": "8080",
"network.protocol.version": "1.1",
"_sourceCategory": "kubernetes/test/apps/java/app",
"_sourceName": fmt.Sprintf("%s.java-app.javaapp", internal.InstrumentationAppsNamespace),
"telemetry.distro.version": "2.10.0",
"telemetry.sdk.language": "java",
"telemetry.sdk.name": "opentelemetry",
"telemetry.sdk.version": "1.44.1",
"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.distro.version": "1.9.0",
"telemetry.sdk.language": "dotnet",
"telemetry.sdk.version": "1.9.0",
},
waitDuration,
tickDuration,
Expand Down
6 changes: 3 additions & 3 deletions tests/integration/helm_opentelemetry_operator_instr_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -113,12 +113,12 @@ func Test_OpenTelemetry_Operator_Instrumentation(t *testing.T) {
}).
Feature()

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

curlApp := GetCurlAppFeature()

testenv.Test(t, featInstall, featOpenTelemetryOperator, featJavaApp, curlApp)
testenv.Test(t, featInstall, featOpenTelemetryOperator, featDotnetApp, curlApp)
}
23 changes: 18 additions & 5 deletions tests/integration/internal/sumologicmock/receiver_mock.go
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,7 @@ type Span struct {
}

func (client *SumologicMockClient) GetSpansCount(t *testing.T, metadataFilters MetadataFilters) (uint, error) {
var response map[string]interface{}
path := parseUrl(t, "spans-list")

queryParams := url.Values{}
Expand All @@ -185,7 +186,9 @@ func (client *SumologicMockClient) GetSpansCount(t *testing.T, metadataFilters M
}

url := client.baseUrl.ResolveReference(path)
fmt.Println("================Test Name================")
fmt.Println(t.Name())
fmt.Println("================URL================")
resp, err := http.Get(url.String())
if err != nil {
return 0, fmt.Errorf("failed fetching %s, err: %w", url, err)
Expand All @@ -195,26 +198,36 @@ func (client *SumologicMockClient) GetSpansCount(t *testing.T, metadataFilters M
return 0, fmt.Errorf("failed reading response body: %w", err)
}
bodyString := string(body)
fmt.Println("================Response (No filters)================")
fmt.Println(bodyString)
url.RawQuery = queryParams.Encode()

fmt.Println("================URL With Filters================")
fmt.Println(url.String())
resp, err = http.Get(url.String())
if err != nil {
return 0, fmt.Errorf("failed fetching %s, err: %w", url, err)
}

body, _ = io.ReadAll(resp.Body)

Check failure on line 210 in tests/integration/internal/sumologicmock/receiver_mock.go

View workflow job for this annotation

GitHub Actions / Run Integration Tests / Lint integration tests

Error return value of `io.ReadAll` is not checked (errcheck)
bodyString = string(body)
fmt.Println("================Response (With filters)================")
fmt.Println(bodyString)
if resp.StatusCode != 200 {
return 0, fmt.Errorf(
"received status code %d in response to receiver request at %q",
resp.StatusCode, url,
)
}

var spans []Span
if err := json.NewDecoder(resp.Body).Decode(&spans); err != nil {
// var spans []Span
if err := json.Unmarshal(body, &response); err != nil {
return 0, err
}
return uint(len(spans)), nil
/*if err := json.NewDecoder(resp.Body).Decode(&spans); err != nil {
return 0, err
}*/
fmt.Println("================Response================")
fmt.Println(response)
return uint(len(response)), nil
}

func (client *SumologicMockClient) GetTracesCounts(t *testing.T, metadataFilters MetadataFilters) ([]uint, error) {
Expand Down

0 comments on commit 9902123

Please sign in to comment.