Release 10.2.0

.fleetControl/agentControl/agent-schema-for-agent-control.yml

@@ -0,0 +1,107 @@
+# original source: https://github.com/newrelic/newrelic-agent-control/blob/main/agent-control/agent-type-registry/newrelic/com.newrelic.apm_ruby-0.1.0.yaml
+namespace: newrelic
+name: com.newrelic.apm_ruby
+version: 0.1.0
+variables:
+  k8s:
+    podLabelSelector:
+      description: "Pod label selector"
+      type: yaml
+      default: { }
+      required: false
+    containerSelector:
+      description: "Container selector"
+      type: yaml
+      default: { }
+      required: false
+    namespaceLabelSelector:
+      description: "Namespace label selector"
+      type: yaml
+      default: { }
+      required: false
+    # All 'agent' side-car related variables are flattened.
+    version:
+      description: "Ruby Agent init container version"
+      type: string
+      default: "latest"
+      required: false
+    env:
+      description: "environment variables to pass to Ruby agent"
+      type: yaml
+      default: [ ]
+      required: false
+    imagePullPolicy:
+      description: "image pull policy for the Ruby agent init container"
+      type: string
+      default: "Always"
+      required: false
+    resourceRequirements:
+      description: "resource requirements for the Ruby agent init container"
+      type: yaml
+      default: { }
+      required: false
+    securityContext:
+      description: "security context for the Ruby agent init container"
+      type: yaml
+      default: { }
+      required: false
+    # All health sidecar related variables are flattened and prefixed with "health_"
+    health_env:
+      description: "environment variables to pass to health sidecar"
+      type: yaml
+      default: [ ]
+      required: false
+    health_version:
+      description: "health sidecar image version"
+      type: string
+      default: "latest"
+      required: false
+    health_imagePullPolicy:
+      description: "image pull policy for the health sidecar"
+      type: string
+      default: "Always"
+      required: false
+    health_resourceRequirements:
+      description: "resource requirements for the health sidecar"
+      type: yaml
+      default: { }
+      required: false
+    health_securityContext:
+      description: "security context for the health sidecar"
+      type: yaml
+      default: { }
+      required: false
+deployment:
+  k8s:
+    health:
+      interval: 30s
+      initial_delay: 30s
+    objects:
+      instrumentation:
+        apiVersion: newrelic.com/v1beta3
+        kind: Instrumentation
+        metadata:
+          name: ${nr-sub:agent_id}
+          # APM CRs should be installed in "nr-ac:namespace"
+          # Due to a limitation in the k8s-agents-operator, Instrumentation CRs must be installed in the same namespace as the operator.
+          # Hence, the namespace is set to "nr-ac:namespace_agents".
+          # Reference: https://github.com/newrelic/k8s-agents-operator/blob/92c19208864f051f03f457ee04b772fca5042162/api/v1beta1/instrumentation_webhook.go#L110C27-L110C72
+          namespace: ${nr-ac:namespace_agents}
+        spec:
+          agent:
+            language: ruby
+            image: newrelic/newrelic-ruby-init:${nr-var:version}
+            env: ${nr-var:env}
+            imagePullPolicy: ${nr-var:imagePullPolicy}
+            resources: ${nr-var:resourceRequirements}
+            securityContext: ${nr-var:securityContext}
+          healthAgent:
+            image: newrelic/k8s-apm-agent-health-sidecar:${nr-var:health_version}
+            env: ${nr-var:health_env}
+            imagePullPolicy: ${nr-var:health_imagePullPolicy}
+            resources: ${nr-var:health_resourceRequirements}
+            securityContext: ${nr-var:health_securityContext}
+          podLabelSelector: ${nr-var:podLabelSelector}
+          namespaceLabelSelector: ${nr-var:namespaceLabelSelector}
+          containerSelector: ${nr-var:containerSelector}
+

.fleetControl/agentControlDefinitions.yml

@@ -0,0 +1,5 @@
+agentControlDefinitions:
+  - platform: KUBERNETESCLUSTER
+    supportFromAgent: 1.0.0
+    supportFromAgentControl: 1.0.0
+    content: ./agentControl/agent-schema-for-agent-control.yml

.fleetControl/configurationDefinitions.yml

@@ -0,0 +1,6 @@
+configurationDefinitions:
+  - platform: KUBERNETESCLUSTER
+    description: Ruby agent configuration
+    type: agent-config
+    version: 1.0.0
+# will add schema information here later

.github/actions/issue_closer/package.json

@@ -28,6 +28,6 @@
     "@eslint/create-config": "^0.4.5",
     "@octokit/graphql": "^5.0.6",
     "@vercel/ncc": "^0.36.1",
-    "eslint": "^8.43.0"
+    "eslint": "^9.26.0"
   }
 }

.github/actions/simplecov-report/package.json

@@ -37,7 +37,7 @@
     "@types/node": "^12.12.38",
     "@typescript-eslint/parser": "^5.16.0",
     "@zeit/ncc": "^0.22.3",
-    "eslint": "^8.12.0",
+    "eslint": "^9.26.0",
     "eslint-plugin-github": "^4.1.1",
     "eslint-plugin-jest": "^26.1.3",
     "eslint-plugin-prettier": "^4.0.0",

.github/actions/variable-mapper/package.json

@@ -31,7 +31,7 @@
     "@types/node": "^18.11.3",
     "@typescript-eslint/parser": "^5.40.1",
     "@vercel/ncc": "^0.34.0",
-    "eslint": "^8.26.0",
+    "eslint": "^9.26.0",
     "eslint-plugin-github": "^4.4.0",
     "eslint-plugin-jest": "^27.1.3",
     "jest": "^29.2.1",

.github/workflows/AgentMetadata.yml

@@ -0,0 +1,105 @@
+name: Agent Metadata
+
+permissions:
+  contents: read
+
+on:
+  # Allows manual triggering with parameters
+  workflow_dispatch:
+    inputs:
+      version:
+        description: 'Version tag (e.g., v10.0.0)'
+        required: true
+        type: string
+      agent-type:
+        description: 'Agent type'
+        required: false
+        default: 'NRRubyAgent'
+        type: string
+      use-cache:
+        description: 'Use cache'
+        required: false
+        default: true
+        type: boolean
+  # commented items below pertain to future work
+  #      oci-registry:
+  #        description: 'OCI registry URL for binary uploads (e.g., ghcr.io/newrelic/agents). Leave empty to skip binary upload.'
+  #        required: false
+  #        default: ''
+  #        type: string
+  #      oci-username:
+  #        description: 'OCI registry username (required if oci-registry is set)'
+  #        required: false
+  #        default: ''
+  #        type: string
+  #      oci-password:
+  #        description: 'OCI registry password or token (required if oci-registry is set)'
+  #        required: false
+  #        default: ''
+  #        type: string
+  #      binaries:
+  #        description: 'JSON array with artifact definitions'
+  #        required: false
+  #        default: ''
+  #        type: string
+
+  # Allows calling from another workflow
+  workflow_call:
+    inputs:
+      version:
+        description: 'Version tag to test'
+        required: true
+        type: string
+      agent-type:
+        description: 'Agent type'
+        required: false
+        default: 'NRRubyAgent'
+        type: string
+      use-cache:
+        description: 'Use cache'
+        required: false
+        default: true
+        type: boolean
+    # commented items below pertain to future work
+    #      oci-registry:
+    #        description: 'OCI registry URL for binary uploads (e.g., ghcr.io/newrelic/agents). Leave empty to skip binary upload.'
+    #        required: false
+    #        default: ''
+    #        type: string
+    #      oci-username:
+    #        description: 'OCI registry username (required if oci-registry is set)'
+    #        required: false
+    #        default: ''
+    #        type: string
+    #      oci-password:
+    #        description: 'OCI registry password or token (required if oci-registry is set)'
+    #        required: false
+    #        default: ''
+    #        type: string
+    #      binaries:
+    #        description: 'JSON array with artifact definitions'
+    #        required: false
+    #        default: ''
+    #        type: string
+    secrets:
+      FC_SYS_ID_CLIENT_ID:
+        required: true
+      FC_SYS_ID_PR_KEY:
+        required: true
+      APM_CONTROL_NR_LICENSE_KEY_STAGING:
+        required: true
+
+jobs:
+  test-agent-metadata-action:
+    runs-on: ubuntu-latest
+    continue-on-error: true
+    steps:
+      - name: Run action
+        uses: newrelic/agent-metadata-action@v1.0.2
+        with:
+          newrelic-client-id: ${{ secrets.FC_SYS_ID_CLIENT_ID }}
+          newrelic-private-key: ${{ secrets.FC_SYS_ID_PR_KEY }}
+          apm-control-nr-license-key: ${{ secrets.APM_CONTROL_NR_LICENSE_KEY_STAGING }} # action app is instrumented and supported by APM Control team
+          agent-type: ${{ inputs.agent-type }}
+          version: ${{ inputs.version }}
+          cache: ${{ inputs.use-cache }}

.github/workflows/release.yml

@@ -60,3 +60,13 @@ jobs:
 
     - name: Publish newrelic-infinite_tracing to rubygems.org
       run: ruby ./.github/workflows/scripts/rubygems-publish.rb infinite_tracing/newrelic-infinite_tracing
+
+  update-agent-metadata:
+    needs: [release]
+    uses: ./.github/workflows/AgentMetadata.yml
+    with:
+      version: ${{ github.event.release.tag_name }}
+    secrets:
+      FC_SYS_ID_CLIENT_ID: ${{ secrets.FC_SYS_ID_CLIENT_ID }}
+      FC_SYS_ID_PR_KEY: ${{ secrets.FC_SYS_ID_PR_KEY }}
+      APM_CONTROL_NR_LICENSE_KEY_STAGING: ${{ secrets.APM_CONTROL_NR_LICENSE_KEY_STAGING }}

.github/workflows/scripts/slack_notifications/supported_gems.txt

@@ -48,4 +48,5 @@ typhoeus
 unicorn
 view_component
 yajl-ruby
+logging
 parallel

CHANGELOG.md

@@ -1,5 +1,32 @@
 # New Relic Ruby Agent Release Notes
 
+## v10.2.0
+
+- **Feature: Introduce Hybrid Agent for OpenTelemetry Tracing Support**
+
+  OpenTelemetry Tracing APIs can now be translated into New Relic telemetry with the New Relic Ruby agent's new Hybrid Agent features. This allows the `newrelic_rpm` gem to behave similarly to an OpenTelemetry SDK, accepting OpenTelemetry API calls and turning them into New Relic Transactions and Segments with familiar attributes and names.
+
+  The following configuration options relate to Hybrid Agent features:
+
+    | Configuration name | Default | Behavior |
+    | ------------------ | ------- |----------|
+    | opentelemetry.enabled | `false` | A global configuration option for disabling all OpenTelemetry signals sent through New Relic. |
+    | opentelemetry.traces.enabled | `true` |  Enables the creation of Transaction Trace segments and timeslice metrics from OpenTelemetry Spans |
+    | opentelemetry.traces.include | `''` | A comma-delimited list of OpenTelemetry Tracers, represented as a string (e.g. "AppTracer1,OpenTelemetry::Instrumentation::Bunny::Instrumentation"), that **will** have their trace signals sent to New Relic.|
+    | opentelemetry.traces.exclude | `''` | A comma-delimited list of OpenTelemetry Tracers, represented as a string (e.g. "AppTracer1,OpenTelemetry::Instrumentation::Bunny::Instrumentation"), that will **not** have their trace signals sent to New Relic. All known tracers for instrumentation that conflicts with New Relic instrumentation are excluded by default. |
+
+- **Feature: Add configuration option error_collector.backtrace_truncate_location**
+
+  A new configuration option has been added, `error_collector.backtrace_truncate_location`, which allows the user to specify where in the backtrace to truncate when the number of frames exceeds `error_collector.max_backtrace_frames`. Options are `'top'` (removes frames from the beginning), `'middle'` (removes frames from the middle, preserving the beginning and end), or `'end'` (removes frames from the end). The default is `'middle'`. [PR#3424](https://github.com/newrelic/newrelic-ruby-agent/pull/3424)
+
+- **Feature: Add Logging gem instrumentation**
+
+  The agent will now record logs generated by the [Logging gem](https://rubygems.org/gems/logging). [PR#3420](https://github.com/newrelic/newrelic-ruby-agent/pull/3420)
+
+- **Feature: Add configuration option utilization.detect_in_parallel**
+
+  A new configuration option has been added, `utilization.detect_in_parallel`, which controls whether the agent uses threads when detecting cloud vendor information to speed up agent startup. When set to `false`, vendor detection runs sequentially without creating threads. The default is `true`. [PR#3439](https://github.com/newrelic/newrelic-ruby-agent/pull/3439)
+
 ## v10.1.0
 
 - **Feature: Add support for forking processes in Parallel gem instrumentation**
@@ -14,10 +41,10 @@
 
   The agent now properly initializes health check loops after forking, ensuring each process generates its own health check file. This fix also has the effect of correctly including `entity.guid` values in the health check files. [PR#3409](https://github.com/newrelic/newrelic-ruby-agent/pull/3409) [Issue#3408](https://github.com/newrelic/newrelic-ruby-agent/issues/3408)
 
-- **Bugfix: Fix `sidekiq.ignore_retry_errors`**                           
+- **Bugfix: Fix `sidekiq.ignore_retry_errors`**
+
+  The configuration option `sidekiq.ignore_retry_errors: true` was continuing to report retry errors. The agent now correctly ignores retry errors and only reports when jobs permanently fail. [PR#3399](https://github.com/newrelic/newrelic-ruby-agent/pull/3399)
 
-  The configuration option `sidekiq.ignore_retry_errors: true` was continuing to report retry errors. The agent now correctly ignores retry errors and only reports when jobs permanently fail. [PR#3399](https://github.com/newrelic/newrelic-ruby-agent/pull/3399)      
-
 ## v10.0.0
 
 - **Breaking Change: Remove support for Ruby 2.4 and 2.5**

lib/new_relic/agent/agent.rb

@@ -107,7 +107,7 @@ def init_components
         @adaptive_sampler_remote_parent_not_sampled = AdaptiveSampler.new(Agent.config[:sampling_target],
           Agent.config[:sampling_target_period_in_seconds])
         @serverless_handler = ServerlessHandler.new
-        @opentelemetry_bridge = OpenTelemetryBridge.new
+        @opentelemetry_bridge = OpenTelemetryBridge.new(@events)
       end
 
       def init_event_handlers