diff --git a/.changelog/3882.changed.txt b/.changelog/3882.changed.txt new file mode 100644 index 0000000000..0a45c256a8 --- /dev/null +++ b/.changelog/3882.changed.txt @@ -0,0 +1 @@ +chore: Upgrade the java-autoinstrumentation library to 2.10.0 \ No newline at end of file diff --git a/deploy/helm/sumologic/README.md b/deploy/helm/sumologic/README.md index 53f1540144..89aa406d3f 100644 --- a/deploy/helm/sumologic/README.md +++ b/deploy/helm/sumologic/README.md @@ -309,7 +309,7 @@ The following table lists the configurable parameters of the Sumo Logic chart an | `instrumentation.dotnet.traces.enabled` | Flag to control traces export from DotNet instrumentation in `Instrumentation` resource. | `true` | | `instrumentation.java.extraEnvVars` | Additional environment variables for OpenTelemetry Operator Instrumentation Resource. | `{}` | | `opentelemetry-operator.manager.autoInstrumentationImage.java.repository` | OpenTelemetry Operator Java Instrumentation image repository. | `public.ecr.aws/sumologic/autoinstrumentation-java` | -| `opentelemetry-operator.manager.autoInstrumentationImage.java.tag` | OpenTelemetry Operator Java Instrumentation image tag. | `1.26.0` | +| `opentelemetry-operator.manager.autoInstrumentationImage.java.tag` | OpenTelemetry Operator Java Instrumentation image tag. | `2.10.0` | | `instrumentation.java.metrics.enabled` | Flag to control metrics export from Java instrumentation in `Instrumentation` resource. | `true` | | `instrumentation.java.traces.enabled` | Flag to control traces export from Java instrumentation in `Instrumentation` resource. | `true` | | `instrumentation.python.extraEnvVars` | Additional environment variables for OpenTelemetry Operator Instrumentation Resource. | `{}` | diff --git a/deploy/helm/sumologic/values.yaml b/deploy/helm/sumologic/values.yaml index ab774533ee..b537d6f211 100644 --- a/deploy/helm/sumologic/values.yaml +++ b/deploy/helm/sumologic/values.yaml @@ -2495,7 +2495,7 @@ opentelemetry-operator: autoInstrumentationImage: java: repository: public.ecr.aws/sumologic/autoinstrumentation-java - tag: 1.26.0 + tag: 2.10.0 dotnet: repository: public.ecr.aws/sumologic/autoinstrumentation-dotnet tag: 0.7.0 diff --git a/tests/helm/testdata/goldenfile/opentelemetry_operator_instrumentation_cr_configmap/instrumentation.output.yaml b/tests/helm/testdata/goldenfile/opentelemetry_operator_instrumentation_cr_configmap/instrumentation.output.yaml index 981f96ba99..cd67c4253e 100644 --- a/tests/helm/testdata/goldenfile/opentelemetry_operator_instrumentation_cr_configmap/instrumentation.output.yaml +++ b/tests/helm/testdata/goldenfile/opentelemetry_operator_instrumentation_cr_configmap/instrumentation.output.yaml @@ -66,7 +66,7 @@ data: - name: OTEL_EXPORTER_OTLP_ENDPOINT value: http://RELEASE-NAME-sumologic-otelagent.sumologic:4317 java: - image: public.ecr.aws/sumologic/autoinstrumentation-java:1.26.0 + image: public.ecr.aws/sumologic/autoinstrumentation-java:2.10.0 env: - name: OTEL_METRICS_EXPORTER value: otlp @@ -130,7 +130,7 @@ data: - name: OTEL_EXPORTER_OTLP_ENDPOINT value: http://RELEASE-NAME-sumologic-otelagent.sumologic:4317 java: - image: public.ecr.aws/sumologic/autoinstrumentation-java:1.26.0 + image: public.ecr.aws/sumologic/autoinstrumentation-java:2.10.0 env: - name: OTEL_METRICS_EXPORTER value: otlp diff --git a/tests/integration/features.go b/tests/integration/features.go index 0e78a411c5..0d5f371f12 100644 --- a/tests/integration/features.go +++ b/tests/integration/features.go @@ -793,29 +793,29 @@ func GetCurlAppFeature() features.Feature { Assess("wait for java traces", stepfuncs.WaitUntilExpectedSpansPresent( 1, map[string]string{ - "application": "test-apps", - "service.name": "java-app", - "_collector": "kubernetes", - "http.method": "GET", - "http.route": "/", - "http.status_code": "200", - "http.scheme": "http", - "http.target": "/", - "k8s.cluster.name": "kubernetes", - "k8s.container.name": "javaapp", - "k8s.deployment.name": "java-app", - "k8s.namespace.name": internal.InstrumentationAppsNamespace, - "k8s.pod.pod_name": "java-app", - "k8s.pod.label.app": "java-app", - "net.host.port": "8080", - "net.protocol.name": "http", - "net.protocol.version": "1.1", - "_sourceCategory": "kubernetes/test/apps/java/app", - "_sourceName": fmt.Sprintf("%s.java-app.javaapp", internal.InstrumentationAppsNamespace), - "telemetry.auto.version": "1.26.0", - "telemetry.sdk.language": "java", - "telemetry.sdk.name": "opentelemetry", - "telemetry.sdk.version": "1.26.0", + "application": "test-apps", + "service.name": "java-app", + "_collector": "kubernetes", + "http.method": "GET", + "http.route": "/", + "http.status_code": "200", + "http.scheme": "http", + "http.target": "/", + "k8s.cluster.name": "kubernetes", + "k8s.container.name": "javaapp", + "k8s.deployment.name": "java-app", + "k8s.namespace.name": internal.InstrumentationAppsNamespace, + "k8s.pod.pod_name": "java-app", + "k8s.pod.label.app": "java-app", + "net.host.port": "8080", + "net.protocol.name": "http", + "net.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", }, waitDuration, tickDuration, diff --git a/tests/integration/internal/stepfuncs/assess_funcs.go b/tests/integration/internal/stepfuncs/assess_funcs.go index 3e243bd9f1..94f96b63cc 100644 --- a/tests/integration/internal/stepfuncs/assess_funcs.go +++ b/tests/integration/internal/stepfuncs/assess_funcs.go @@ -132,7 +132,6 @@ func WaitUntilExpectedTracesPresent( log.InfoS( "received enough traces, but less spans than expected", "received numbers of spans in traces", tracesLengths, - "expected", expectedSpansPerTraceCount, ) return false } diff --git a/tests/integration/internal/sumologicmock/receiver_mock.go b/tests/integration/internal/sumologicmock/receiver_mock.go index a01ef6307d..c184cbd906 100644 --- a/tests/integration/internal/sumologicmock/receiver_mock.go +++ b/tests/integration/internal/sumologicmock/receiver_mock.go @@ -5,6 +5,7 @@ import ( "crypto/tls" "encoding/json" "fmt" + "io" "net/http" "net/url" "strconv" @@ -184,9 +185,21 @@ func (client *SumologicMockClient) GetSpansCount(t *testing.T, metadataFilters M } url := client.baseUrl.ResolveReference(path) + fmt.Println("================Fetching traces================") + 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, err := io.ReadAll(resp.Body) + if err != nil { + return 0, fmt.Errorf("failed reading response body: %w", err) + } + bodyString := string(body) + fmt.Println(bodyString) url.RawQuery = queryParams.Encode() - resp, err := http.Get(url.String()) + resp, err = http.Get(url.String()) if err != nil { return 0, fmt.Errorf("failed fetching %s, err: %w", url, err) }