Skip to content

Commit

Permalink
chore: Upgrade the java-autoinstrumentation library to 2.10.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@rnishtala-sumo
rnishtala-sumo committed Jan 31, 2025
1 parent a2e6538 commit dab9649
Show file tree
Hide file tree
Showing 7 changed files with 42 additions and 29 deletions.
1 change: 1 addition & 0 deletions .changelog/3882.changed.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
chore: Upgrade the java-autoinstrumentation library to 2.10.0
2 changes: 1 addition & 1 deletion deploy/helm/sumologic/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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. | `{}` |
Expand Down
2 changes: 1 addition & 1 deletion deploy/helm/sumologic/values.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions ...oldenfile/opentelemetry_operator_instrumentation_cr_configmap/instrumentation.output.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
46 changes: 23 additions & 23 deletions tests/integration/features.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
1 change: 0 additions & 1 deletion tests/integration/internal/stepfuncs/assess_funcs.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down
15 changes: 14 additions & 1 deletion tests/integration/internal/sumologicmock/receiver_mock.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import (
"crypto/tls"
"encoding/json"
"fmt"
"io"
"net/http"
"net/url"
"strconv"
Expand Down Expand Up @@ -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)
}
Expand Down

0 comments on commit dab9649

Please sign in to comment.