fix another set of tests related to otlp conversion and help options

Author: marcsanmi

cmd/pyroscope/help-all.txt.tmpl

@@ -631,6 +631,8 @@ Usage of ./pyroscope:
     	Maximum age of cached debug info (default 168h0m0s)
   -query-frontend.symbolizer.debuginfod-url string
     	URL of the debuginfod server (default "https://debuginfod.elfutils.org")
+  -query-frontend.symbolizer.symbol-cache-size int
+    	Maximum number of entries in the symbol cache (default 100000)
   -query-scheduler.grpc-client-config.backoff-max-period duration
     	Maximum delay when backing off. (default 10s)
   -query-scheduler.grpc-client-config.backoff-min-period duration

cmd/pyroscope/help.txt.tmpl

@@ -179,6 +179,8 @@ Usage of ./pyroscope:
     	Maximum age of cached debug info (default 168h0m0s)
   -query-frontend.symbolizer.debuginfod-url string
     	URL of the debuginfod server (default "https://debuginfod.elfutils.org")
+  -query-frontend.symbolizer.symbol-cache-size int
+    	Maximum number of entries in the symbol cache (default 100000)
   -query-scheduler.max-outstanding-requests-per-tenant int
     	Maximum number of outstanding requests per tenant per query-scheduler. In-flight requests above this limit will fail with HTTP response status code 429. (default 100)
   -query-scheduler.ring.consul.hostname string

pkg/ingester/otlp/testdata/TestConversionOffCpu.json

@@ -10,16 +10,10 @@
       "locations": [
         {
           "address": "0x1e0",
-          "lines": [
-            "file1.so 0x1e0[]@:0"
-          ],
           "mapping": "0x1000-0x1000@0x0 file1.so()"
         },
         {
           "address": "0x2f0",
-          "lines": [
-            "file1.so 0x2f0[]@:0"
-          ],
           "mapping": "0x1000-0x1000@0x0 file1.so()"
         }
       ],
@@ -29,9 +23,6 @@
       "locations": [
         {
           "address": "0x3f0",
-          "lines": [
-            "file1.so 0x3f0[]@:0"
-          ],
           "mapping": "0x1000-0x1000@0x0 file1.so()"
         }
       ],
@@ -41,4 +32,4 @@
   "time_nanos": "239",
   "duration_nanos": "10000000000",
   "period": "0"
-}
+}

pkg/ingester/otlp/testdata/TestSampleAttributes.json

@@ -10,16 +10,10 @@
       "locations": [
         {
           "address": "0x1e",
-          "lines": [
-            "firefox.so 0x1e[]@:0"
-          ],
           "mapping": "0x1000-0x1000@0x0 firefox.so()"
         },
         {
           "address": "0x2e",
-          "lines": [
-            "firefox.so 0x2e[]@:0"
-          ],
           "mapping": "0x1000-0x1000@0x0 firefox.so()"
         }
       ],
@@ -30,16 +24,10 @@
       "locations": [
         {
           "address": "0x3e",
-          "lines": [
-            "chrome.so 0x3e[]@:0"
-          ],
           "mapping": "0x1000-0x1000@0x0 chrome.so()"
         },
         {
           "address": "0x4e",
-          "lines": [
-            "chrome.so 0x4e[]@:0"
-          ],
           "mapping": "0x1000-0x1000@0x0 chrome.so()"
         }
       ],

pkg/ingester/otlp/testdata/TestSymbolizedFunctionNames.json

@@ -10,16 +10,10 @@
       "locations": [
         {
           "address": "0x1e0",
-          "lines": [
-            "file1.so 0x1e0[]@:0"
-          ],
           "mapping": "0x1000-0x1000@0x0 file1.so()"
         },
         {
           "address": "0x2f0",
-          "lines": [
-            "file1.so 0x2f0[]@:0"
-          ],
           "mapping": "0x1000-0x1000@0x0 file1.so()"
         }
       ],
@@ -29,4 +23,4 @@
   "time_nanos": "239",
   "duration_nanos": "10000000000",
   "period": "0"
-}
+}