chore: Upgrade the java-autoinstrumentation library to 2.10.0

SumoLogic · Jan 31, 2025 · 7c677f1 · 7c677f1
1 parent a2e6538
commit 7c677f1
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 8 deletions.
diff --git a/.changelog/3882.changed.txt b/.changelog/3882.changed.txt
@@ -0,0 +1 @@
+chore: Upgrade the java-autoinstrumentation library to 2.10.0
diff --git 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
@@ -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/...oldenfile/opentelemetry_operator_instrumentation_cr_configmap/instrumentation.output.yaml b/...oldenfile/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
@@ -812,10 +812,10 @@ func GetCurlAppFeature() features.Feature {
 				"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.auto.version": "2.10.0",
 				"telemetry.sdk.language": "java",
 				"telemetry.sdk.name":     "opentelemetry",
-				"telemetry.sdk.version":  "1.26.0",
+				"telemetry.sdk.version":  "2.10.0",
 			},
 			waitDuration,
 			tickDuration,

diff --git 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
@@ -214,9 +214,16 @@ func (client *SumologicMockClient) GetTracesCounts(t *testing.T, metadataFilters
 	}
 
 	url := client.baseUrl.ResolveReference(path)
+	fmt.Println("================Fetching traces================")
+	fmt.Println(url.String())
+	resp, err := http.Get(url.String())
+	if err != nil {
+		return []uint{}, fmt.Errorf("failed fetching %s, err: %w", url, err)
+	}
+	fmt.Println(resp.Body)
 	url.RawQuery = queryParams.Encode()
 
-	resp, err := http.Get(url.String())
+	resp, err = http.Get(url.String())
 	if err != nil {
 		return []uint{}, fmt.Errorf("failed fetching %s, err: %w", url, err)
 	}
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		chore: Upgrade the java-autoinstrumentation library to 2.10.0