upgrade nginx OpenTelemetry and gRPC (#252)

Author: esigo

instrumentation/nginx/src/otel_ngx_module.cpp

@@ -1,3 +1,10 @@
+// clang-format off
+// otlp_grpc_exporter header has to be included before any other API header to 
+// avoid conflict between Abseil library and OpenTelemetry C++ absl::variant.
+// https://github.com/open-telemetry/opentelemetry-cpp/tree/main/examples/otlp#additional-notes-regarding-abseil-library
+#include <opentelemetry/exporters/otlp/otlp_grpc_exporter.h>
+// clang-format on
+
 #include <opentelemetry/sdk/trace/processor.h>
 #include <opentelemetry/trace/span.h>
 #include <algorithm>
@@ -18,7 +25,6 @@ extern ngx_module_t otel_ngx_module;
 #include "nginx_utils.h"
 #include "propagate.h"
 #include <opentelemetry/context/context.h>
-#include <opentelemetry/exporters/otlp/otlp_grpc_exporter.h>
 #include <opentelemetry/nostd/shared_ptr.h>
 #include <opentelemetry/sdk/trace/batch_span_processor.h>
 #include <opentelemetry/sdk/trace/id_generator.h>

instrumentation/nginx/test/data/trace.json

@@ -1,2 +1,2 @@
-{"resourceSpans":[{"resource":{"attributes":[{"key":"telemetry.sdk.version","value":{"stringValue":"1.3.0"}},{"key":"telemetry.sdk.name","value":{"stringValue":"opentelemetry"}},{"key":"telemetry.sdk.language","value":{"stringValue":"cpp"}},{"key":"service.name","value":{"stringValue":"nginx-proxy"}}]},"instrumentationLibrarySpans":[{"instrumentationLibrary":{"name":"nginx"},"spans":[{"traceId":"777151ac132afc1975887f8a3af71d23","spanId":"60bec6e1671cee32","parentSpanId":"","name":"otel_test","kind":"SPAN_KIND_SERVER","startTimeUnixNano":"1658331753935660143","endTimeUnixNano":"1658331753935827215","attributes":[{"key":"http.method","value":{"stringValue":"GET"}},{"key":"http.flavor","value":{"stringValue":"1.1"}},{"key":"http.target","value":{"stringValue":"/route_to_internal"}},{"key":"http.server_name","value":{"stringValue":"otel_test"}},{"key":"http.host","value":{"stringValue":"localhost:8000"}},{"key":"http.user_agent","value":{"stringValue":"curl/7.68.0"}},{"key":"http.status_code","value":{"intValue":"200"}},{"key":"http.scheme","value":{"stringValue":"http"}},{"key":"net.host.port","value":{"intValue":"8000"}},{"key":"net.peer.ip","value":{"stringValue":"172.25.0.1"}},{"key":"net.peer.port","value":{"intValue":"51608"}},{"key":"test.attrib.global","value":{"stringValue":"global"}},{"key":"test.attrib.custom","value":{"stringValue":"global-custom"}}],"status":{}}]}]}]}
-{"resourceSpans":[{"resource":{"attributes":[{"key":"telemetry.sdk.version","value":{"stringValue":"1.3.0"}},{"key":"telemetry.sdk.name","value":{"stringValue":"opentelemetry"}},{"key":"telemetry.sdk.language","value":{"stringValue":"cpp"}},{"key":"service.name","value":{"stringValue":"nginx-proxy"}}]},"instrumentationLibrarySpans":[{"instrumentationLibrary":{"name":"nginx"},"spans":[{"traceId":"579d297c39ddac461fbc50febd77f16a","spanId":"fecfc6a8c9b60f03","parentSpanId":"","name":"otel_test","kind":"SPAN_KIND_SERVER","startTimeUnixNano":"1658331755134563590","endTimeUnixNano":"1658331755134700342","attributes":[{"key":"http.method","value":{"stringValue":"GET"}},{"key":"http.flavor","value":{"stringValue":"1.1"}},{"key":"http.target","value":{"stringValue":"/route_to_internal"}},{"key":"http.server_name","value":{"stringValue":"otel_test"}},{"key":"http.host","value":{"stringValue":"localhost:8000"}},{"key":"http.user_agent","value":{"stringValue":"curl/7.68.0"}},{"key":"http.status_code","value":{"intValue":"200"}},{"key":"http.scheme","value":{"stringValue":"http"}},{"key":"net.host.port","value":{"intValue":"8000"}},{"key":"net.peer.ip","value":{"stringValue":"172.25.0.1"}},{"key":"net.peer.port","value":{"intValue":"51614"}},{"key":"test.attrib.global","value":{"stringValue":"global"}},{"key":"test.attrib.custom","value":{"stringValue":"global-custom"}}],"status":{}}]}]}]}
+{"resourceSpans":[{"resource":{"attributes":[{"key":"telemetry.sdk.version","value":{"stringValue":"1.8.1"}},{"key":"telemetry.sdk.name","value":{"stringValue":"opentelemetry"}},{"key":"telemetry.sdk.language","value":{"stringValue":"cpp"}},{"key":"service.name","value":{"stringValue":"nginx-proxy"}}]},"instrumentationLibrarySpans":[{"instrumentationLibrary":{"name":"nginx"},"spans":[{"traceId":"777151ac132afc1975887f8a3af71d23","spanId":"60bec6e1671cee32","parentSpanId":"","name":"otel_test","kind":"SPAN_KIND_SERVER","startTimeUnixNano":"1658331753935660143","endTimeUnixNano":"1658331753935827215","attributes":[{"key":"http.method","value":{"stringValue":"GET"}},{"key":"http.flavor","value":{"stringValue":"1.1"}},{"key":"http.target","value":{"stringValue":"/route_to_internal"}},{"key":"http.server_name","value":{"stringValue":"otel_test"}},{"key":"http.host","value":{"stringValue":"localhost:8000"}},{"key":"http.user_agent","value":{"stringValue":"curl/7.68.0"}},{"key":"http.status_code","value":{"intValue":"200"}},{"key":"http.scheme","value":{"stringValue":"http"}},{"key":"net.host.port","value":{"intValue":"8000"}},{"key":"net.peer.ip","value":{"stringValue":"172.25.0.1"}},{"key":"net.peer.port","value":{"intValue":"51608"}},{"key":"test.attrib.global","value":{"stringValue":"global"}},{"key":"test.attrib.custom","value":{"stringValue":"global-custom"}}],"status":{}}]}]}]}
+{"resourceSpans":[{"resource":{"attributes":[{"key":"telemetry.sdk.version","value":{"stringValue":"1.8.1"}},{"key":"telemetry.sdk.name","value":{"stringValue":"opentelemetry"}},{"key":"telemetry.sdk.language","value":{"stringValue":"cpp"}},{"key":"service.name","value":{"stringValue":"nginx-proxy"}}]},"instrumentationLibrarySpans":[{"instrumentationLibrary":{"name":"nginx"},"spans":[{"traceId":"579d297c39ddac461fbc50febd77f16a","spanId":"fecfc6a8c9b60f03","parentSpanId":"","name":"otel_test","kind":"SPAN_KIND_SERVER","startTimeUnixNano":"1658331755134563590","endTimeUnixNano":"1658331755134700342","attributes":[{"key":"http.method","value":{"stringValue":"GET"}},{"key":"http.flavor","value":{"stringValue":"1.1"}},{"key":"http.target","value":{"stringValue":"/route_to_internal"}},{"key":"http.server_name","value":{"stringValue":"otel_test"}},{"key":"http.host","value":{"stringValue":"localhost:8000"}},{"key":"http.user_agent","value":{"stringValue":"curl/7.68.0"}},{"key":"http.status_code","value":{"intValue":"200"}},{"key":"http.scheme","value":{"stringValue":"http"}},{"key":"net.host.port","value":{"intValue":"8000"}},{"key":"net.peer.ip","value":{"stringValue":"172.25.0.1"}},{"key":"net.peer.port","value":{"intValue":"51614"}},{"key":"test.attrib.global","value":{"stringValue":"global"}},{"key":"test.attrib.custom","value":{"stringValue":"global-custom"}}],"status":{}}]}]}]}

instrumentation/nginx/test/instrumentation/lib/mix/tasks/dockerfiles.ex

@@ -1,8 +1,8 @@
 defmodule Mix.Tasks.Dockerfiles do
   use Mix.Task
 
-  @grpc_version "v1.36.4"
-  @otel_cpp_version "v1.3.0"
+  @grpc_version "v1.49.2"
+  @otel_cpp_version "v1.8.1"
 
   def run([out_dir | combos]) do
     out_dir_abs = Path.expand(out_dir)
@@ -178,6 +178,7 @@ defmodule Mix.Tasks.Dockerfiles do
         -DgRPC_BUILD_GRPC_PHP_PLUGIN=OFF \\
         -DgRPC_BUILD_GRPC_PYTHON_PLUGIN=OFF \\
         -DgRPC_BUILD_GRPC_RUBY_PLUGIN=OFF \\
+        -DCMAKE_CXX_STANDARD=17 \\
         ../.. \\
       && make -j2 \\
       && make install
@@ -195,6 +196,7 @@ defmodule Mix.Tasks.Dockerfiles do
         -DWITH_OTLP_HTTP=OFF \\
         -DBUILD_TESTING=OFF \\
         -DWITH_EXAMPLES=OFF \\
+        -DCMAKE_CXX_STANDARD=17 \\
         -DCMAKE_POSITION_INDEPENDENT_CODE=ON \\
         .. \\
       && make -j2 \\
@@ -218,4 +220,4 @@ defmodule Mix.Tasks.Dockerfiles do
     CMD ["/usr/sbin/nginx", "-g", "daemon off;"]
     """
   end
-end
+end