Update and fix proto

.ruby-version

@@ -0,0 +1 @@
+2.7.6

Dockerfile

@@ -0,0 +1,19 @@
+FROM ruby:2.7-alpine
+
+RUN apk update && apk add --update --no-cache \
+  build-base \
+  git \
+  libxml2 \
+  libxslt \
+  libxml2-dev \
+  libxslt-dev \
+  libc-dev \
+  libgcrypt-dev \
+  bash \
+  curl
+
+WORKDIR /lib
+RUN gem install bundler:2.1.4 google-protobuf
+
+COPY . .
+RUN bundle install

bin/generate-protos.sh

@@ -5,11 +5,11 @@ set -eo pipefail
 DIR=`dirname "$0"`
 OUTPUT_DIR=$DIR/../lib/apollo-studio-tracing/proto
 
-echo "Removing old client"
-rm -f $OUTPUT_DIR/apollo.proto $OUTPUT_DIR/apollo_pb.rb
+# echo "Removing old client"
+# rm -f $OUTPUT_DIR/apollo.proto $OUTPUT_DIR/apollo_pb.rb
 
-echo "Downloading latest Apollo Protobuf IDL"
-curl --silent --output $OUTPUT_DIR/apollo.proto https://raw.githubusercontent.com/apollographql/apollo-server/main/packages/apollo-reporting-protobuf/src/reports.proto
+# echo "Downloading latest Apollo Protobuf IDL"
+# curl --silent --output $OUTPUT_DIR/apollo.proto https://usage-reporting.api.apollographql.com/proto/reports.proto
 
 echo "Generating Ruby client stubs"
 protoc -I $OUTPUT_DIR --ruby_out $OUTPUT_DIR $OUTPUT_DIR/apollo.proto

docker-compose.yml

@@ -0,0 +1,7 @@
+version: '3.9'
+name: 'apollo-studio-tracing-ruby'
+services:
+  lib:
+    build: .
+    volumes:
+      - '.:/lib'

lib/apollo-studio-tracing/api.rb

@@ -9,7 +9,7 @@ module ApolloStudioTracing
   module API
     extend self
 
-    APOLLO_URL = 'https://engine-report.apollodata.com/api/ingress/traces'
+    APOLLO_URL = 'https://usage-reporting.api.apollographql.com/api/ingress/traces'
     APOLLO_URI = ::URI.parse(APOLLO_URL)
     UploadAttemptError = Class.new(StandardError)
     RetryableUploadAttemptError = Class.new(UploadAttemptError)
@@ -36,7 +36,7 @@ def upload(report_data, max_attempts:, min_retry_delay_secs:, **options)
 
     def attempt_upload(report_data, compress:, api_key:)
       body = compress ? gzip(report_data) : report_data
-      headers = { 'X-Api-Key' => api_key }
+      headers = { 'X-Api-Key' => api_key, 'user-agent' => 'ApolloServerPluginUsageReporting', 'accept' => 'application/json' }
       headers['Content-Encoding'] = 'gzip' if compress
       result = Net::HTTP.post(APOLLO_URI, body, headers)