spelling

Signed-off-by: Gregor Zeitlinger <[email protected]>

Author: zeitlinger

.github/super-linter.env

@@ -1,4 +1,4 @@
-FILTER_REGEX_EXCLUDE=mvnw
+FILTER_REGEX_EXCLUDE=mvnw|src/main/generated/.*|docs/themes/.*
 IGNORE_GITIGNORED_FILES=true
 JAVA_FILE_NAME=google_checks.xml
 # disable kubernetes linter - complains about resource limits, etc
@@ -20,8 +20,6 @@ VALIDATE_JAVASCRIPT_STANDARD=false
 VALIDATE_JSCPD=false
 VALIDATE_PYTHON_PYLINT=false
 
-# FILTER_REGEX_EXCLUDE=src/main/generated/.*|docs/themes/.*
-
 FIX_ENV=true
 FIX_GO=true
 FIX_JAVASCRIPT_PRETTIER=true

.github/workflows/release.yml

@@ -17,8 +17,8 @@ jobs:
         env:
           GPG_SIGNING_KEY: ${{ secrets.GPG_SIGNING_KEY }}
         run: |
-          echo "$GPG_SIGNING_KEY" | wc -c
-          echo "$GPG_SIGNING_KEY" | gpg --batch --import-options import-show --import
+          echo "${GPG_SIGNING_KEY}" | wc -c
+          echo "${GPG_SIGNING_KEY}" | gpg --batch --import-options import-show --import
       - name: Checkout Plugin Repository
         uses: actions/checkout@v4
         with:

docs/README.md

@@ -12,12 +12,12 @@ This will serve the docs on [http://localhost:1313](http://localhost:1313).
 
 ## Deploy to GitHub Pages
 
-Changes to the `main` branch will be deployed automatically with GitHub actions.
+Changes to the `main` branch will be deployed automatically with GitHub Actions.
 
 ## Update Javadoc
 
 Javadoc are not checked-in to the GitHub repository.
-They are generated on the fly by GitHub actions when the docs are updated.
+They are generated on the fly by GitHub Actions when the docs are updated.
 To view locally, run the following:
 
 ```

examples/example-exemplars-tail-sampling/config/grafana-example-dashboard.json

@@ -204,7 +204,7 @@
           "exemplar": false,
           "expr": "histogram_count(rate(request_duration_seconds{job=\"$instance\"}[5m]))",
           "instant": true,
-          "key": "Q-ddf5e7ad-fa7a-4342-acf8-819848f226a3-0",
+          "key": "key1",
           "range": true,
           "refId": "A"
         }
@@ -300,7 +300,7 @@
           "editorMode": "code",
           "expr": "rate(tempo_ingester_traces_created_total[5m])",
           "instant": true,
-          "key": "Q-0e8731c6-7df2-47bc-a1a3-45dcb9f5e92d-0",
+          "key": "key2",
           "range": true,
           "refId": "A"
         }

examples/example-exporter-opentelemetry/oats-tests/agent/oats.yaml

@@ -5,7 +5,7 @@ docker-compose:
     - ./docker-compose.yml
 expected:
   custom-checks:
-    - script: ./service-instance-id-check.py
+    - script: ./service_instance_id_check.py
   metrics:
     - promql: "uptime_seconds_total{}"
       value: ">= 0"

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

@@ -0,0 +1,47 @@
+#!/usr/bin/env python3
+
+"""This script is used to check if the service instance id is present in the exported data
+The script will return 0 if the service instance id is present in the exported data"""
+
+import json
+import urllib.parse
+from urllib.request import urlopen
+
+URL = " http://localhost:9090/api/v1/query?query=target_info"
+with urlopen(URL) as response:
+    # read the response
+    res = response.read()
+    # decode the response
+    res = res.decode("utf-8")
+
+# 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)
+
+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
+
+path = f'target_info{{instance="{values[0]}"}}'
+path = urllib.parse.quote_plus(path)
+URL = f"http://localhost:9090/api/v1/query?query={path}"
+with urlopen(URL) as response:
+    # read the response
+    res = response.read()
+    # decode the response
+    res = res.decode("utf-8")
+
+infos = res["data"]["result"]
+print(infos)
+
+# they should not have the same target info
+# e.g. only the agent has telemetry_distro_name
+assert len(infos) == 2

examples/example-exporter-opentelemetry/oats-tests/agent/service_instance_id_check.py

@@ -35,7 +35,7 @@ public class ResourceAttributesFromOtelAgent {
    * runtime dependency on any OTel version remains.
    *
    * <p>The test for this class is in
-   * examples/example-exporter-opentelemetry/oats-tests/agent/service-instance-id-check.py
+   * examples/example-exporter-opentelemetry/oats-tests/agent/service_instance_id_check.py
    */
   public static Map<String, String> getResourceAttributes(String instrumentationScopeName) {
     try {