Bump jetty-server.version from 12.0.18 to 12.0.19 (#1317)

Bumps `jetty-server.version` from 12.0.18 to 12.0.19.
Updates `org.eclipse.jetty:jetty-server` from 12.0.18 to 12.0.19

Updates `org.eclipse.jetty.ee10:jetty-ee10-servlet` from 12.0.18 to
12.0.19


Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)


</details>

---------

Signed-off-by: dependabot[bot] <[email protected]>
Signed-off-by: Gregor Zeitlinger <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Gregor Zeitlinger <[email protected]>

Author: dependabot[bot]

examples/example-exporter-opentelemetry/oats-tests/agent/example_target_info.json

@@ -0,0 +1,82 @@
+{
+  "status": "success",
+  "data": {
+    "resultType": "vector",
+    "result": [
+      {
+        "metric": {
+          "__name__": "target_info",
+          "container_id": "0282187277c5f259f3405455bd5094a936642415a02bd8dbbdb41a73987d8db7",
+          "host_arch": "amd64",
+          "host_name": "0282187277c5",
+          "instance": "6b3318d9-2b87-498b-a1a3-bbfaecc96374",
+          "job": "rolldice",
+          "os_description": "Linux 6.8.0-57-generic",
+          "os_type": "linux",
+          "process_command_args": "[\"/opt/java/openjdk/bin/java\",\"-jar\",\"./app.jar\"]",
+          "process_executable_path": "/opt/java/openjdk/bin/java",
+          "process_pid": "1",
+          "process_runtime_description": "Eclipse Adoptium OpenJDK 64-Bit Server VM 21.0.6+7-LTS",
+          "process_runtime_name": "OpenJDK Runtime Environment",
+          "process_runtime_version": "21.0.6+7-LTS",
+          "service_instance_id": "6b3318d9-2b87-498b-a1a3-bbfaecc96374",
+          "service_name": "rolldice",
+          "telemetry_distro_name": "opentelemetry-java-instrumentation",
+          "telemetry_distro_version": "2.8.0",
+          "telemetry_sdk_language": "java",
+          "telemetry_sdk_name": "opentelemetry",
+          "telemetry_sdk_version": "1.42.1"
+        },
+        "value": [
+          1743776399.291,
+          "1"
+        ]
+      },
+      {
+        "metric": {
+          "__name__": "target_info",
+          "http_scheme": "http",
+          "instance": "e6ff9e41-acdb-4c47-88b5-8112c831f5b5",
+          "job": "otelcol-contrib",
+          "net_host_port": "8888",
+          "server_port": "8888",
+          "service_instance_id": "e6ff9e41-acdb-4c47-88b5-8112c831f5b5",
+          "service_name": "otelcol-contrib",
+          "service_version": "0.122.1",
+          "url_scheme": "http"
+        },
+        "value": [
+          1743776399.291,
+          "1"
+        ]
+      },
+      {
+        "metric": {
+          "__name__": "target_info",
+          "container_id": "0282187277c5f259f3405455bd5094a936642415a02bd8dbbdb41a73987d8db7",
+          "host_arch": "amd64",
+          "host_name": "0282187277c5",
+          "instance": "6b3318d9-2b87-498b-a1a3-bbfaecc96374",
+          "job": "rolldice",
+          "os_description": "Linux 6.8.0-57-generic",
+          "os_type": "linux",
+          "process_command_line": "/opt/java/openjdk/bin/java -javaagent:/usr/src/app/opentelemetry-javaagent.jar -jar ./app.jar",
+          "process_executable_path": "/opt/java/openjdk/bin/java",
+          "process_pid": "1",
+          "process_runtime_description": "Eclipse Adoptium OpenJDK 64-Bit Server VM 21.0.6+7-LTS",
+          "process_runtime_name": "OpenJDK Runtime Environment",
+          "process_runtime_version": "21.0.6+7-LTS",
+          "service_instance_id": "6b3318d9-2b87-498b-a1a3-bbfaecc96374",
+          "service_name": "rolldice",
+          "telemetry_sdk_language": "java",
+          "telemetry_sdk_name": "opentelemetry",
+          "telemetry_sdk_version": "1.48.0"
+        },
+        "value": [
+          1743776399.291,
+          "1"
+        ]
+      }
+    ]
+  }
+}

examples/example-exporter-opentelemetry/oats-tests/agent/service-instance-id-check.py

@@ -7,14 +7,15 @@
 import urllib.parse
 import json
 
-url = ' http://localhost:9090/api/v1/label/instance/values'
+url = ' http://localhost:9090/api/v1/query?query=target_info'
 res = json.loads(urlopen(url).read().decode('utf-8'))
 
-values = list(res['data'])
-print(values)
+# uncomment the following line to use the local file instead of the url - for debugging
+# with open('example_target_info.json') as f:
+#   res = json.load(f)
 
-if "localhost:8888" in values:
-    values.remove("localhost:8888")
+values = list({r['metric']['instance'] for r in res['data']['result'] if not r['metric']['service_name'] == 'otelcol-contrib'})
+print(values)
 
 # both the agent and the exporter should report the same instance id
 assert len(values) == 1

integration-tests/it-exporter/it-exporter-servlet-jetty-sample/pom.xml

@@ -15,7 +15,7 @@
         Jetty Sample for the Exporter Integration Test
     </description>
     <properties>
-        <jetty-server.version>12.0.18</jetty-server.version>
+        <jetty-server.version>12.0.19</jetty-server.version>
         <java.version>17</java.version>
     </properties>