update other usages

Author: binaryseed

lib/new_relic/distributed_trace/w3c_trace_context/trace_state.ex

@@ -91,12 +91,13 @@ defmodule NewRelic.DistributedTrace.W3CTraceContext.TraceState do
       length(members) <= 32
   end
 
-  @key_wo_vendor ~r/^[0-9a-z][_0-9a-z\-\*\/]{0,255}$/
-  @key_with_vendor ~r/^[0-9a-z][_0-9a-z\-\*\/]{0,240}@[0-9a-z][_0-9a-z\-\*\/]{0,13}$/
-  @value ~r/^([\x20-\x2b\x2d-\x3c\x3e-\x7e]{0,255}[\x21-\x2b\x2d-\x3c\x3e-\x7e])$/
+  defp key_wo_vendor, do: ~r/^[0-9a-z][_0-9a-z\-\*\/]{0,255}$/
+  defp key_with_vendor, do: ~r/^[0-9a-z][_0-9a-z\-\*\/]{0,240}@[0-9a-z][_0-9a-z\-\*\/]{0,13}$/
+  defp valid_value, do: ~r/^([\x20-\x2b\x2d-\x3c\x3e-\x7e]{0,255}[\x21-\x2b\x2d-\x3c\x3e-\x7e])$/
+
   defp valid_member?([key, value]) do
-    valid_key? = Regex.match?(@key_wo_vendor, key) || Regex.match?(@key_with_vendor, key)
-    valid_value? = Regex.match?(@value, value)
+    valid_key? = Regex.match?(key_wo_vendor(), key) || Regex.match?(key_with_vendor(), key)
+    valid_value? = Regex.match?(valid_value(), value)
 
     valid_key? && valid_value?
   end

lib/new_relic/harvest/telemetry_sdk/config.ex

@@ -10,12 +10,13 @@ defmodule NewRelic.Harvest.TelemetrySdk.Config do
     Application.get_env(:new_relic_agent, key, @default[key])
   end
 
-  @region_matcher ~r/^(?<region>\D+)/
-  @env_matcher ~r/^(?<env>.+)-collector/
+  defp region_matcher, do: ~r/^(?<region>\D+)/
+  defp env_matcher, do: ~r/^(?<env>.+)-collector/
+
   def determine_hosts(host, region) do
-    env = host && Regex.named_captures(@env_matcher, host)["env"]
+    env = host && Regex.named_captures(env_matcher(), host)["env"]
     env = env && env <> "-"
-    region = region && Regex.named_captures(@region_matcher, region)["region"] <> "."
+    region = region && Regex.named_captures(region_matcher(), region)["region"] <> "."
 
     %{
       log: "https://#{env}log-api.#{region}newrelic.com/log/v1",

lib/new_relic/init.ex

@@ -46,11 +46,12 @@ defmodule NewRelic.Init do
     })
   end
 
-  @region_matcher ~r/^(?<prefix>.+?)x/
+  defp region_matcher, do: ~r/^(?<prefix>.+?)x/
+
   def determine_region(nil), do: nil
 
   def determine_region(license_key) do
-    case Regex.named_captures(@region_matcher, license_key) do
+    case Regex.named_captures(region_matcher(), license_key) do
       %{"prefix" => prefix} -> String.trim_trailing(prefix, "x")
       _ -> nil
     end
@@ -191,11 +192,12 @@ defmodule NewRelic.Init do
 
   def parse_labels(nil), do: []
 
-  @label_splitter ~r/;|:/
   def parse_labels(label_string) do
     label_string
-    |> String.split(@label_splitter, trim: true)
+    |> String.split(label_splitter(), trim: true)
     |> Enum.map(&String.trim/1)
     |> Enum.chunk_every(2, 2, :discard)
   end
+
+  defp label_splitter, do: ~r/;|:/
 end

lib/new_relic/util/vendor.ex

@@ -40,14 +40,15 @@ defmodule NewRelic.Util.Vendor do
     end
   end
 
-  @cgroup_matcher ~r/\d+:.*cpu[,:].*(?<id>[0-9a-f]{64}).*/
+  defp cgroup_matcher, do: ~r/\d+:.*cpu[,:].*(?<id>[0-9a-f]{64}).*/
+
   defp docker_vendor_map(cgroup_filename) do
     File.read(cgroup_filename)
     |> case do
       {:ok, cgroup_file} ->
         cgroup_file
         |> String.split("\n", trim: true)
-        |> Enum.find_value(&Regex.named_captures(@cgroup_matcher, &1))
+        |> Enum.find_value(&Regex.named_captures(cgroup_matcher(), &1))
 
       _ ->
         nil